Bug#651151: Patch for porting to poppler 0.18

[Martin Pitt]

Package: pdftoipe
Version: 20091014-3
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch precise

Hello,

In http://bugs.debian.org/644447 there is some discussion about
updating poppler to 0.18 in Debian. This will cause some FTBFS. We are
doing the transition in Ubuntu now and want to forward patches so that
they are readily available in Ubuntu once 0.18 lands there.

pdftoipe does not have a patch system and is not 3.0 (quilt) yet. I
suppose if you apply this you actually want to use a broken-out patch,
but that's the discretion of you as the package maintainer of course.

Thanks for considering,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)

diff -u pdftoipe-20091014/debian/changelog pdftoipe-20091014/debian/changelog
--- pdftoipe-20091014/debian/changelog
+++ pdftoipe-20091014/debian/changelog
@@ -1,3 +1,12 @@
+pdftoipe (20091014-3ubuntu1) precise; urgency=low
+
+  * Build against libpoppler19.
+  * xmloutputdev.cpp: port to poppler 0.18 API:
+    - Add missing #include <DCTStream.h>
+    - getRawStream() is now called getNextStream().
+
+ -- Martin Pitt <martin.p...@ubuntu.com>  Tue, 06 Dec 2011 09:47:55 +0100
+
 pdftoipe (20091014-3) unstable; urgency=low
 
   * rules: Rename parseargs.c --> parseargs.cpp so it builds with c++
only in patch2:
unchanged:
--- pdftoipe-20091014.orig/xmloutputdev.cpp
+++ pdftoipe-20091014/xmloutputdev.cpp
@@ -14,6 +14,7 @@
 #include "Catalog.h"
 #include "Page.h"
 #include "Stream.h"
+#include "DCTStream.h"
 
 #include "xmloutputdev.h"
 
@@ -336,7 +337,7 @@
     // dump JPEG stream
     std::vector<char> buffer;
     // initialize stream
-    str = ((DCTStream *)str)->getRawStream();
+    str = ((DCTStream *)str)->getNextStream();
     str->reset();
     // copy the stream
     while ((c = str->getChar()) != EOF)

signature.asc
Description: Digital signature