From 039e3a571fd8e4235dacb396edb55a3c18e4d4c0 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 3 Nov 2022 17:47:09 +0000 Subject: [PATCH] extra/libreoffice-still to 7.3.7-1 --- extra/libreoffice-still/PKGBUILD | 17 +++---- .../libreoffice-poppler-22.09.0.patch | 46 ------------------- 2 files changed, 6 insertions(+), 57 deletions(-) delete mode 100644 extra/libreoffice-still/libreoffice-poppler-22.09.0.patch diff --git a/extra/libreoffice-still/PKGBUILD b/extra/libreoffice-still/PKGBUILD index e5d2a63f4..7ed90402a 100644 --- a/extra/libreoffice-still/PKGBUILD +++ b/extra/libreoffice-still/PKGBUILD @@ -17,9 +17,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') -_LOver=7.3.6.2 -pkgver=7.3.6 -pkgrel=4 +_LOver=7.3.7.2 +pkgver=7.3.7 +pkgrel=1 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" @@ -66,7 +66,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff - libreoffice-poppler-22.09.0.patch soffice-template.desktop.in libreoffice-still.sh libreoffice-still.csh) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -89,11 +88,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 185d60944ea767075d27247c3162b3bc-unowinreg.dll ) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) -sha256sums=('3303d6af6ffbbc58345051a0090c1336f8b93c49c7861c6534bceea205aed5a3' +sha256sums=('52986602495f6d97561a54e09811ac5efe77bd83d8fa8c91a4529f061057f4bb' 'SKIP' - '6f756f68d11f9f2b56a897a401638aa243680a779f5dd420601ec7a69b6b6b4b' + 'c819e74749937b19325a726749fdb30bac3e0ec7414c753c7eb39398f7c479d0' 'SKIP' - 'be3b615df04feaf458de5301962b6124cedbe525f7baf0701298b7d08796fc38' + '59180fccb1b2c1f408eae15104d84f6761b59e186259af166da098a765d100b9' 'SKIP' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' @@ -115,7 +114,6 @@ sha256sums=('3303d6af6ffbbc58345051a0090c1336f8b93c49c7861c6534bceea205aed5a3' 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' - '95716d255aae9d8795eb76c634541f82a094b87dfeaa6ffcdbd97c0f19c14ac4' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a' 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1') @@ -127,9 +125,6 @@ prepare() { # Workaround to fix build with gpgme 1.18.0 export ac_cv_lib_gpgmepp_progress_callback=yes - # poppler 22.09.0 - patch -Np1 -i ../libreoffice-poppler-22.09.0.patch - # move external sources into place mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources for source in "${noextract[@]}"; do diff --git a/extra/libreoffice-still/libreoffice-poppler-22.09.0.patch b/extra/libreoffice-still/libreoffice-poppler-22.09.0.patch deleted file mode 100644 index f269d5319..000000000 --- a/extra/libreoffice-still/libreoffice-poppler-22.09.0.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://gerrit.libreoffice.org/c/core/+/139249 - -From 8bad83bf044661357b02b695e6f53e2e19dea396 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 2 Sep 2022 04:31:18 +0100 -Subject: [PATCH] Fix build with Poppler 22.09.0 - -With Poppler 22.09.0, LO fails to build with: -``` -/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments - state->getLineDash(&dashArray, &arrayLen, &startOffset); - ~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~ -/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here - const std::vector &getLineDash(double *start) - ^ -1 error generated. -``` - -Poppler changed the getLineDash interface: -``` -- void getLineDash(double **dash, int *length, double *start) -+ const std::vector &getLineDash(double *start) -``` - -Signed-off-by: Sam James -Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState *state) - return; - assert(state); - -- double* dashArray; int arrayLen; double startOffset; -+ int arrayLen; double startOffset; -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ const double* dashArray; -+ const std::vector &dash = state->getLineDash(&startOffset); -+ dashArray = dash.data(); -+ arrayLen = dash.size(); -+#else -+ double* dashArray; - state->getLineDash(&dashArray, &arrayLen, &startOffset); -+#endif - - printf( "updateLineDash" ); - if( arrayLen && dashArray )