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

[Andreas Radke]

    Date: Wednesday, November 22, 2017 @ 13:39:21
  Author: andyrtr
Revision: 310593

upgpkg: libreoffice-fresh 5.4.3-4

don't build the report builder, saves lots of bundled java libs

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   47 ++++-------------------------------------------
 1 file changed, 4 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-22 13:37:49 UTC (rev 310592)
+++ PKGBUILD	2017-11-22 13:39:21 UTC (rev 310593)
@@ -13,7 +13,7 @@
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=5.4.3.2
 pkgver=5.4.3
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -32,7 +32,7 @@
 	'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient'
 	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
 	'libfreehand' 'libstaroffice'
-	#'java-rhino' 'java-commons-logging' 'libepubgen'  'libqxp' 
+	# 'libepubgen'  'libqxp' 
 	)
 
 _mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
@@ -42,18 +42,8 @@
 source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/boost_1_63_0.tar.bz2
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	${_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}/commons-logging-1.2-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	${_additional_source_url}/language-subtag-registry-2015-08-04.tar.bz2
 	${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
@@ -60,11 +50,7 @@
 	${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url}/libgltf/libgltf-0.1.0.tar.gz
-	${_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}/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
-#	${_additional_source_url}/libstaroffice-0.0.3.tar.xz
 	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
 	${_additional_source_url}/pdfium-3064.tar.bz2
 	${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
@@ -76,16 +62,6 @@
 	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	commons-logging-1.2-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	language-subtag-registry-2015-08-04.tar.bz2
 	4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
@@ -94,8 +70,6 @@
 	libgltf-0.1.0.tar.gz
 	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-#	libfreehand-0.1.1.tar.bz2
-#	libstaroffice-0.0.3.tar.xz
 	Firebird-3.0.0.32483-0.tar.bz2
 	pdfium-3064.tar.bz2
 	8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
@@ -113,16 +87,6 @@
             '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
             '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
             '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
-            '49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81'
-            '75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba'
-            '085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045'
-            '5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b'
-            '3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8'
-            '05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343'
-            'abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095'
-            'e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743'
-            '7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66'
-            'e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772'
             '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
             'cfd066b327c2308b3d019f0fe124c02d9acfafdd4aa2af0feadb6e0384027cf9'
             'b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb'
@@ -129,8 +93,6 @@
             '8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4'
             'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
             '119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da'
-            '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
-            '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
             '0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             'ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883'
@@ -203,6 +165,7 @@
 		--enable-scripting-beanshell \
 		--enable-scripting-javascript \
 		--disable-dconf \
+		--disable-report-builder \
 		--enable-ext-wiki-publisher \
 		--enable-ext-nlpsolver \
 		--without-fonts\
@@ -216,8 +179,6 @@
 		--with-system-libexttextcat \
 		--with-system-orcus \
 		--with-system-liblangtag \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
 		--with-system-libodfgen \
 		--with-system-libmwaw \
 		--with-system-libetonyek \