extra/libreoffice-still to 7.2.5-2

extra/libreoffice-still/PKGBUILD

@@ -20,7 +20,7 @@ pkgbase=libreoffice-still
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=7.2.5.2
 pkgver=7.2.5
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -33,9 +33,9 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'lib
 	'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
 	'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene'
 	'junit' 'libmythes' 'libwpg'  'java-environment=11' 'postgresql-libs' 'mariadb-libs' 'libgl'
-	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops'  #'mdds'
+	'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'
 	'libexttextcat' 'gobject-introspection' # 'libfbclient'
 	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 
@@ -62,13 +62,12 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/zxing-cpp-1.1.1.tar.gz
 	${_additional_source_url}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
 	${_additional_source_url}/libcmis-0.5.2.tar.xz
-	${_additional_source_url}/liborcus-0.16.1.tar.bz2
-        ${_additional_source_url}/mdds-1.7.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}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
+	mdds-2.0-and-orcus-0.17.diff
 	soffice-template.desktop.in
 	libreoffice-still.sh libreoffice-still.csh)
 noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -85,8 +84,6 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
            zxing-cpp-1.1.1.tar.gz
            skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
            libcmis-0.5.2.tar.xz
-	   liborcus-0.16.1.tar.bz2
-           mdds-1.7.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
            f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
@@ -114,17 +111,16 @@ sha256sums=('67c1bfb059d433286b0252a915627b33af63bb5f4b6ec9509d13b9dd475512a7'
             'e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86'
             'abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d'
             'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2'
-            'c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4'
-            'a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
             'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+            'fd73edaa09a48e2b2c4f4f32af68f1ef01cc181d49a5dfc1f65a5ad4883d7db8'
             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
             'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
             'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
-	    
+
 prepare() {
 
 	cd libreoffice-$_LOver
@@ -144,6 +140,9 @@ prepare() {
 	# fix not upstreamable pyuno paths - FS#54250
 	patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
 
+	# fix build with current system libixion/liborcus/mdds
+	patch -Np1 -i "${srcdir}"/mdds-2.0-and-orcus-0.17.diff
+
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in
@@ -194,13 +193,13 @@ build() {
 		--without-fonts\
 		--with-system-apr \
 		--with-system-libcdr \
-		--without-system-mdds\
+		--with-system-mdds\
 		--without-myspell-dicts \
 		--with-system-libvisio \
 		--without-system-libcmis \
 		--with-system-libmspub \
 		--with-system-libexttextcat \
-		--without-system-orcus \
+		--with-system-orcus \
 		--with-system-liblangtag \
 		--with-system-libodfgen \
 		--with-system-libmwaw \
@@ -293,7 +292,7 @@ package_libreoffice-still() {
 		'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
 		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
 		#'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
-		'liblangtag' 'libexttextcat' # 'liborcus' # 'libfbclient'
+		'liblangtag' 'libexttextcat' 'liborcus' # 'libfbclient'
 		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext'
 		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
 		'xdg-utils')