Package: gambas2 Version: 2.23.1-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer, We are using this patch in Ubuntu to handle the changes in libpoppler's API version 19 to version 25/26. Please consider for Debian. * Track API changes in libpoppler19 to libpoppler25 transition. Thanks for considering the patch. -apw -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise-proposed'), (500, 'precise'), (100, 'precise-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru gambas2-2.23.1/debian/changelog gambas2-2.23.1/debian/changelog diff -Nru gambas2-2.23.1/debian/patches/series gambas2-2.23.1/debian/patches/series --- gambas2-2.23.1/debian/patches/series 2011-12-06 10:12:46.000000000 +0000 +++ gambas2-2.23.1/debian/patches/series 2012-06-08 17:36:56.000000000 +0100 @@ -4,3 +4,4 @@ fixFTBS_kfreeBSD remove_harcoded_kde.patch poppler-0.18.patch +track_libpoppler25_api_changes.patch diff -Nru gambas2-2.23.1/debian/patches/track_libpoppler25_api_changes.patch gambas2-2.23.1/debian/patches/track_libpoppler25_api_changes.patch --- gambas2-2.23.1/debian/patches/track_libpoppler25_api_changes.patch 1970-01-01 01:00:00.000000000 +0100 +++ gambas2-2.23.1/debian/patches/track_libpoppler25_api_changes.patch 2012-06-11 08:36:33.000000000 +0100 @@ -0,0 +1,74 @@ +Description: track API changes in poppler libraries + The poppler libraries have updated from libpoppler19 to libpoppler25, track + API changes. + . + startDoc() now takes a PDFDoc object instead of an XRef + findText() now takes an additional Bool which indicates wholeword searches + TextOutputDev() now takes an additional fixedPitch which is only used when + the preceeding argument is gTrue + createGfx() no longer takes a Catalog argument + getAnnots() no longer takes a Catalog argument + display() no longer takes a Catalog argument nor display selector +Author: Andy Whitcroft <a...@ubuntu.com> +Last-Update: 2012-06-08 + +Index: gambas2-2.23.1/gb.pdf/src/CPdfDocument.cpp +=================================================================== +--- gambas2-2.23.1.orig/gb.pdf/src/CPdfDocument.cpp 2012-06-11 08:33:06.676871126 +0100 ++++ gambas2-2.23.1/gb.pdf/src/CPdfDocument.cpp 2012-06-11 08:35:28.481574298 +0100 +@@ -407,7 +407,7 @@ + white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; + THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); + +- THIS->dev->startDoc(THIS->doc->getXRef ()); ++ THIS->dev->startDoc(THIS->doc); + + outline=THIS->doc->getOutline(); + if (outline) THIS->index=outline->getItems(); +@@ -838,8 +838,7 @@ + gFalse, + gTrue, + x,y,w,h, +- gFalse, +- THIS->doc->getCatalog ()); ++ gFalse); + + map=THIS->dev->getBitmap(); + +@@ -929,9 +928,9 @@ + w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); + h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); + +- dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); ++ dev = new TextOutputDev (NULL, gTrue, gFalse, 0, 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); ++ gFalse,NULL, NULL); + + THIS->page->display(gfx); + dev->endPage(); +@@ -961,7 +960,7 @@ + { + Object obj; + +- THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); ++ THIS->links = new Links (THIS->page->getAnnots ()); + obj.free(); + } + +@@ -1195,12 +1194,12 @@ + + if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); + +- textdev = new TextOutputDev (NULL, true, false, false); +- THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); ++ textdev = new TextOutputDev (NULL, true, false, 0, false); ++ THIS->page->display (textdev, 72, 72, 0, false, false, false); + + if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } + +- while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) ++ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) + { + if (!THIS->Found) { + GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1);