[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-4-47-g57e333d
The following commit has been merged in the debian-experimental-3.5 branch:
commit 0686f84467eb854df1d5cae1a1bc7d8e290a5992
Author: Rene Engelhard <rene@debian.org>
Date: Sat Nov 24 18:32:11 2012 +0100
fix build with poppler 0.21.1
diff --git a/changelog b/changelog
index afa7756..e549ae8 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,7 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
- 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
+ 0.21.x and fix the test with 0.20.x, thanks Pino Toscano
* debian/rules:
- use generic python3.pc in default case instead of pythonX.Y.pc.
@@ -25,7 +25,7 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
* debian/libreoffice-{core,gtk3}.bug-script.in:
- find out whether we have Experimental features enabled
- -- Rene Engelhard <rene@debian.org> Wed, 14 Nov 2012 11:01:51 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 24 Nov 2012 18:31:33 +0100
libreoffice (1:3.5.4+dfsg-4) UNRELEASED; urgency=low
diff --git a/patches/poppler_0_21_0.diff b/patches/poppler_0_21_0.diff
deleted file mode 100644
index 0c4a0a2..0000000
--- a/patches/poppler_0_21_0.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-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/poppler_0_21_x.diff b/patches/poppler_0_21_x.diff
new file mode 100644
index 0000000..e1fe162
--- /dev/null
+++ b/patches/poppler_0_21_x.diff
@@ -0,0 +1,20 @@
+diff -u b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -34,7 +34,16 @@
+ #pragma warning(push, 1)
+ #endif
+
++// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
++// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
++// because the internal poppler does not provide poppler-version.h and the macro always returns 0
++#if POPPLER_CHECK_VERSION(0, 21, 1)
+ #include "UTF8.h"
++#elif POPPLER_CHECK_VERSION(0, 21, 0)
++#include "UTF.h"
++#else
++#include "UTF8.h"
++#endif
+
+ #if defined __SUNPRO_CC
+ #pragma enable_warn
diff --git a/patches/series b/patches/series
index e9a9f00..3f6154d 100644
--- a/patches/series
+++ b/patches/series
@@ -38,4 +38,4 @@ soffice-bashisms.diff
he-lucida-sans-unicode.diff
ure-no-etc-opt-ure.diff
poppler_0_20_x.diff
-poppler_0_21_0.diff
+poppler_0_21_x.diff
--
LibreOffice packaging repository
Reply to: