Date: Tuesday, April 24, 2018 @ 22:16:43
Author: arojas
Revision: 317640
poppler 0.64 rebuild
Added:
gambas3/trunk/gambas-poppler-0.64.patch
Modified:
gambas3/trunk/PKGBUILD
---------------------------+
PKGBUILD | 10 ++-
gambas-poppler-0.64.patch | 115 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 122 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-24 22:16:36 UTC (rev 317639)
+++ PKGBUILD 2018-04-24 22:16:43 UTC (rev 317640)
@@ -16,7 +16,7 @@
'gambas3-gb-util-web' 'gambas3-gb-util' 'gambas3-gb-v4l'
'gambas3-gb-vb' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc'
'gambas3-gb-xml-xslt' 'gambas3-gb-xml'
'gambas3-gb-web-feed' 'gambas3-gb-web-form' 'gambas3-gb-web'
'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
pkgver=3.10.0
-pkgrel=5
+pkgrel=6
pkgdesc="A free development environment based on a Basic interpreter."
arch=('x86_64')
url="http://gambas.sourceforge.net/";
@@ -31,11 +31,12 @@
'gmime')
options=('!emptydirs' 'libtool')
source=("${pkgbase}-${pkgver}::https://gitlab.com/gambas/gambas/repository/v${pkgver}/archive.tar.bz2";
- 'prefer-qt5.patch' '0001-adapt-to-poppler-0.58.patch'
'sdl2_mixer.diff')
+ 'prefer-qt5.patch' '0001-adapt-to-poppler-0.58.patch'
'sdl2_mixer.diff' 'gambas-poppler-0.64.patch')
md5sums=('ca2bd77b4a6b0b5f2b36de335e2d4384'
'71131eb16bbdf27bf6d329f089602cf7'
'f82c6633e79a07e2b6542ec1ceccfbff'
- '57c5a2125a526a6011f68a405480a3af')
+ '57c5a2125a526a6011f68a405480a3af'
+ 'd84b0a03e2bfc50e5267255d6b24e220')
create_dirs() {
install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -51,6 +52,9 @@
# poppler 0.58 buildfix
patch -Np1 -i ../0001-adapt-to-poppler-0.58.patch
+ # fix build with poppler 0.64
+ patch -p1 -i ../gambas-poppler-0.64.patch
+
# fix build with sdl2_mixer >= 2.0.2
# Flags MIX_INIT_MODPLUG was removed, and MIX_INIT_FLUIDSYNTH was
# renamed to MIX_INIT_MID.
Added: gambas-poppler-0.64.patch
===================================================================
--- gambas-poppler-0.64.patch (rev 0)
+++ gambas-poppler-0.64.patch 2018-04-24 22:16:43 UTC (rev 317640)
@@ -0,0 +1,115 @@
+diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
+index 80d2d97c5..7e44ebe98 100644
+--- a/gb.pdf/src/CPdfDocument.cpp
++++ b/gb.pdf/src/CPdfDocument.cpp
+@@ -99,7 +99,7 @@ END_PROPERTY
+
+ ****************************************************************************/
+
+-static void return_unicode_string(Unicode *unicode, int len)
++static void return_unicode_string(const Unicode *unicode, int len)
+ {
+ static UnicodeMap *uMap = NULL;
+
+@@ -128,7 +128,7 @@ static void aux_return_string_info(void *_object, const
char *key)
+ {
+ Object obj;
+ Object dst;
+- GooString *goo_value;
++ const GooString *goo_value;
+ Dict *info_dict;
+ char *tmpstr;
+
+@@ -170,7 +170,7 @@ static void aux_return_date_info(void *_object, const char
*key)
+ GB_DATE ret;
+ Object obj;
+ Object dst;
+- GooString *goo;
++ const GooString *goo;
+ Dict *info_dict;
+ char *datestr=NULL,*tofree=NULL;
+ int nnum;
+@@ -221,7 +221,7 @@ static void aux_return_date_info(void *_object, const char
*key)
+ #endif
+ }
+
+-static LinkDest *get_dest(LinkAction *act)
++static const LinkDest *get_dest(LinkAction *act)
+ {
+ if (!act)
+ return 0;
+@@ -237,9 +237,9 @@ static LinkDest *get_dest(LinkAction *act)
+ static uint32_t aux_get_page_from_action(void *_object, LinkAction *act)
+ {
+ Ref pref;
+- LinkDest *dest = get_dest(act);
++ const LinkDest *dest = get_dest(act);
+ #if POPPLER_VERSION_0_6
+- GooString *name;
++ const GooString *name;
+ #else
+ UGooString *name;
+ #endif
+@@ -272,7 +272,7 @@ static uint32_t aux_get_page_from_action(void *_object,
LinkAction *act)
+
+ static void aux_get_dimensions_from_action(LinkAction *act, CPDFRECT *rect)
+ {
+- LinkDest *dest = get_dest(act);
++ const LinkDest *dest = get_dest(act);
+ if (!dest)
+ return;
+
+@@ -284,7 +284,7 @@ static void aux_get_dimensions_from_action(LinkAction
*act, CPDFRECT *rect)
+
+ static double aux_get_zoom_from_action(LinkAction *act)
+ {
+- LinkDest *dest = get_dest(act);
++ const LinkDest *dest = get_dest(act);
+ if (dest)
+ return dest->getZoom();
+ else
+@@ -295,7 +295,7 @@ static char* aux_get_target_from_action(LinkAction *act)
+ {
+ char *vl=NULL;
+ char *uni=NULL;
+- GooString *tmp=NULL;
++ const GooString *tmp=NULL;
+
+ switch (act->getKind())
+ {
+@@ -480,7 +480,7 @@ int32_t open_document (void *_object, char *sfile, int32_t
lfile)
+ #endif
+
+ outline=THIS->doc->getOutline();
+- if (outline) THIS->index=outline->getItems();
++ if (outline) THIS->index=(GooList*)outline->getItems();
+
+ //if (THIS->index)
+ // if (!THIS->index->getLength()) THIS->index=NULL;
+@@ -715,7 +715,7 @@ BEGIN_PROPERTY(PDFDOCUMENT_index)
+
+ if (!THIS->index) { GB.ReturnNull(); return; }
+
+-
THIS->action=((OutlineItem*)THIS->index->get(THIS->currindex))->getAction();
++
THIS->action=(LinkAction*)((OutlineItem*)THIS->index->get(THIS->currindex))->getAction();
+ RETURN_SELF();
+
+ END_PROPERTY
+@@ -764,7 +764,7 @@ BEGIN_METHOD_VOID(PDFINDEX_root)
+ Outline *outline;
+
+ outline=THIS->doc->getOutline();
+- if (outline) THIS->index=outline->getItems();
++ if (outline) THIS->index=(GooList*)outline->getItems();
+ THIS->currindex=0;
+ if (THIS->pindex) { GB.FreeArray(POINTER(&THIS->pindex));
THIS->pindex=NULL; }
+ if (THIS->oldindex) { GB.FreeArray(POINTER(&THIS->oldindex));
THIS->oldindex=NULL; }
+@@ -812,7 +812,7 @@ BEGIN_METHOD_VOID(PDFINDEX_child)
+ if (!item->isOpen()) item->open();
+ THIS->pindex[GB.Count(POINTER(THIS->pindex))-1]=(void*)THIS->index;
+ THIS->oldindex[GB.Count(POINTER(THIS->pindex))-1]=THIS->currindex;
+- THIS->index=item->getKids();
++ THIS->index=(GooList*)item->getKids();
+ THIS->currindex=0;
+
+ GB.ReturnBoolean(false);
