tag 679885 + pending thanks, Dear maintainer,
I've prepared an NMU for gambas3 (versioned as 3.1.1-2.2) and uploaded it to DELAYED/14. Please feel free to tell me if I should delay it longer. Regards, -- Pino
diff -Nru gambas3-3.1.1/debian/changelog gambas3-3.1.1/debian/changelog --- gambas3-3.1.1/debian/changelog 2013-06-05 00:16:52.000000000 +0200 +++ gambas3-3.1.1/debian/changelog 2013-07-23 11:34:39.000000000 +0200 @@ -1,3 +1,11 @@ +gambas3 (3.1.1-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Backport upstream r4730, r4731, and r4732 to fix compatibility with + Poppler >= 0.20.x (Closes: #679885) + + -- Pino Toscano <p...@debian.org> Tue, 23 Jul 2013 11:32:16 +0200 + gambas3 (3.1.1-2.1) unstable; urgency=low [ Sebastian Ramacher ] diff -Nru gambas3-3.1.1/debian/patches/poppler-0.20.diff gambas3-3.1.1/debian/patches/poppler-0.20.diff --- gambas3-3.1.1/debian/patches/poppler-0.20.diff 1970-01-01 01:00:00.000000000 +0100 +++ gambas3-3.1.1/debian/patches/poppler-0.20.diff 2013-07-23 11:34:44.000000000 +0200 @@ -0,0 +1,110 @@ +Description: Support Poppler >= 0.20.x + Merge of the upstream r4730, r4731, and r4732. +Origin: upstream, commit:4730, http://gambas.svn.sourceforge.net/viewvc/gambas?view=revision&revision=4730 +Origin: upstream, commit:4731, http://gambas.svn.sourceforge.net/viewvc/gambas?view=revision&revision=4731 +Origin: upstream, commit:4732, http://gambas.svn.sourceforge.net/viewvc/gambas?view=revision&revision=4732 + +--- a/gb.pdf/configure.ac ++++ b/gb.pdf/configure.ac +@@ -24,6 +24,8 @@ + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) + pkg-config --atleast-version=0.17.0 poppler + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) ++ pkg-config --atleast-version=0.20.0 poppler ++ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) + fi + + AC_OUTPUT( \ +--- a/gb.pdf/src/CPdfDocument.cpp ++++ b/gb.pdf/src/CPdfDocument.cpp +@@ -449,9 +449,13 @@ + + white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; + THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); +- +- THIS->dev->startDoc(THIS->doc->getXRef ()); + ++ #if POPPLER_VERSION_0_20 ++ THIS->dev->startDoc(THIS->doc); ++ #else ++ THIS->dev->startDoc(THIS->doc->getXRef ()); ++ #endif ++ + outline=THIS->doc->getOutline(); + if (outline) THIS->index=outline->getItems(); + +@@ -875,6 +879,14 @@ + + if ( (w<0) || (h<0) ) return NULL; + ++ #if POPPLER_VERSION_0_20 ++ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, ++ rotation, ++ gFalse, ++ gTrue, ++ x,y,w,h, ++ gFalse); ++ #else + THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, + rotation, + gFalse, +@@ -882,7 +894,8 @@ + x,y,w,h, + gFalse, + THIS->doc->getCatalog ()); +- ++ #endif ++ + map=THIS->dev->getBitmap(); + + data=(uint32_t*)map->getDataPtr(); +@@ -940,9 +953,14 @@ + w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); + 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); ++ #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); +- ++ #endif ++ + THIS->page->display(gfx); + dev->endPage(); + +@@ -970,7 +988,9 @@ + + void aux_fill_links(void *_object) + { +- #if POPPLER_VERSION_0_17 ++ #if POPPLER_VERSION_0_20 ++ THIS->links = new Links (THIS->page->getAnnots ()); ++ #elif POPPLER_VERSION_0_17 + THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); + #else + Object obj; +@@ -1152,13 +1172,22 @@ + + if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); + ++ #if POPPLER_VERSION_0_20 ++ textdev = new TextOutputDev (NULL, true, 0, false, false); ++ THIS->page->display (textdev, 72, 72, 0, false, false, false); ++ #else + textdev = new TextOutputDev (NULL, true, false, false); + THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); ++ #endif + + if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } + + count = 0; ++ #if POPPLER_VERSION_0_20 ++ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) ++ #else + while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) ++ #endif + { + if (!THIS->Found) + GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1); diff -Nru gambas3-3.1.1/debian/patches/series gambas3-3.1.1/debian/patches/series --- gambas3-3.1.1/debian/patches/series 2013-06-05 00:16:04.000000000 +0200 +++ gambas3-3.1.1/debian/patches/series 2013-07-23 11:34:52.000000000 +0200 @@ -1,3 +1,4 @@ detect_browser_debian dont_compile_examples 701393.patch +poppler-0.20.diff
signature.asc
Description: This is a digitally signed message part.
