[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-187-g316eba9

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

The following commit has been merged in the debian-experimental-4.0 branch:
commit fbb4070bf2653d8febb2558ee0e749b17a68332f
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Dec 6 11:26:07 2012 +0100

    Revert "patches/poppler_0_21_x.diff is upstream, too". Wrong branch :/
    
    This reverts commit 9556000f585de9408e18917c8c4464c2fe5ac85d.

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

-- 
LibreOffice packaging repository