[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-3-36-gda775b4

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.5 branch:
commit da775b4af68ae073e671e5ccc8bebf6796febe29
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Oct 31 18:09:42 2012 +0100

    fix build with poppler 0.21.x and test with poppler 0.20.x(!)

diff --git a/changelog b/changelog
index 31fe014..c6db22c 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
   * new upstream release
     - caches fontconfig font substitutions (closes: #681308) 
 
+  * debian/patches/poppler_0_2*.diff: fix build of sdext with poppler
+    0.21.0 and fix the test with 0.20.x, thanks Pino Toscano
+
   * debian/rules: 
     - use generic python3.pc instead of pythonX.Y(mu).pc
     - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
diff --git a/patches/poppler_0_20_x.diff b/patches/poppler_0_20_x.diff
new file mode 100644
index 0000000..8acfd4d
--- /dev/null
+++ b/patches/poppler_0_20_x.diff
@@ -0,0 +1,35 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index e6bc761..1ebcebf 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -485,7 +485,9 @@ void PDFOutDev::endPage()
+     printf("endPage\n");
+ }
+ 
+-#if POPPLER_CHECK_VERSION(0, 17, 0)
++#if POPPLER_CHECK_VERSION(0, 19, 0)
++void PDFOutDev::processLink(AnnotLink *link)
++#elif POPPLER_CHECK_VERSION(0, 17, 0)
+ void PDFOutDev::processLink(AnnotLink *link, Catalog *)
+ #else
+ void PDFOutDev::processLink(Link* link, Catalog*)
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 0a19b9a..e5e48fc 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -189,10 +189,12 @@ namespace pdfi
+         // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
+         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
+ 
+-        #if POPPLER_CHECK_VERSION(0, 17, 0)
+-        virtual void processLink(AnnotLink *link, Catalog *catalog);
+-        #else
+         //----- link borders
++	#if POPPLER_CHECK_VERSION(0, 19, 0)
++        virtual void processLink(AnnotLink *link);
++        #elif POPPLER_CHECK_VERSION(0, 17, 0)
++	virtual void processLink(AnnotLink *link, Catalog *catalog);
++        #else
+         virtual void processLink(Link *link, Catalog *catalog);
+         #endif
+ 
diff --git a/patches/poppler_0_21_0.diff b/patches/poppler_0_21_0.diff
new file mode 100644
index 0000000..0c4a0a2
--- /dev/null
+++ b/patches/poppler_0_21_0.diff
@@ -0,0 +1,27 @@
+From bf176d11892d6ebe949c3c73841800f3a0c8a0d6 Mon Sep 17 00:00:00 2001
+From: Petr Mladek <pmladek@suse.cz>
+Date: Wed, 31 Oct 2012 11:07:17 +0000
+Subject: fix build with system poppler-0.21.0
+
+UTF8.h is split and renamed to UTF.h
+
+Change-Id: I3c0c271324f79189aa2d10b9f159d2cb5743eb64
+---
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index e6bc761..77a9aa6 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -34,7 +34,11 @@
+ #pragma warning(push, 1)
+ #endif
+ 
++#if POPPLER_CHECK_VERSION(0, 21, 0)
++#include "UTF.h"
++#else
+ #include "UTF8.h"
++#endif
+ 
+ #if defined __SUNPRO_CC
+ #pragma enable_warn
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 5bd67a7..e9a9f00 100644
--- a/patches/series
+++ b/patches/series
@@ -37,3 +37,5 @@ ca-XV-update.diff
 soffice-bashisms.diff
 he-lucida-sans-unicode.diff
 ure-no-etc-opt-ure.diff
+poppler_0_20_x.diff
+poppler_0_21_0.diff

-- 
LibreOffice packaging repository