[arch-commits] Commit in libreoffice-still/trunk (PKGBUILD poppler-22.03.0.patch)

[Evangelos Foutras]

    Date: Wednesday, March 2, 2022 @ 13:23:29
  Author: foutrelis
Revision: 438305

upgpkg: libreoffice-still 7.2.5-5: poppler 22.03.0 rebuild

Added:
  libreoffice-still/trunk/poppler-22.03.0.patch
Modified:
  libreoffice-still/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    6 +++++-
 poppler-22.03.0.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-02 13:08:18 UTC (rev 438304)
+++ PKGBUILD	2022-03-02 13:23:29 UTC (rev 438305)
@@ -12,7 +12,7 @@
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=7.2.5.2
 pkgver=7.2.5
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -59,6 +59,7 @@
 	${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
 	${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	poppler-22.03.0.patch
 	make-pyuno-work-with-system-wide-module-install.diff
 	mdds-2.0-and-orcus-0.17.diff
 	0001_drop_the_SolarMutex_before_QApplication.patch
@@ -111,6 +112,7 @@
             '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
             'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
+            'e61e2a266c7a4374377475254a2f095c1ce2376980b301955a4e5a0d32d3c25b'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
             'fd73edaa09a48e2b2c4f4f32af68f1ef01cc181d49a5dfc1f65a5ad4883d7db8'
             '81a8551aaea0ab1750d36fb8bfbd04340a43eaab349a43c1384d21ef6504ab47'
@@ -135,6 +137,8 @@
 	rm "${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll "${srcdir}"/ext_sources
 
+	patch -Np1 -i "${srcdir}"/poppler-22.03.0.patch
+
 	# fix not upstreamable pyuno paths - FS#54250
 	patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
 

Added: poppler-22.03.0.patch
===================================================================
--- poppler-22.03.0.patch	                        (rev 0)
+++ poppler-22.03.0.patch	2022-03-02 13:23:29 UTC (rev 438305)
@@ -0,0 +1,28 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index ad6320139..e5f6d9c68 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -138,6 +138,15 @@ int main(int argc, char **argv)
+     _setmode( _fileno( g_binary_out ), _O_BINARY );
+ #endif
+ 
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++    PDFDoc aDoc( std::make_unique<GooString>(pFileName),
++                 GooString(pOwnerPasswordStr),
++                 GooString(pUserPasswordStr) );
++
++    PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName),
++                 GooString(pOwnerPasswordStr),
++                 GooString(pUserPasswordStr) );
++#else
+     PDFDoc aDoc( pFileName,
+                  pOwnerPasswordStr,
+                  pUserPasswordStr );
+@@ -145,6 +154,7 @@ int main(int argc, char **argv)
+     PDFDoc aErrDoc( pErrFileName,
+                  pOwnerPasswordStr,
+                  pUserPasswordStr );
++#endif
+ 
+     // Check various permissions for aDoc.
+     PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;