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

[Andreas Radke]

    Date: Monday, November 2, 2020 @ 18:11:30
  Author: andyrtr
Revision: 399167

upgpkg: libreoffice-still 6.4.7-2: rebuild with internal liborcus

Modified:
  libreoffice-still/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-02 17:22:02 UTC (rev 399166)
+++ PKGBUILD	2020-11-02 18:11:30 UTC (rev 399167)
@@ -12,7 +12,7 @@
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=6.4.7.2
 pkgver=6.4.7
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -27,7 +27,7 @@
 	'junit' 'libmythes' 'libwpg'  'java-environment=8' 'postgresql-libs' 'mariadb-libs' 'libgl'
 	'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' 
+	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' # 'liborcus' 
 	'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient'
 	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 
 	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
@@ -51,6 +51,7 @@
 	${_additional_source_url}/lxml-4.1.1.tgz
 	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
 	${_additional_source_url}/QR-Code-generator-1.4.0.tar.gz
+	${_additional_source_url}/liborcus-0.15.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-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
 	${_additional_source_url2}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
@@ -70,6 +71,7 @@
            lxml-4.1.1.tgz
            Firebird-3.0.0.32483-0.tar.bz2
            QR-Code-generator-1.4.0.tar.gz
+           liborcus-0.15.3.tar.gz
            8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
            odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar  # for test suite
            884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
@@ -94,6 +96,7 @@
             '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             'fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a'
+            '0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
             '884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc'
@@ -178,7 +181,7 @@
 		--with-system-libcmis \
 		--with-system-libmspub \
 		--with-system-libexttextcat \
-		--with-system-orcus \
+		--without-system-orcus \
 		--with-system-liblangtag \
 		--with-system-libodfgen \
 		--with-system-libmwaw \
@@ -270,7 +273,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'