The following commit has been merged in the debian-experimental-3.6 branch:
commit 9556000f585de9408e18917c8c4464c2fe5ac85d
Author: Rene Engelhard <[email protected]>
Date: Thu Dec 6 00:13:16 2012 +0100
patches/poppler_0_21_x.diff is upstream, too
diff --git a/patches/poppler_0_21_x.diff b/patches/poppler_0_21_x.diff
deleted file mode 100644
index e1fe162..0000000
--- a/patches/poppler_0_21_x.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-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
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
