From 96c14bd5222853af3c750cc7b8eefb485d98fb8e Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 13 Aug 2022 16:13:29 +0000 Subject: [PATCH] extra/libreoffice-fresh to 7.3.5-3 --- extra/libreoffice-fresh/PKGBUILD | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index 6e7b2249d..4a64f39b8 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -20,7 +20,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=7.3.5.2 pkgver=7.3.5 -pkgrel=1 +pkgrel=3 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" @@ -36,9 +36,8 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'lib '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' - 'libexttextcat' 'gobject-introspection' # 'libfbclient' - 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' + 'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient' + 'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' #'gpgme' 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext' 'libcuckoo' 'abseil-cpp' 'clang' #'zxing-cpp' 'libffi' 'box2d' 'git' @@ -62,8 +61,10 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/lxml-4.1.1.tgz ${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2 ${_additional_source_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz - ${_additional_source_url}/libcmis-0.5.2.tar.xz ${_additional_source_url}/zxing-cpp-1.2.0.tar.gz + ${_additional_source_url}/gpgme-1.16.0.tar.bz2 + ${_additional_source_url}/libgpg-error-1.43.tar.bz2 + ${_additional_source_url}/libassuan-2.5.5.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 @@ -84,14 +85,15 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip lxml-4.1.1.tgz Firebird-3.0.7.33374-0.tar.bz2 skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz - libcmis-0.5.2.tar.xz zxing-cpp-1.2.0.tar.gz + gpgme-1.16.0.tar.bz2 + libgpg-error-1.43.tar.bz2 + libassuan-2.5.5.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=('9b3e0db1ee153330ea05f04109bd817dbac2203d2eed83ef54be54d4c741e991' 'SKIP' '9571c1953d7297d158dee8849f7e6315b102fb0cafb2280693e6064ef8013ca2' @@ -111,8 +113,10 @@ sha256sums=('9b3e0db1ee153330ea05f04109bd817dbac2203d2eed83ef54be54d4c741e991' '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e' 'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76' '97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177' - 'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2' '653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a' + '6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0' + 'a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf' + '8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504' 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' @@ -121,6 +125,7 @@ sha256sums=('9b3e0db1ee153330ea05f04109bd817dbac2203d2eed83ef54be54d4c741e991' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a' 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1') +validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) prepare() { @@ -194,7 +199,7 @@ build() { --with-system-mdds\ --without-myspell-dicts \ --with-system-libvisio \ - --without-system-libcmis \ + --with-system-libcmis \ --with-system-libmspub \ --with-system-libexttextcat \ --with-system-orcus \ @@ -223,7 +228,7 @@ build() { --with-system-libwps \ --with-system-redland\ --with-system-libzmf \ - --with-system-gpgmepp \ + --without-system-gpgmepp \ --with-system-libstaroffice \ --with-system-cuckoo \ --with-system-serf \ @@ -290,9 +295,8 @@ package_libreoffice-fresh() { 'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'libpagemaker' 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' - #'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' - 'liblangtag' 'libexttextcat' 'liborcus' # 'libfbclient' - 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext' + 'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' + 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' #'gpgme' 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d' #'zxing-cpp' 'xdg-utils')