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

[Antonio Rojas]

    Date: Tuesday, April 23, 2019 @ 21:58:11
  Author: arojas
Revision: 453247

Fix build with poppler 0.76

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

---------------------------+
 PKGBUILD                  |    9 ++++++---
 gambas-poppler-0.76.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-23 21:57:56 UTC (rev 453246)
+++ PKGBUILD	2019-04-23 21:58:11 UTC (rev 453247)
@@ -42,9 +42,11 @@
 	 'gmime3')
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
-        gambas-poppler-0.73.patch)
+        gambas-poppler-0.73.patch
+        gambas-poppler-0.76.patch)
 sha512sums=('b6c7cae4b953b4303bf4b7856fd17611c1b2ea0d3253f3d2c19c04cb7836a08da49b50f1d0412353e5fc869935b8a24c4b9a93b1893ecd290bfa54774ad01270'
-            'de829f45c874958dc0f60649b13605d67d9173c8676a2accb518131520e366aaf724fd7a817ee69be0c9280f27bef339df6d973e718580754737c3c4640fa37d')
+            'de829f45c874958dc0f60649b13605d67d9173c8676a2accb518131520e366aaf724fd7a817ee69be0c9280f27bef339df6d973e718580754737c3c4640fa37d'
+            '41c633291fd8508f319006e37ade3965cef7e008b3cc0c46400efff423fe2f808ed43723389d43d9b9af95ed2faeccf4a02d3f3f6ada87dd0c67eafb9ac5f5d5')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -54,7 +56,8 @@
 prepare() {
   cd ${srcdir}/gambas-${pkgver}
 
- patch -Np1 -i ../gambas-poppler-0.73.patch
+  patch -Np1 -i ../gambas-poppler-0.73.patch
+  patch -p1 -i ../gambas-poppler-0.76.patch
   ./reconf-all
 }
 

Added: gambas-poppler-0.76.patch
===================================================================
--- gambas-poppler-0.76.patch	                        (rev 0)
+++ gambas-poppler-0.76.patch	2019-04-23 21:58:11 UTC (rev 453247)
@@ -0,0 +1,42 @@
+diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
+index 0610a65d8..f9319389b 100644
+--- a/gb.pdf/src/CPdfDocument.cpp
++++ b/gb.pdf/src/CPdfDocument.cpp
+@@ -40,7 +40,6 @@
+ #include <TextOutputDev.h>
+ #include <SplashOutputDev.h>
+ #include <splash/SplashBitmap.h>
+-#include <goo/GooList.h>
+ #include <Outline.h>
+ #include <Link.h>
+ #include <Gfx.h>
+@@ -833,7 +832,7 @@ BEGIN_METHOD_VOID(PDFINDEX_parent)
+ 
+ 	if (!THIS->pindex) { GB.ReturnBoolean(true); return; }
+ 
+-	THIS->index=(GooList*)THIS->pindex[GB.Count(POINTER(THIS->pindex))-1];
++	THIS->index=(std::vector<void*>)THIS->pindex[GB.Count(POINTER(THIS->pindex))-1];
+ 	THIS->currindex=THIS->oldindex[GB.Count(POINTER(THIS->pindex))-1];
+ 	if (GB.Count(POINTER(THIS->pindex))==1)
+ 	{
+diff --git a/gb.pdf/src/CPdfDocument.h b/gb.pdf/src/CPdfDocument.h
+index fa80d47a9..e9afdbf81 100644
+--- a/gb.pdf/src/CPdfDocument.h
++++ b/gb.pdf/src/CPdfDocument.h
+@@ -29,7 +29,6 @@
+ #include <PDFDoc.h>
+ #include <SplashOutputDev.h>
+ #include <Page.h>
+-#include <goo/GooList.h>
+ #include <stdint.h>
+ 
+ #if POPPLER_VERSION_0_64
+@@ -93,7 +92,7 @@ typedef
+ 		uint currpage;
+ 
+ 		void **pindex;            // Parent of current index entries
+-		const_GooList *index;     // Current entries
++		std::vector<void*> index;     // Current entries
+ 		
+ 		uint currindex;           // Current entry
+ 		uint *oldindex;           // Parent entry