tag 679893 + pending thanks Dear maintainer,
I've prepared an NMU for popplerkit.framework (versioned as 0.0.20051227svn-7.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should delay it longer. Regards, -- Pino
diff -Nru popplerkit.framework-0.0.20051227svn/debian/changelog popplerkit.framework-0.0.20051227svn/debian/changelog --- popplerkit.framework-0.0.20051227svn/debian/changelog 2012-05-31 18:29:50.000000000 +0200 +++ popplerkit.framework-0.0.20051227svn/debian/changelog 2013-07-23 12:33:18.000000000 +0200 @@ -1,3 +1,10 @@ +popplerkit.framework (0.0.20051227svn-7.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix compatibility with Poppler >= 0.20.x (Closes: #679893) + + -- Pino Toscano <p...@debian.org> Tue, 23 Jul 2013 12:33:12 +0200 + popplerkit.framework (0.0.20051227svn-7) unstable; urgency=low * debian/compat: Set to 8. diff -Nru popplerkit.framework-0.0.20051227svn/debian/patches/poppler020.patch popplerkit.framework-0.0.20051227svn/debian/patches/poppler020.patch --- popplerkit.framework-0.0.20051227svn/debian/patches/poppler020.patch 1970-01-01 01:00:00.000000000 +0100 +++ popplerkit.framework-0.0.20051227svn/debian/patches/poppler020.patch 2013-07-23 12:27:33.000000000 +0200 @@ -0,0 +1,113 @@ +Description: Support Poppler 0.20 + Add version 0.20 detection to config.sh + startDoc now takes a PDFDoc not its XRef + findText no longer takes a Catalog argument + TextOutputDev now takes a wholeWord argument +Author: Andy Whitcroft <a...@ubuntu.com> +Author: Pino Toscano <p...@debian.org> +Last-Update: 2013-07-23 +Bug-Debian: http://bugs.debian.org/679893 + +--- a/bindings/poppler_splash_renderer.cc ++++ b/bindings/poppler_splash_renderer.cc +@@ -57,7 +57,13 @@ + return; + } + +- SYNCHRONIZED(SPLASH_DEV(output_dev)->startDoc(PDF_DOC(poppler_document)->getXRef())); ++ SYNCHRONIZED(SPLASH_DEV(output_dev)->startDoc( ++#ifdef POPPLER_0_20 ++ PDF_DOC(poppler_document) ++#else ++ PDF_DOC(poppler_document)->getXRef() ++#endif ++ )); + } + + void poppler_splash_device_destroy(void* output_dev) +@@ -92,11 +98,14 @@ + (int)sliceX, (int)sliceY, + (int)sliceW, (int)sliceH, + #ifdef POPPLER_0_6 +- gFalse, // printing ++ gFalse // printing + #else +- NULL, // Links ++ NULL // Links ++#endif ++#ifndef POPPLER_0_20 ++ , PDF_DOC(poppler_document)->getCatalog() + #endif +- PDF_DOC(poppler_document)->getCatalog())); ++ )); + + return 1; + } +--- a/config.sh ++++ b/config.sh +@@ -64,6 +64,11 @@ + POPPLER_VERSION="POPPLER_0_6" + fi + ++${PKG_CONFIG} --atleast-version=0.20.0 poppler ++if [ $? -eq 0 ]; then ++ POPPLER_VERSION="POPPLER_0_20" ++fi ++ + echo $POPPLER_VERSION + + # include freetype, just to be sure +--- a/bindings/GNUmakefile ++++ b/bindings/GNUmakefile +@@ -53,4 +53,8 @@ + bindings_CCFLAGS += -DPOPPLER_0_6 + endif + ++ifeq ($(POPPLER_0_20), YES) ++ bindings_CCFLAGS += -DPOPPLER_0_20 ++endif ++ + include $(GNUSTEP_MAKEFILES)/subproject.make +--- a/bindings/poppler_text.cc ++++ b/bindings/poppler_text.cc +@@ -29,7 +29,11 @@ + void* poppler_text_device_create(int use_phys_layout, int use_raw_text_order, int append) + { + BEGIN_SYNCHRONIZED; +- void* textDevice = new TextOutputDev(NULL, use_phys_layout, use_raw_text_order, append); ++ void* textDevice = new TextOutputDev(NULL, use_phys_layout, ++#ifdef POPPLER_0_20 ++ 0, ++#endif ++ use_raw_text_order, append); + END_SYNCHRONIZED; + + return textDevice; +@@ -56,11 +60,14 @@ + #endif + crop, + #ifdef POPPLER_0_6 +- gFalse, // printing ++ gFalse // printing + #else +- NULL, // links ++ NULL // links ++#endif ++#ifndef POPPLER_0_20 ++ ,PDF_DOC(poppler_document)->getCatalog() + #endif +- PDF_DOC(poppler_document)->getCatalog())); ++ )); + return 1; + } + +@@ -79,6 +86,9 @@ + #ifndef POPPLER_0_4 // 0.5, 0.6 + gTrue, gFalse, + #endif ++#ifdef POPPLER_0_20 ++ gFalse, ++#endif + x_min, y_min, x_max, y_max); + END_SYNCHRONIZED; + diff -Nru popplerkit.framework-0.0.20051227svn/debian/patches/series popplerkit.framework-0.0.20051227svn/debian/patches/series --- popplerkit.framework-0.0.20051227svn/debian/patches/series 2012-05-31 17:32:59.000000000 +0200 +++ popplerkit.framework-0.0.20051227svn/debian/patches/series 2013-07-23 12:27:34.000000000 +0200 @@ -1,3 +1,4 @@ etoile.patch poppler06.patch C++-compilation.patch +poppler020.patch
signature.asc
Description: This is a digitally signed message part.
