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

[Andreas Radke]

    Date: Friday, April 12, 2019 @ 12:46:34
  Author: andyrtr
Revision: 350612

upgpkg: libreoffice-fresh 6.2.2-4

build using internal Firebird - should fix FS#61984

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-12 09:59:01 UTC (rev 350611)
+++ PKGBUILD	2019-04-12 12:46:34 UTC (rev 350612)
@@ -12,7 +12,7 @@
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=6.2.2.2
 pkgver=6.2.2
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -28,7 +28,7 @@
 	'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' 'libcmis' 'gobject-introspection' # 'libfbclient'
 	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 
 	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
 )
@@ -48,6 +48,7 @@
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/pdfium-3550.tar.bz2
 	${_additional_source_url}/lxml-4.1.1.tgz
+	${_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}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
 	${_additional_source_url2}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
@@ -65,6 +66,7 @@
            ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
            pdfium-3550.tar.bz2
            lxml-4.1.1.tgz
+           Firebird-3.0.0.32483-0.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
            49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
@@ -87,6 +89,7 @@
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
             '572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679'
             '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
+            '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
             '49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63'
@@ -182,7 +185,7 @@
 		--with-system-libmwaw \
 		--with-system-libetonyek \
 		--with-system-libfreehand \
-		--with-system-firebird \
+		--without-system-firebird \
 		--with-system-libtommath \
 		--with-system-libatomic-ops \
 		--with-system-libebook \
@@ -267,7 +270,7 @@
 		'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' 'libcmis' 'liborcus' # 'libfbclient'
 		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext'
 		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy')
 	optdepends=('java-runtime:     adds java support'