[arch-commits] Commit in libreoffice-fresh/trunk (PKGBUILD poppler-22.03.0.patch)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Wed Mar 2 12:58:09 UTC 2022
Date: Wednesday, March 2, 2022 @ 12:58:09
Author: foutrelis
Revision: 438301
upgpkg: libreoffice-fresh 7.3.0-7: poppler 22.03.0 rebuild
Added:
libreoffice-fresh/trunk/poppler-22.03.0.patch
Modified:
libreoffice-fresh/trunk/PKGBUILD
-----------------------+
PKGBUILD | 6 +++++-
poppler-22.03.0.patch | 28 ++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-02 12:54:08 UTC (rev 438300)
+++ PKGBUILD 2022-03-02 12:58:09 UTC (rev 438301)
@@ -12,7 +12,7 @@
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
_LOver=7.3.0.3
pkgver=7.3.0
-pkgrel=6
+pkgrel=7
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
0001_drop_the_SolarMutex_before_QApplication.patch
0002_update_kf5_include_lib_check.patch
@@ -110,6 +111,7 @@
'984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
+ 'e61e2a266c7a4374377475254a2f095c1ce2376980b301955a4e5a0d32d3c25b'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'81a8551aaea0ab1750d36fb8bfbd04340a43eaab349a43c1384d21ef6504ab47'
'1cc5aeac9b8e91786701727d97b58039afc3db3dbc7977a3651d3263240798b3'
@@ -134,6 +136,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 12:58:09 UTC (rev 438301)
@@ -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;
More information about the arch-commits
mailing list