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

[Andreas Radke]

    Date: Saturday, July 29, 2017 @ 17:55:13
  Author: andyrtr
Revision: 301407

prepare next major update

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-29 17:41:56 UTC (rev 301406)
+++ PKGBUILD	2017-07-29 17:55:13 UTC (rev 301407)
@@ -11,9 +11,9 @@
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=5.3.4.2
-pkgver=5.3.4
-pkgrel=2
+_LOver=5.4.0.3
+pkgver=5.4.0
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -30,10 +30,10 @@
 	'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
 	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
 	'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient'
-	'libtommath' 'libzmf')
+	'libtommath' 'libzmf' 'gpgme')
 
 _mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+#_mirror="https://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
 source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
@@ -61,7 +61,7 @@
 	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/libfreehand-0.1.1.tar.bz2
-	${_additional_source_url}/libstaroffice-0.0.2.tar.bz2
+	${_additional_source_url}/libstaroffice-0.0.3.tar.xz
 	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
 	${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
 	${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar  # for test suite
@@ -92,7 +92,7 @@
 	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	libfreehand-0.1.1.tar.bz2
-	libstaroffice-0.0.2.tar.bz2
+	libstaroffice-0.0.3.tar.xz
 	Firebird-3.0.0.32483-0.tar.bz2
 	8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 	a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
@@ -99,11 +99,11 @@
 	976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll)
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('1d75393fd8b02b1e2e2e001bc0262359c7452e29a0fff35cb152717246f02379'
+sha256sums=('17b29d05349b0db15f606f2d630e84c0969c89af6bd06aad8d75a074ee2add94'
             'SKIP'
-            'ab8600dc99e09d90fec83bcc505c42556156730f78973cecd74fa377fe8de91a'
+            'e1460aee386733725e0d734bb5fed4866c93b0342a49936eb45ec350e45e27d9'
             'SKIP'
-            '0f5acb29e93ab8a75a216e82c87192aabcf29fe8bada8e968cc7b255fcdf81af'
+            '579f79ba01e6e9046ce99895540cef6d8987e2445cedba4fb78d2969e593145e'
             'SKIP'
             '686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b'
             '41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f'
@@ -129,7 +129,7 @@
             '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
             '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877'
-            'f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899'
+            'bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34'
@@ -148,9 +148,6 @@
 		ln -s ${srcdir}/$source .
 	done
 	popd
-
-	# don't run broken tests on i686
-	[ "$CARCH" = "i686" ] && sed -i "/CppunitTest_sw_ooxmlexport7/d" sw/Module_sw.mk
 	
 	# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
 	# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -241,6 +238,7 @@
 		--with-system-libwps \
 		--with-system-redland\
 		--with-system-libzmf \
+		--with-system-gpgmepp \
 		--without-system-libstaroffice \
 		--with-system-serf \
 		--with-jdk-home="/usr/lib/jvm/default" \