[arch-commits] Commit in libreoffice-fresh/trunk (PKGBUILD)

[Andreas Radke]

    Date: Saturday, August 13, 2022 @ 06:55:42
  Author: andyrtr
Revision: 452640

upgpkg: libreoffice-fresh 7.3.5-2: poppler 22.08.0 rebuild; switch to internal gpgme version - new gpgme 1.8.x introduced major incompatibilities

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-13 00:04:06 UTC (rev 452639)
+++ PKGBUILD	2022-08-13 06:55:42 UTC (rev 452640)
@@ -12,7 +12,7 @@
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=7.3.5.2
 pkgver=7.3.5
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -28,9 +28,8 @@
 	'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' 
+	'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' #'gpgme' 
 	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
 	'libcuckoo' 'abseil-cpp' 'clang' #'zxing-cpp'
 	'libffi' 'box2d' 'git'
@@ -56,6 +55,9 @@
 	${_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
@@ -78,12 +80,14 @@
            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) <build at documentfoundation.org>
 sha256sums=('9b3e0db1ee153330ea05f04109bd817dbac2203d2eed83ef54be54d4c741e991'
             'SKIP'
             '9571c1953d7297d158dee8849f7e6315b102fb0cafb2280693e6064ef8013ca2'
@@ -105,6 +109,9 @@
             '97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177'
             'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2'
             '653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a'
+            '6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0'
+            'a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf'
+            '8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
             'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
@@ -113,6 +120,7 @@
             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
             'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
             'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
+validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
 
 prepare() {
 
@@ -216,7 +224,7 @@
 		--with-system-libwps \
 		--with-system-redland\
 		--with-system-libzmf \
-		--with-system-gpgmepp \
+		--without-system-gpgmepp \
 		--with-system-libstaroffice \
 		--with-system-cuckoo \
 		--with-system-serf \
@@ -283,9 +291,8 @@
 		'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'
+		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' #'gpgme' 
 		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
 		#'zxing-cpp'
 		'xdg-utils')