libreptool: passaggio a versione git e aggiornamento patch.

diff --git a/packages/mingw-w64-libreptool/002-paths.patch b/packages/mingw-w64-libreptool/002-paths.patch
index 15e62b1424f53e7da5059f93949b9b313a45542d..076d424575e7e3c31639ed430dbedd275068e9a1 100644 (file)
--- a/packages/mingw-w64-libreptool/002-paths.patch
+++ b/packages/mingw-w64-libreptool/002-paths.patch
@@ -1,20 +1,32 @@
---- ./src/Makefile.am.orig     2015-04-08 13:09:03.531850300 +0200
-+++ ./src/Makefile.am  2015-04-08 13:11:58.152822300 +0200
-@@ -31,7 +31,7 @@
-                         rptreport.c \
-                         rptprint.c \
-                         rptcommon.c \
--                        rptmarshal.c
-+                        $(srcdir)/rptmarshal.c
- 
- libreptool_include_HEADERS = \
-                   libreptool.h \
-@@ -49,7 +49,7 @@
-                  parser.tab.h \
-                  lexycal.yy.h \
-                  rptreport_priv.h \
--                 rptmarshal.h
-+                 $(srcdir)/rptmarshal.h
- 
- EXTRA_DIST = \
-              parser.y \
+--- ./src/Makefile.am.orig     2017-03-30 16:37:32.328927000 +0200
++++ ./src/Makefile.am  2017-03-30 16:53:22.633505500 +0200
+@@ -1,23 +1,24 @@
+ LIBS = $(REPTOOL_LIBS)
+
+ AM_CPPFLAGS = $(REPTOOL_CFLAGS) \
+-              -DG_LOG_DOMAIN=\"RepTool\"
++              -DG_LOG_DOMAIN=\"RepTool\" \
++              -I$(builddir)
+
+ parser.tab.c parser.tab.h: lexycal.yy.c lexycal.yy.h parser.y
+-      bison -d $(srcdir)/parser.y
++      bison -d $(srcdir)/parser.y -o $(builddir)/parser.tab.c
+
+ lexycal.yy.c lexycal.yy.h: lexycal.fl
+-      flex -o $(srcdir)/lexycal.yy.c --header-file=$(srcdir)/lexycal.yy.h $(srcdir)/lexycal.fl
++      flex -o $(builddir)/lexycal.yy.c --header-file=$(builddir)/lexycal.yy.h $(srcdir)/lexycal.fl
+
+ lib_LTLIBRARIES = libreptool.la
+
+ libreptool_la_LDFLAGS = -no-undefined
+
+ rptmarshal.c: rptmarshal.h reptool_marshal.list $(GLIB_GENMARSHAL)
+-      $(GLIB_GENMARSHAL) $(srcdir)/reptool_marshal.list --body --prefix=_rpt_marshal > $(srcdir)/$@
++      $(GLIB_GENMARSHAL) $(srcdir)/reptool_marshal.list --body --prefix=_rpt_marshal > $(builddir)/$@
+
+ rptmarshal.h: reptool_marshal.list $(GLIB_GENMARSHAL)
+-      $(GLIB_GENMARSHAL) $(srcdir)/reptool_marshal.list --header --prefix=_rpt_marshal > $(srcdir)/$@
++      $(GLIB_GENMARSHAL) $(srcdir)/reptool_marshal.list --header --prefix=_rpt_marshal > $(builddir)/$@
+
+ libreptool_la_SOURCES = \
+                         parser.tab.h \

diff --git a/packages/mingw-w64-libreptool/PKGBUILD b/packages/mingw-w64-libreptool/PKGBUILD
index 736c0bf1ed3cb4c0a6f5c41878178133f59ac7b7..0b77a9494f6945f20bb4122d5912e2056720251c 100644 (file)
--- a/packages/mingw-w64-libreptool/PKGBUILD
+++ b/packages/mingw-w64-libreptool/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>
 
 _realname=libreptool
+_base_ver=0.5.0
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.5.0
-pkgrel=3
+pkgver=0.5.0.101.8275d40
+pkgrel=1
 arch=('any')
 pkgdesc="Library to make reports (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-libgda-full")
@@ -13,18 +14,23 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
 options=('!strip' 'debug' 'staticlibs')
 license=("LGPL 2.1")
 url="http://saetta.ns0.it/"
-source=(git+http://saetta.ns0.it/git/reptool/${_realname}#branch=gtk3
+source=(git+http://saetta.ns0.it/git/reptool/${_realname}#branch=develop
         001-no-install-hook.patch
         002-paths.patch)
 sha256sums=('SKIP'
             'bb34d7812aff00065dc12c4439b758f253668ce2dc2775718dada8b3d4ece713'
-            '1aa840860f3325c25f3e0a8bbfe850f203b833a29a38479441ecbcfaacd2b5bd')
+            '2187b4d1d3157c5825ba757f846fa7bba37e7db1f3432e3dae9ef97d6e09a404')
+
+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-no-install-hook.patch
-  patch -p1 -i ${srcdir}/002-paths.patch
+  patch -p1 -b -V simple -i ${srcdir}/002-paths.patch
 }
 
 build() {