ambulanti: aggiornato (build da git).

diff --git a/.gitignore b/.gitignore
index d26b5cd59cffc3365ddd87533b5a4ccab0f2345b..afb2a6426a997491b2e1aa87b8d9e4645bfd5006 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 repository
 tmp
+*.~*~

diff --git a/packages/mingw-w64-ambulanti/001-path.patch b/packages/mingw-w64-ambulanti/001-path.patch
deleted file mode 100644 (file)
index 3f58da2..0000000
--- a/packages/mingw-w64-ambulanti/001-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f8cebbd..092e5de 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -22,11 +22,12 @@ resources.o: resources.rc
- 
- bin_PROGRAMS = ambulanti
- 
--ambulanti-marshal.c: ambulanti-marshal.h marshal.list $(GLIB_GENMARSHAL)
--      $(GLIB_GENMARSHAL) marshal.list --body --prefix=_ambulanti_marshal > $@
-+
-+ambulanti-marshal.c: marshal.list ambulanti-marshal.h $(GLIB_GENMARSHAL)
-+      $(GLIB_GENMARSHAL) $< --body --prefix=_ambulanti_marshal > $@
- 
- ambulanti-marshal.h: marshal.list $(GLIB_GENMARSHAL)
--      $(GLIB_GENMARSHAL) marshal.list --header --prefix=_ambulanti_marshal > $@
-+      $(GLIB_GENMARSHAL) $< --header --prefix=_ambulanti_marshal > $@
- 
- ambulanti_SOURCES = \
-                     ambulanti-marshal.c \
-diff --git a/src/resources.rc.in b/src/resources.rc.in
-index c8f694c..df8a08e 100644
---- a/src/resources.rc.in
-+++ b/src/resources.rc.in
-@@ -1,4 +1,4 @@
--AppIcon ICON "..\\data\\ambulanti\\images\\ambulanti.ico"
-+AppIcon ICON "@top_srcdir@\\data\\ambulanti\\images\\ambulanti.ico"
- 
- 1 VERSIONINFO
- FILEVERSION     @V_MAJOR@,@V_MINOR@,@V_MICRO@,0

diff --git a/packages/mingw-w64-ambulanti/PKGBUILD b/packages/mingw-w64-ambulanti/PKGBUILD
index 9310a486146c8f788b11b7ce21ebb7777984131a..1a7d5df6889ed67d626b0cbd5eb9403e014a5f9b 100644 (file)
--- a/packages/mingw-w64-ambulanti/PKGBUILD
+++ b/packages/mingw-w64-ambulanti/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>
 
 _realname=ambulanti
+_base_ver=0.0.5
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.0.5
+pkgver=0.0.5.454.d2a00f6
 pkgrel=1
 arch=('any')
 pkgdesc="Gestione commercio ambulante (mingw-w64)"
@@ -20,18 +21,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
 options=('strip' 'staticlibs')
 license=("LGPL 2.1")
 url="http://saetta.ns0.it/"
-source=(git+http://saetta.ns0.it/~andreaz/git/${_realname}#branch=gtk3
-        001-path.patch)
-sha256sums=('SKIP'
-            '3b9bf86b0d307d752579af6f131aa4d550dd5bde86f6b41a22abd18e69ae19d7')
+source=(git+http://saetta.ns0.it/~andreaz/git/${_realname}#branch=gtk3)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "${srcdir}/${_realname}"
+  printf "%s.%s.%s" "${_base_ver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
 prepare() {
   cd ${_realname}
-
-  patch -p1 -i ${srcdir}/001-path.patch
 }
 
 build() {
+  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
   mkdir -p build-${MINGW_CHOST}
   cd build-${MINGW_CHOST}
 
@@ -45,6 +48,8 @@ build() {
 }
 
 package() {
-  cd "$srcdir/build-${MINGW_CHOST}"
-  make DESTDIR=$pkgdir install
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 "${srcdir}/${_realname}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }