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

[Andreas Radke]

    Date: Tuesday, November 21, 2017 @ 16:14:56
  Author: andyrtr
Revision: 310512

upgpkg: libreoffice-fresh 5.4.3-3

build using system libfreehand and libstaroffice

Modified:
  libreoffice-fresh/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-21 13:51:45 UTC (rev 310511)
+++ PKGBUILD	2017-11-21 16:14:56 UTC (rev 310512)
@@ -13,7 +13,7 @@
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=5.4.3.2
 pkgver=5.4.3
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -30,7 +30,10 @@
 	'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'glm' 'libxinerama' 'libpagemaker'
 	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
 	'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient'
-	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode')
+	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
+	'libfreehand' 'libstaroffice'
+	#'java-rhino' 'java-commons-logging' 'libepubgen'  'libqxp' 
+	)
 
 _mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
 #_mirror="https://dev-builds.libreoffice.org/pre-releases/src"
@@ -59,9 +62,9 @@
 	${_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}/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}/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
@@ -91,8 +94,8 @@
 	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
+#	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
@@ -128,9 +131,7 @@
             '119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da'
             '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
-            '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877'
             '0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309'
-            'bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             'ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
@@ -220,7 +221,7 @@
 		--with-system-libodfgen \
 		--with-system-libmwaw \
 		--with-system-libetonyek \
-		--without-system-libfreehand \
+		--with-system-libfreehand \
 		--without-system-firebird \
 		--with-system-libtommath \
 		--with-system-libatomic-ops \
@@ -241,7 +242,7 @@
 		--with-system-redland\
 		--with-system-libzmf \
 		--with-system-gpgmepp \
-		--without-system-libstaroffice \
+		--with-system-libstaroffice \
 		--with-system-serf \
 		--with-jdk-home="/usr/lib/jvm/default" \
 		--with-ant-home="/usr/share/apache-ant"\
@@ -313,8 +314,9 @@
 		'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
 		'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
 		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
-		'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis' 'liborcus'
-		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec')
+		'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' 
+		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec'
+		'libfreehand' 'libstaroffice')
 	optdepends=('java-runtime:     adds java support'
 		'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
 		'pstoedit:         translates PostScript and PDF graphics into other vector formats'