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

[Antonio Rojas]

    Date: Wednesday, March 4, 2020 @ 07:49:07
  Author: arojas
Revision: 589875

Fix build with poppler 0.86

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

---------------------------+
 PKGBUILD                  |    3 +++
 gambas-poppler-0.86.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-04 04:39:58 UTC (rev 589874)
+++ PKGBUILD	2020-03-04 07:49:07 UTC (rev 589875)
@@ -43,11 +43,13 @@
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
         gambas-postgresql-12.patch
+        gambas-poppler-0.86.patch
         0001-Fix-segfault-with-poppler-0.83.patch
         0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch
 	0001-Packager-Fix-ArchLinux-packager.patch)
 sha512sums=('a32d01b4c1126364fb98d2780153c333aaf9d0baf82a9822dbe534d723808ed320bd07792ab38fd1561301c09091920332c406c2f9421f841e723c863c738479'
             '803ceaa7a3109828b3336d02b7bc4fc1053ba3dca5f06fc97ff8f7785f983c32b657e3a59ab00081e6cfb047c12181b98a9631587de0af60ce1f30d614df5c49'
+            '7f6a9b36eea04111b8be9d4940b20117aa63d069f376882419ba8fcdab3a4e5bd4c1aee61daffc2d79c2b6aa3a0fc92948da993d4dff14a0ea1a2da104d857e9'
             '97aa2241a5faf7580bd0f627c36454b5a310a1265f0fc45e5e194dd4ab51d9b8815ee0ffe1ef7143066920395f484dd7b3a6b3c8ac35b46038218b7bf1355e3e'
             '9221508ac0fa1447868ba630bf4885563524db0645d36d613416152a479f786a9443594b6ea2d3638544079b450727ee02fe1fd246498dcaa566fd98c8f0713f'
             '7bd383a84a7e2337af0ee4672d488cd54256d3e4baee81933b2431239aea91408014d40d5b53aae9b8559dbac4eaac54e332973f7145c0a18d9b81406acd6df5')
@@ -64,6 +66,7 @@
   patch -p1 -i ../0001-Fix-segfault-with-poppler-0.83.patch # merged upstream
   patch -p1 -i ../0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch # merged upstream
   patch -p1 -i ../0001-Packager-Fix-ArchLinux-packager.patch # merged upstream
+  patch -p1 -i ../gambas-poppler-0.86.patch # Fix build with poppler 0.86
   ./reconf-all
 }
 

Added: gambas-poppler-0.86.patch
===================================================================
--- gambas-poppler-0.86.patch	                        (rev 0)
+++ gambas-poppler-0.86.patch	2020-03-04 07:49:07 UTC (rev 589875)
@@ -0,0 +1,38 @@
+diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
+index 4b53fd50d..b7feea18b 100644
+--- a/gb.pdf/src/CPdfDocument.cpp
++++ b/gb.pdf/src/CPdfDocument.cpp
+@@ -256,7 +256,7 @@ static uint32_t aux_get_page_from_action(void *_object, const_LinkAction *act)
+ 			name = ((LinkGoTo*)act)->getNamedDest();
+ 			if (name) {
+ 			#if POPPLER_VERSION_0_64
+-				dest = THIS->doc->findDest(name);
++				dest = THIS->doc->findDest(name).get();
+ 			#else
+ 				dest = THIS->doc->findDest((GooString *) name);
+ 			#endif
+@@ -311,19 +311,19 @@ static char* aux_get_target_from_action(const_LinkAction *act)
+ 	switch (act->getKind())
+ 	{
+ 		case actionGoToR:
+-			tmp=((LinkGoToR*)act)->getFileName(); break;
++			{tmp=((LinkGoToR*)act)->getFileName(); break;}
+ 
+ 		case actionLaunch:
+-			tmp=((LinkLaunch*)act)->getFileName(); break;
++			{tmp=((LinkLaunch*)act)->getFileName(); break;}
+ 
+ 		case actionURI:
+-			tmp=((LinkURI*)act)->getURI(); break;
++			{GooString gstr=GooString(((LinkURI*)act)->getURI()); tmp=&gstr; break;}
+ 			
+ 		case actionNamed:
+-			tmp=((LinkNamed*)act)->getName(); break;
++			{GooString gstr=GooString(((LinkNamed*)act)->getName()); tmp=&gstr; break;}
+ 
+ 		case actionMovie:
+-			tmp=((LinkMovie*)act)->getAnnotTitle(); break;
++			{GooString gstr=GooString(((LinkMovie*)act)->getAnnotTitle()); tmp=&gstr; break;}
+ 
+ 		default:
+ 			break;