Date: Thursday, November 1, 2018 @ 20:35:11
Author: arojas
Revision: 401150
Fix build with poppler 0.71
Added:
gambas3/trunk/gambas-poppler-0.71.patch
Modified:
gambas3/trunk/PKGBUILD
---------------------------+
PKGBUILD | 7 +++-
gambas-poppler-0.71.patch | 63 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-01 20:01:38 UTC (rev 401149)
+++ PKGBUILD 2018-11-01 20:35:11 UTC (rev 401150)
@@ -42,9 +42,11 @@
'gmime3')
options=('!emptydirs' 'libtool')
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)
+ 0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch
+ gambas-poppler-0.71.patch)
sha512sums=('1b5a22b13a69e43831e2348b6c89a6ddd38f3a98cf70176322f360a75616d8b15a189353e9a5637be194960875c1fe775c5f2b11a9919aa552d572e409e7f767'
-
'51daba92877e52f578c74f0c46f58151a9ee7cdd32993845f269d598cca7c0068880a47a3ec3f9e3e862032be5b2b37c4c35e2ee50f72f117ba627f337ef26d7')
+
'51daba92877e52f578c74f0c46f58151a9ee7cdd32993845f269d598cca7c0068880a47a3ec3f9e3e862032be5b2b37c4c35e2ee50f72f117ba627f337ef26d7'
+
'57c450ff4f42d41a10d305a4784d647001601a3efdf37cda936dc456d15f0a65ff23f1dc3fd3e710651a0a0648c6d720345d93dfa61f1955e98258494360d462')
create_dirs() {
install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -54,6 +56,7 @@
prepare() {
cd ${srcdir}/gambas-${pkgver}
+ patch -p1 -i ../gambas-poppler-0.71.patch # Fix build with poppler 0.71
./reconf-all
}
Added: gambas-poppler-0.71.patch
===================================================================
--- gambas-poppler-0.71.patch (rev 0)
+++ gambas-poppler-0.71.patch 2018-11-01 20:35:11 UTC (rev 401150)
@@ -0,0 +1,63 @@
+--- gambas-3.11.4/gb.pdf/src/CPdfDocument.cpp.orig 2018-11-01
20:05:27.379728413 +0000
++++ gambas-3.11.4/gb.pdf/src/CPdfDocument.cpp 2018-11-01 20:05:51.586459136
+0000
+@@ -478,7 +478,7 @@
+ THIS->len=len;
+
+ white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
+- THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
++ THIS->dev=new SplashOutputDev(splashModeRGB8, 3, false, white);
+
+ #if POPPLER_VERSION_0_20
+ THIS->dev->startDoc(THIS->doc);
+@@ -922,17 +922,17 @@
+ #if POPPLER_VERSION_0_20
+ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
+ rotation,
+- gFalse,
+- gTrue,
++ false,
++ true,
+ x,y,w,h,
+- gFalse);
++ false);
+ #else
+ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
+ rotation,
+- gFalse,
+- gTrue,
++ false,
++ true,
+ x,y,w,h,
+- gFalse,
++ false,
+ THIS->doc->getCatalog ());
+ #endif
+
+@@ -994,11 +994,11 @@
+ h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
+
+ #if POPPLER_VERSION_0_20
+- dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
+- gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1,
-1, gFalse, NULL, NULL);
++ dev = new TextOutputDev (NULL, true, 0, false, false);
++ gfx = THIS->page->createGfx(dev,72.0,72.0,0,false,true,-1, -1, -1, -1,
false, NULL, NULL);
+ #else
+- dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
+- gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1,
-1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
++ dev = new TextOutputDev (NULL, true, false, false);
++ gfx = THIS->page->createGfx(dev,72.0,72.0,0,false,true,-1, -1, -1, -1,
false,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
+ #endif
+
+ THIS->page->display(gfx);
+@@ -1226,9 +1226,9 @@
+
+ count = 0;
+ #if POPPLER_VERSION_0_20
+- while (textdev->findText
(block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
++ while (textdev->findText
(block,nlen,false,true,true,false,sensitive,false,false,&x0,&y0,&x1,&y1))
+ #else
+- while (textdev->findText
(block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
++ while (textdev->findText
(block,nlen,false,true,true,false,sensitive,false,&x0,&y0,&x1,&y1))
+ #endif
+ {
+ if (!THIS->Found)
