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

[Andreas Radke]

    Date: Thursday, August 18, 2022 @ 19:16:57
  Author: andyrtr
Revision: 453418

upgpkg: libreoffice-fresh 7.4.0-2: fix build for use with system gpgme

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-18 19:07:01 UTC (rev 453417)
+++ PKGBUILD	2022-08-18 19:16:57 UTC (rev 453418)
@@ -12,7 +12,7 @@
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=7.4.0.3
 pkgver=7.4.0
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -29,7 +29,7 @@
 	'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
 	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
 	'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient'
-	'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' #'gpgme' 
+	'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 
 	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
 	'libcuckoo' 'abseil-cpp' 'clang' #'zxing-cpp'
 	'libffi' 'box2d' 'git'
@@ -54,9 +54,6 @@
 	${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2
 	${_additional_source_url}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.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_url}/dragonbox-1.1.0.tar.gz
 	${_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
@@ -79,9 +76,6 @@
            Firebird-3.0.7.33374-0.tar.bz2
            skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.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
            dragonbox-1.1.0.tar.gz
            8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
            odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar  # for test suite
@@ -108,9 +102,6 @@
             'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76'
             'c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9'
             '653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a'
-            '6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0'
-            'a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf'
-            '8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4'
             '293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
@@ -126,6 +117,9 @@
 
 	cd libreoffice-$_LOver
 
+	# Workaround to fix build with gpgme 1.18.0
+	export ac_cv_lib_gpgmepp_progress_callback=yes
+
 	# move external sources into place
 	mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
 	for source in "${noextract[@]}"; do
@@ -223,7 +217,7 @@
 		--with-system-libwps \
 		--with-system-redland\
 		--with-system-libzmf \
-		--without-system-gpgmepp \
+		--with-system-gpgmepp \
 		--with-system-libstaroffice \
 		--with-system-cuckoo \
 		--with-jdk-home="/usr/lib/jvm/default" \
@@ -292,7 +286,7 @@
 		'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
 		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
 		'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
-		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' #'gpgme' 
+		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' 'gpgme' 
 		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
 		#'zxing-cpp'
 		'xdg-utils')