git » libreoffice-still.git » commit 04b2500

diff --git a/PKGBUILD b/PKGBUILD
index 5b36700..370d8f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=libreoffice-still
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=5.4.5.1
 pkgver=5.4.5
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -55,6 +55,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar  # for test suite
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
+	poppler-0.62.patch
 	libreoffice-still.sh libreoffice-still.csh)
 noextract=(boost_1_63_0.tar.bz2
 	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -100,6 +101,7 @@ sha256sums=('eb151d17d23d08d78acfb45d1f5b4830a565c99bf0f5f386ddcc41ffa481eb98'
             'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+            '344f88086b947d53550ef5492e4d61b1e1594067a34c6c4d8ae801ddd0a2fadb'
             '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
             'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
 
@@ -122,6 +124,9 @@ prepare() {
 	rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
 
+	# upstream fix to build with poppler 0.62 and later
+	patch -Np0 -i ${srcdir}/poppler-0.62.patch
+
 	# fix not upstreamable pyuno paths - FS#54250
 	patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
 
diff --git a/poppler-0.62.patch b/poppler-0.62.patch
new file mode 100644
index 0000000..5dfced1
--- /dev/null
+++ b/poppler-0.62.patch
@@ -0,0 +1,29 @@
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2018-01-30 18:22:07.000000000 +0100
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.new	2018-03-20 11:38:16.558290319 +0100
+@@ -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"
+@@ -918,7 +920,11 @@
+             );
+ 
+     // 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 )