libreptool: rebuild.

diff --git a/packages/mingw-w64-libreptool/002-paths.patch b/packages/mingw-w64-libreptool/002-paths.patch
index 076d424575e7e3c31639ed430dbedd275068e9a1..04d457c9cce3c939258a5d837214bb51b75e6ebb 100644 (file)
--- a/packages/mingw-w64-libreptool/002-paths.patch
+++ b/packages/mingw-w64-libreptool/002-paths.patch
@@ -1,32 +1,35 @@
---- ./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 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a71b2f9..84014c4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,23 +1,22 @@
  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
+ 
+-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
+-
+-lexycal.yy.c lexycal.yy.h: lexycal.fl
 -      flex -o $(srcdir)/lexycal.yy.c --header-file=$(srcdir)/lexycal.yy.h $(srcdir)/lexycal.fl
++lexycal.yy.c lexycal.yy.h parser.tab.c parser.tab.h: lexycal.fl parser.y
 +      flex -o $(builddir)/lexycal.yy.c --header-file=$(builddir)/lexycal.yy.h $(srcdir)/lexycal.fl
-
++      bison -d $(srcdir)/parser.y -o $(builddir)/parser.tab.c
+ 
  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/003-ctype.patch b/packages/mingw-w64-libreptool/003-ctype.patch
new file mode 100644 (file)
index 0000000..5dee1c7
--- /dev/null
+++ b/packages/mingw-w64-libreptool/003-ctype.patch
@@ -0,0 +1,64 @@
+diff --git a/src/rptcommon.c b/src/rptcommon.c
+index 04f34d8..3443fbf 100644
+--- a/src/rptcommon.c
++++ b/src/rptcommon.c
+@@ -5,12 +5,12 @@
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+- * 
++ *
+  * This library is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+- * 
++ *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this library; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+@@ -18,6 +18,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <ctype.h>
+ 
+ #include "rptcommon.h"
+ 
+@@ -930,15 +931,15 @@ rpt_common_set_font (xmlNode *xnode, const RptFont *font)
+                                                       case PANGO_UNDERLINE_SINGLE:
+                                                               xmlSetProp (xnode, "font-underline", "single");
+                                                               break;
+-              
++
+                                                       case PANGO_UNDERLINE_DOUBLE:
+                                                               xmlSetProp (xnode, "font-underline", "double");
+                                                               break;
+-              
++
+                                                       case PANGO_UNDERLINE_LOW:
+                                                               xmlSetProp (xnode, "font-underline", "low");
+                                                               break;
+-              
++
+                                                       case PANGO_UNDERLINE_ERROR:
+                                                               xmlSetProp (xnode, "font-underline", "error");
+                                                               break;
+@@ -1473,7 +1474,7 @@ GdkColor
+       GdkColor *gdk_color;
+ 
+       gdk_color = (GdkColor *)g_malloc0 (sizeof (GdkColor));
+-      
++
+       gdk_color->red = color->r * 65535;
+       gdk_color->green = color->g * 65535;
+       gdk_color->blue = color->b * 65535;
+@@ -1524,7 +1525,7 @@ static GArray
+                                                       val = strtod (values[i], NULL);
+                                                       g_array_append_val (ret, val);
+                                               }
+-              
++
+                                       i++;
+                               }
+                       g_strfreev (values);

diff --git a/packages/mingw-w64-libreptool/PKGBUILD b/packages/mingw-w64-libreptool/PKGBUILD
index 7fa982d2c5dfe4c785c06a7bbb519b5fa6c78521..186785ac982ecb3c17e2ba29d0f50ad363b0e5e9 100644 (file)
--- a/packages/mingw-w64-libreptool/PKGBUILD
+++ b/packages/mingw-w64-libreptool/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libreptool
 _base_ver=0.5.0
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.5.0.102.cfce6b4
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="Library to make reports (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-libgda-full")
@@ -16,10 +16,12 @@ license=("LGPL 2.1")
 url="http://saetta.ns0.it/"
 source=(git+http://saetta.ns0.it/git/reptool/${_realname}#branch=develop
         001-no-install-hook.patch
-        002-paths.patch)
+        002-paths.patch
+          003-ctype.patch)
 sha256sums=('SKIP'
             'bb34d7812aff00065dc12c4439b758f253668ce2dc2775718dada8b3d4ece713'
-            '2187b4d1d3157c5825ba757f846fa7bba37e7db1f3432e3dae9ef97d6e09a404')
+                       '39eaad5d0bf7be7113ac2b4143a5df8b99c47fb183da625e4b0770198aa8db35'
+                  '6fd7058038890867dc60e69ba4e0377e39d452e50871ce1f5f30d6862e9992d9')
 
 pkgver() {
   cd "$srcdir/$_realname"
@@ -31,12 +33,16 @@ prepare() {
 
   patch -p1 -i ${srcdir}/001-no-install-hook.patch
   patch -p1 -b -V simple -i ${srcdir}/002-paths.patch
+  patch -p1 -i ${srcdir}/003-ctype.patch
 }
 
 build() {
   mkdir -p build-${MINGW_CHOST}
   cd build-${MINGW_CHOST}
 
+  # workaround per libuuid
+  export lt_cv_deplibs_check_method='pass_all'
+
   ../${_realname}/autogen.sh \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \