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

[Andreas Radke]

    Date: Wednesday, October 31, 2018 @ 20:15:07
  Author: andyrtr
Revision: 337649

upgpkg: libreoffice-still 6.0.6-5

build with internl mdds and liborcus

Modified:
  libreoffice-still/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-31 19:54:18 UTC (rev 337648)
+++ PKGBUILD	2018-10-31 20:15:07 UTC (rev 337649)
@@ -12,7 +12,7 @@
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=6.0.6.2
 pkgver=6.0.6
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -24,10 +24,10 @@
 	'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
 	'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
 	'gperf' 'gtk3' 'cppunit' 'beanshell' 'clucene' 
-	'junit' 'libmythes' 'libwpg'  'java-environment' 'postgresql-libs' 'libgl'
-	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops' 'mdds'
+	'junit' 'libmythes' 'libwpg'  'java-environment=8' 'postgresql-libs' 'libgl'
+	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops'
 	'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
-	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
+	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 
 	'libexttextcat' 'libcmis' 'gobject-introspection'
 	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 
 	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'
@@ -49,6 +49,8 @@
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
 	${_additional_source_url}/pdfium-3235.tar.bz2
+	${_additional_source_url}/mdds-1.3.1.tar.bz2
+	${_additional_source_url}/liborcus-0.13.3.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+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -67,6 +69,8 @@
            ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
            Firebird-3.0.0.32483-0.tar.bz2
            pdfium-3235.tar.bz2
+           mdds-1.3.1.tar.bz2
+           liborcus-0.13.3.tar.gz
            8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
            odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar  # for test suite
            185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -89,6 +93,8 @@
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f'
+            'dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1'
+            '62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
@@ -183,13 +189,13 @@
 		--without-fonts\
 		--with-system-apr \
 		--with-system-libcdr \
-		--with-system-mdds\
+		--without-system-mdds\
 		--without-myspell-dicts \
 		--with-system-libvisio \
 		--with-system-libcmis \
 		--with-system-libmspub \
 		--with-system-libexttextcat \
-		--with-system-orcus \
+		--without-system-orcus \
 		--with-system-liblangtag \
 		--with-system-libodfgen \
 		--with-system-libmwaw \
@@ -280,7 +286,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'
 		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme'
 		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy')
 	optdepends=('java-runtime:     adds java support'