[arch-commits] Commit in gambas3/trunk (2 files)

[Evangelos Foutras]

    Date: Thursday, January 30, 2020 @ 19:27:07
  Author: foutrelis
Revision: 560189

Fix build with poppler 0.85

Added:
  gambas3/trunk/0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch
Modified:
  gambas3/trunk/PKGBUILD

--------------------------------------------------------------+
 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch |   54 ++++++++++
 PKGBUILD                                                     |    7 -
 2 files changed, 59 insertions(+), 2 deletions(-)

Added: 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch
===================================================================
--- 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch	                        (rev 0)
+++ 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch	2020-01-30 19:27:07 UTC (rev 560189)
@@ -0,0 +1,54 @@
+From 6a16e02ee3a0f05cd70876d76f807ab5076440b1 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Thu, 30 Jan 2020 21:08:47 +0200
+Subject: [PATCH] Use GlobalParams::getUtf8Map() found in poppler 0.85
+
+[GB.PDF]
+* BUG: Make 'gb.pdf' compile with poppler >= 0.85.
+---
+ gb.pdf/configure.ac         | 2 ++
+ gb.pdf/src/CPdfDocument.cpp | 7 +++++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac
+index 691e3088a..1dd10b455 100644
+--- a/gb.pdf/configure.ac
++++ b/gb.pdf/configure.ac
+@@ -29,6 +29,8 @@ if test "$have_poppler" = "yes"; then
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_76, $((1-$?)), Poppler version >= 0.76)
+   pkg-config --atleast-version=0.83.0 poppler
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_83, $((1-$?)), Poppler version >= 0.83)
++  pkg-config --atleast-version=0.85.0 poppler
++  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_85, $((1-$?)), Poppler version >= 0.85)
+ fi
+ 
+ AC_OUTPUT( \
+diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
+index 9522d15db..4b53fd50d 100644
+--- a/gb.pdf/src/CPdfDocument.cpp
++++ b/gb.pdf/src/CPdfDocument.cpp
+@@ -104,12 +104,14 @@ END_PROPERTY
+ 
+ static void return_unicode_string(const Unicode *unicode, int len)
+ {
+-	static UnicodeMap *uMap = NULL;
+-	
+ 	GooString gstr;
+ 	char buf[8]; /* 8 is enough for mapping an unicode char to a string */
+ 	int i, n;
+ 
++#if POPPLER_VERSION_0_85
++	const UnicodeMap *uMap = globalParams->getUtf8Map();
++#else
++	static UnicodeMap *uMap = NULL;
+ 	if (uMap == NULL) 
+ 	{
+ 		GooString *enc = new GooString("UTF-8");
+@@ -117,6 +119,7 @@ static void return_unicode_string(const Unicode *unicode, int len)
+ 		uMap->incRefCnt();
+ 		delete enc;
+ 	}
++#endif
+ 		
+ 	for (i = 0; i < len; ++i) {
+ 		n = uMap->mapUnicode(unicode[i], buf, sizeof(buf));

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-30 19:26:14 UTC (rev 560188)
+++ PKGBUILD	2020-01-30 19:27:07 UTC (rev 560189)
@@ -43,10 +43,12 @@
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
         gambas-postgresql-12.patch
-        0001-Fix-segfault-with-poppler-0.83.patch)
+        0001-Fix-segfault-with-poppler-0.83.patch
+        0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch)
 sha512sums=('a32d01b4c1126364fb98d2780153c333aaf9d0baf82a9822dbe534d723808ed320bd07792ab38fd1561301c09091920332c406c2f9421f841e723c863c738479'
             '803ceaa7a3109828b3336d02b7bc4fc1053ba3dca5f06fc97ff8f7785f983c32b657e3a59ab00081e6cfb047c12181b98a9631587de0af60ce1f30d614df5c49'
-            '97aa2241a5faf7580bd0f627c36454b5a310a1265f0fc45e5e194dd4ab51d9b8815ee0ffe1ef7143066920395f484dd7b3a6b3c8ac35b46038218b7bf1355e3e')
+            '97aa2241a5faf7580bd0f627c36454b5a310a1265f0fc45e5e194dd4ab51d9b8815ee0ffe1ef7143066920395f484dd7b3a6b3c8ac35b46038218b7bf1355e3e'
+            '9221508ac0fa1447868ba630bf4885563524db0645d36d613416152a479f786a9443594b6ea2d3638544079b450727ee02fe1fd246498dcaa566fd98c8f0713f')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -58,6 +60,7 @@
 
   patch -p1 -i ../gambas-postgresql-12.patch # Workaround build failure with postgresql 12
   patch -p1 -i ../0001-Fix-segfault-with-poppler-0.83.patch # fixed upstream
+  patch -p1 -i ../0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch
   ./reconf-all
 }