From c391688d260d536d811d177a44aed960398f5b9b Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 2 Feb 2022 18:35:21 +0000 Subject: [PATCH] extra/libreoffice-still to 7.2.5-1 --- extra/libreoffice-still/PKGBUILD | 74 +++++++++++++++----------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/extra/libreoffice-still/PKGBUILD b/extra/libreoffice-still/PKGBUILD index b9dea40b0..2885ee957 100644 --- a/extra/libreoffice-still/PKGBUILD +++ b/extra/libreoffice-still/PKGBUILD @@ -4,7 +4,7 @@ # ALARM: Kevin Mihelich # - disable firebird until libfbclient is updated # - specify a US mirror -# - make build-nocheck +# - remove --enable-lto from configure buildarch=12 highmem=1 @@ -18,9 +18,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') -_LOver=7.1.8.1 -pkgver=7.1.8 -pkgrel=6 +_LOver=7.2.5.2 +pkgver=7.2.5 +pkgrel=1 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" @@ -33,16 +33,16 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'lib 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant' 'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene' 'junit' 'libmythes' 'libwpg' 'java-environment=11' 'postgresql-libs' 'mariadb-libs' 'libgl' - 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' + 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' #'mdds' 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm' - 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' - #'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient' + 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' # 'liborcus' +# 'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient' 'libexttextcat' 'gobject-introspection' # 'libfbclient' 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext' 'libffi' 'box2d' 'git' ) - +options=('!lto') # using --enable-lto (for parallel link-time optimization) _mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="https://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="https://dev-www.libreoffice.org/src" @@ -52,75 +52,79 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - ${_additional_source_url}/language-subtag-registry-2019-04-03.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2021-03-05.tar.bz2 ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/pdfium-4306.tar.bz2 + ${_additional_source_url}/pdfium-4500.tar.bz2 ${_additional_source_url}/dtoa-20180411.tgz ${_additional_source_url}/lxml-4.1.1.tgz - ${_additional_source_url}/QR-Code-generator-1.4.0.tar.gz - ${_additional_source_url}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz + ${_additional_source_url}/zxing-cpp-1.1.1.tar.gz + ${_additional_source_url}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz ${_additional_source_url}/libcmis-0.5.2.tar.xz + ${_additional_source_url}/liborcus-0.16.1.tar.bz2 + ${_additional_source_url}/mdds-1.7.0.tar.bz2 ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite ${_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 make-pyuno-work-with-system-wide-module-install.diff - firebird-icu70.patch soffice-template.desktop.in libreoffice-still.sh libreoffice-still.csh) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - language-subtag-registry-2019-04-03.tar.bz2 + language-subtag-registry-2021-03-05.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - pdfium-4306.tar.bz2 + pdfium-4500.tar.bz2 dtoa-20180411.tgz lxml-4.1.1.tgz - QR-Code-generator-1.4.0.tar.gz - skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz + zxing-cpp-1.1.1.tar.gz + skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz libcmis-0.5.2.tar.xz + liborcus-0.16.1.tar.bz2 + mdds-1.7.0.tar.bz2 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf 185d60944ea767075d27247c3162b3bc-unowinreg.dll ) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) -sha256sums=('4c6711dbf4d24093a3abb1b5bd749ae0c68403a7c6f79ac75597e78e88aa7893' +sha256sums=('67c1bfb059d433286b0252a915627b33af63bb5f4b6ec9509d13b9dd475512a7' 'SKIP' - 'b6bda19827914727edd3735f93c69f49abab095e8325262ec4aa3818f2bf22de' + 'eaf1112d68747e441c491902dfb7f0d8706ac55b5bafd90f1213b25978ccadf3' 'SKIP' - '8f2e5d5332821016224d787a741c2075f5b53a4e65d620c6c8bd7789c4075843' + 'f6b9ee4627ec117ed101476c5fa555c3fc504ba759792dd16ca9e80b7f6e31df' 'SKIP' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' - 'a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d' + 'ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a' 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' - 'eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8' + '26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304' '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4' '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e' - '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' - 'fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a' - 'f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301' + 'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76' + 'e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86' + 'abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d' 'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2' + 'c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4' + 'a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504' 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' - '32b0546103408117e5b85ee5081db69fb1d09ef6df4aa0aa06f9781e95951fa2' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a' 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1') - + prepare() { cd libreoffice-$_LOver @@ -140,14 +144,6 @@ prepare() { # fix not upstreamable pyuno paths - FS#54250 patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff - # fix "Could not find acceptable ICU library" with ICU 70.1 - #pushd "${srcdir}"/ext_sources - #tar xf Firebird-3.0.0.32483-0.tar.bz2 - #patch -Np1 -d Firebird-3.0.0.32483-0 -i "${srcdir}"/firebird-icu70.patch - #rm Firebird-3.0.0.32483-0.tar.bz2 - #tar cjf Firebird-3.0.0.32483-0{.tar.bz2,} - #popd - #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -198,20 +194,20 @@ build() { --without-fonts\ --with-system-apr \ --with-system-libcdr \ - --with-system-mdds\ + --without-system-mdds\ --without-myspell-dicts \ --with-system-libvisio \ --without-system-libcmis \ --with-system-libmspub \ --with-system-libexttextcat \ - --with-system-orcus \ + --without-system-orcus \ --with-system-liblangtag \ --with-system-libodfgen \ --with-system-libmwaw \ --with-system-libetonyek \ --with-system-libfreehand \ --disable-firebird-sdbc \ - --without-system-qrcodegen \ + --without-system-zxing \ --with-system-libtommath \ --with-system-libatomic-ops \ --with-system-libebook \ @@ -297,7 +293,7 @@ package_libreoffice-still() { 'desktop-file-utils' 'shared-mime-info' 'libpagemaker' 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' #'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' - 'liblangtag' 'libexttextcat' 'liborcus' # 'libfbclient' + 'liblangtag' 'libexttextcat' # 'liborcus' # 'libfbclient' 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext' 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d' 'xdg-utils')