9437783396
Fix build with poppler 0.62 - will take a while to build, but the build fail usually happened in the first 5 minutes, which is well passed already OBS-URL: https://build.opensuse.org/request/show/561753 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=575
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
Index: libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
===================================================================
|
|
--- libreoffice-6.0.0.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
+++ libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
@@ -32,10 +32,12 @@
|
|
#pragma warning(push, 1)
|
|
#endif
|
|
|
|
-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
|
|
+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then renamed to UnicodeMapFuncs.h in 0.62.0
|
|
// 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)
|
|
+#if POPPLER_CHECK_VERSION(0, 62, 0)
|
|
+#include <UnicodeMapFuncs.h>
|
|
+#elif POPPLER_CHECK_VERSION(0, 21, 1)
|
|
#include <UTF8.h>
|
|
#elif POPPLER_CHECK_VERSION(0, 21, 0)
|
|
#include "UTF.h"
|
|
@@ -913,7 +915,11 @@ void PDFOutDev::drawChar(GfxState *state
|
|
);
|
|
|
|
// silence spurious warning
|
|
+#if POPPLER_CHECK_VERSION(0, 62, 0)
|
|
+ (void)&mapUTF16;
|
|
+#else
|
|
(void)&mapUCS2;
|
|
+#endif
|
|
|
|
char buf[9];
|
|
for( int i=0; i<uLen; ++i )
|