diff -Nru gambas3-3.1.1/debian/changelog gambas3-3.1.1/debian/changelog --- gambas3-3.1.1/debian/changelog 2012-05-24 12:22:15.000000000 +0100 +++ gambas3-3.1.1/debian/changelog 2012-06-20 11:25:27.000000000 +0100 @@ -1,3 +1,9 @@ +gambas3 (3.1.1-2ubuntu1) quantal; urgency=low + + * Track changes to libpoppler25 API. + + -- Andy Whitcroft Wed, 20 Jun 2012 11:01:50 +0100 + gambas3 (3.1.1-2) unstable; urgency=low * debian/control: diff -Nru gambas3-3.1.1/debian/control gambas3-3.1.1/debian/control --- gambas3-3.1.1/debian/control 2012-05-24 12:25:53.000000000 +0100 +++ gambas3-3.1.1/debian/control 2012-06-20 11:22:05.000000000 +0100 @@ -2,7 +2,8 @@ Section: devel Priority: optional Homepage: http://gambas.sourceforge.net -Maintainer: Gambas Debian Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Gambas Debian Maintainers Uploaders: Ian Haywood , David Paleino , José L. Redrejo Rodríguez Build-Depends: debhelper (>> 7), dh-autoreconf, libpq-dev, libv4l-dev [linux-any], libcam-dev [kfreebsd-any], libmysqlclient-dev, libbz2-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libcurl4-openssl-dev, libsdl-mixer1.2-dev, libsqlite0-dev, libxml2-dev, libxslt1-dev, kdelibs5-dev, libssl-dev, zlib1g-dev, unixodbc-dev, libsqlite3-dev, libgtk2.0-dev, libxt-dev, pkg-config, mesa-common-dev, libsdl-sound1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libpcre3-dev, libsdl1.2-dev, libjpeg-dev, libpng12-dev, libpoppler-private-dev, libimlib2-dev, librsvg2-dev, bzip2, gettext, libxtst-dev, libffi-dev, libdbus-1-dev, libgnome-keyring-dev, libgtkglext1-dev, linux-libc-dev [linux-any], libc0.1 [kfreebsd-any], libqtwebkit-dev Standards-Version: 3.9.3 diff -Nru gambas3-3.1.1/debian/patches/series gambas3-3.1.1/debian/patches/series --- gambas3-3.1.1/debian/patches/series 2012-05-24 12:00:02.000000000 +0100 +++ gambas3-3.1.1/debian/patches/series 2012-06-20 10:49:18.000000000 +0100 @@ -1,2 +1,3 @@ detect_browser_debian dont_compile_examples +track_libpoppler25_api diff -Nru gambas3-3.1.1/debian/patches/track_libpoppler25_api gambas3-3.1.1/debian/patches/track_libpoppler25_api --- gambas3-3.1.1/debian/patches/track_libpoppler25_api 1970-01-01 01:00:00.000000000 +0100 +++ gambas3-3.1.1/debian/patches/track_libpoppler25_api 2012-06-20 13:09:05.000000000 +0100 @@ -0,0 +1,136 @@ +Description: track changes to libpoppler25 API + Track changes to libpoppler25 API: + . + startDoc now takes a PDFDoc rather than its XRef. + displaySlice no longer takes a Catalog argument. + TextOutputDev now takes a fixedPitch argument (0 for previous behavior). + createGfx no longer takes a Catalog nor (unused) annotation + callback descriminator. + getAnnots no longer takes a Catalog argument. + . + Also adds configure support for poppler version 20 (API version 25) +Author: Andy Whitcroft +Last-Update: 2012-06-20 +Index: gambas3-3.1.1/gb.pdf/src/CPdfDocument.cpp +=================================================================== +--- gambas3-3.1.1.orig/gb.pdf/src/CPdfDocument.cpp 2012-06-20 12:13:11.670036741 +0100 ++++ gambas3-3.1.1/gb.pdf/src/CPdfDocument.cpp 2012-06-20 12:54:39.618373811 +0100 +@@ -450,7 +450,13 @@ + 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( ++#ifdef POPPLER_VERSION_0_20 ++ THIS->doc ++#else ++ THIS->doc->getXref () ++#endif ++ ); + + outline=THIS->doc->getOutline(); + if (outline) THIS->index=outline->getItems(); +@@ -880,8 +886,11 @@ + gFalse, + gTrue, + x,y,w,h, +- gFalse, +- THIS->doc->getCatalog ()); ++ gFalse ++#ifndef POPPLER_VERSION_0_20 ++ , THIS->doc->getCatalog () ++#endif ++ ); + + map=THIS->dev->getBitmap(); + +@@ -940,8 +949,20 @@ + w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); + h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); + +- 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, gTrue, ++#ifdef POPPLER_VERSION_0_20 ++ 0, ++#endif ++ gFalse, gFalse); ++ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse ++#ifndef POPPLER_VERSION_0_20 ++ , THIS->doc->getCatalog () ++#endif ++ , NULL, NULL ++#ifndef POPPLER_VERSION_0_20 ++ , NULL, NULL ++#endif ++ ); + + THIS->page->display(gfx); + dev->endPage(); +@@ -970,7 +991,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 +1175,25 @@ + + 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, ++#ifdef POPPLER_VERSION_0_20 ++ 0, ++#endif ++ false, false); ++ THIS->page->display (textdev, 72, 72, 0, false, false, false ++#ifndef POPPLER_VERSION_0_20 ++ , THIS->doc->getCatalog() ++#endif ++ ); + + if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } + + count = 0; +- 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, ++#ifdef POPPLER_VERSION_0_20 ++ gFalse, ++#endif ++ &x0,&y0,&x1,&y1)) + { + if (!THIS->Found) + GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1); +Index: gambas3-3.1.1/gb.pdf/configure.ac +=================================================================== +--- gambas3-3.1.1.orig/gb.pdf/configure.ac 2012-06-20 12:13:11.654036663 +0100 ++++ gambas3-3.1.1/gb.pdf/configure.ac 2012-06-20 12:13:15.138053936 +0100 +@@ -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( \ +Index: gambas3-3.1.1/gb.pdf/config.h.in +=================================================================== +--- gambas3-3.1.1.orig/gb.pdf/config.h.in 2012-06-20 12:13:11.642036604 +0100 ++++ gambas3-3.1.1/gb.pdf/config.h.in 2012-06-20 12:13:15.138053936 +0100 +@@ -147,6 +147,9 @@ + /* Poppler version >= 0.11.3 */ + #undef POPPLER_VERSION_0_11_3 + ++/* Poppler version >= 0.20 */ ++#undef POPPLER_VERSION_0_20 ++ + /* Poppler version >= 0.17 */ + #undef POPPLER_VERSION_0_17 +