[arch-commits] Commit in gambas3/trunk (PKGBUILD gambas-poppler-0.72.patch)

[Antonio Rojas]

    Date: Friday, December 14, 2018 @ 20:52:53
  Author: arojas
Revision: 416292

Fix build with poppler 0.72

Added:
  gambas3/trunk/gambas-poppler-0.72.patch
Modified:
  gambas3/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    3 +
 gambas-poppler-0.72.patch |   72 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-14 20:45:37 UTC (rev 416291)
+++ PKGBUILD	2018-12-14 20:52:53 UTC (rev 416292)
@@ -44,10 +44,12 @@
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
         0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch
         gambas-poppler-0.71.patch
+        gambas-poppler-0.72.patch
         gambas-postgresql.patch::"https://gitlab.com/gambas/gambas/commit/75c0cafe.diff")
 sha512sums=('1b5a22b13a69e43831e2348b6c89a6ddd38f3a98cf70176322f360a75616d8b15a189353e9a5637be194960875c1fe775c5f2b11a9919aa552d572e409e7f767'
             '51daba92877e52f578c74f0c46f58151a9ee7cdd32993845f269d598cca7c0068880a47a3ec3f9e3e862032be5b2b37c4c35e2ee50f72f117ba627f337ef26d7'
             '57c450ff4f42d41a10d305a4784d647001601a3efdf37cda936dc456d15f0a65ff23f1dc3fd3e710651a0a0648c6d720345d93dfa61f1955e98258494360d462'
+            '029e9fb410b3194c84b663d493d3ba2b4b80116369bd3514083b8d01e2cabf39f4a2fd6e1c5f916126c815369bfb784695a1d47b839c9ba5fa8902dabb7e5762'
             '42f41cd01ded21f7ddf614de975c09979f0b30f170429570ab71b64d9d7d169fbe7efae9222a266a928b1eefc761c49170c7d27b458e7336688b46caaba643a0')
 
 create_dirs() {
@@ -59,6 +61,7 @@
   cd ${srcdir}/gambas-${pkgver}
 
   patch -p1 -i ../gambas-poppler-0.71.patch # Fix build with poppler 0.71
+  patch -p1 -i ../gambas-poppler-0.72.patch # Fix build with poppler 0.72
   patch -p1 -i ../gambas-postgresql.patch # Fix build of postgresql module
   ./reconf-all
 }

Added: gambas-poppler-0.72.patch
===================================================================
--- gambas-poppler-0.72.patch	                        (rev 0)
+++ gambas-poppler-0.72.patch	2018-12-14 20:52:53 UTC (rev 416292)
@@ -0,0 +1,72 @@
+diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
+index 64cc92796..6a0654bb8 100644
+--- a/gb.pdf/src/CPdfDocument.cpp
++++ b/gb.pdf/src/CPdfDocument.cpp
+@@ -120,7 +120,7 @@ static void return_unicode_string(const Unicode *unicode, int len)
+ 		gstr.append(buf, n);
+ 	}
+ 
+-	GB.ReturnNewZeroString(gstr.getCString());
++	GB.ReturnNewZeroString(gstr.c_str());
+ }
+ 
+ 
+@@ -151,11 +151,11 @@ static void aux_return_string_info(void *_object, const char *key)
+ 
+ 		if (goo_value->hasUnicodeMarker())
+ 		{
+-			GB.ConvString (&tmpstr,goo_value->getCString()+2,goo_value->getLength()-2,"UTF-16BE","UTF-8");
++			GB.ConvString (&tmpstr,goo_value->c_str()+2,goo_value->getLength()-2,"UTF-16BE","UTF-8");
+ 			GB.ReturnNewZeroString(tmpstr);		
+ 		}		
+ 		else
+-			GB.ReturnNewString(goo_value->getCString(),goo_value->getLength());		
++			GB.ReturnNewString(goo_value->c_str(),goo_value->getLength());		
+ 	}
+ 	#if ! POPPLER_VERSION_0_58
+ 	dst.free();
+@@ -194,10 +194,10 @@ static void aux_return_date_info(void *_object, const char *key)
+ 	{
+ 		goo = dst.getString();
+ 		if (goo->hasUnicodeMarker())
+-			GB.ConvString (&datestr,goo->getCString()+2,goo->getLength()-2,"UTF-16BE","UTF-8");
++			GB.ConvString (&datestr,goo->c_str()+2,goo->getLength()-2,"UTF-16BE","UTF-8");
+ 		else
+ 		{
+-			datestr = GB.NewString(goo->getCString(),goo->getLength());
++			datestr = GB.NewString(goo->c_str(),goo->getLength());
+ 			tofree=datestr;		
+ 		}
+ 
+@@ -333,11 +333,11 @@ static char* aux_get_target_from_action(const_LinkAction *act)
+ 
+ 	if (tmp->hasUnicodeMarker())
+ 	{
+-			GB.ConvString (&uni,tmp->getCString()+2,tmp->getLength()-2,"UTF-16BE","UTF-8");
++			GB.ConvString (&uni,tmp->c_str()+2,tmp->getLength()-2,"UTF-16BE","UTF-8");
+ 			vl = GB.AddString(vl, uni, 0);	
+ 	}	
+ 	else
+-			vl = GB.AddString(vl,tmp->getCString(),tmp->getLength());
++			vl = GB.AddString(vl,tmp->c_str(),tmp->getLength());
+ 	
+ 
+ 	return vl;
+@@ -1015,7 +1015,7 @@ BEGIN_METHOD(PDFPAGE_select, GB_INTEGER X; GB_INTEGER Y; GB_INTEGER W; GB_INTEGE
+ 		return;
+ 	}
+ 	
+-	GB.ReturnNewString(str->getCString(),str->getLength());	
++	GB.ReturnNewString(str->c_str(),str->getLength());	
+ 	delete str;
+ 
+ END_METHOD
+@@ -1081,7 +1081,7 @@ BEGIN_PROPERTY (PDFPAGELINKDATA_parameters)
+ 		return;	
+ 	}
+ 
+-	GB.ReturnNewZeroString(((LinkLaunch*)THIS->action)->getParams()->getCString());
++	GB.ReturnNewZeroString(((LinkLaunch*)THIS->action)->getParams()->c_str());
+ 
+ END_PROPERTY
+