git » libreoffice-still.git » commit bb0156c

upgpkg: 7.5.5-2; new LO v7.6.x requires a more recent incompatible mdds/liborcus version - rebuild with internal mdds/liborcus

author Andreas Radke
2023-08-21 19:50:56 UTC
committer Andreas Radke
2023-08-21 19:50:56 UTC
parent 512739b0b2f57be92a82f8ca56dad521b6430bdf

upgpkg: 7.5.5-2; new LO v7.6.x requires a more recent incompatible mdds/liborcus version - rebuild with internal mdds/liborcus

PKGBUILD +12 -6

diff --git a/PKGBUILD b/PKGBUILD
index 3647545..cc734b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=libreoffice-still
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=7.5.5.2
 pkgver=7.5.5
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -24,9 +24,9 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
 	'gst-plugins-base-libs'	'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
 	'gperf' 'gtk3' 'gtk4' 'qt5-base' 'plasma-framework' 'qt6-base' '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'
 	'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' 'gobject-introspection' # 'libfbclient' 'libcmis' 
 	'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 'libwebp'
 	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
@@ -54,6 +54,8 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
 	${_additional_source_url}/libcmis-0.5.2.tar.xz
         ${_additional_source_url}/dragonbox-1.1.3.tar.gz
+        ${_additional_source_url}/liborcus-0.17.2.tar.bz2
+        ${_additional_source_url}/mdds-2.0.3.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
@@ -77,6 +79,8 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
            skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
            libcmis-0.5.2.tar.xz
            dragonbox-1.1.3.tar.gz
+           liborcus-0.17.2.tar.bz2
+           mdds-2.0.3.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
@@ -104,6 +108,8 @@ sha256sums=('6628dfd2a21041a7c5bb6d72733e0fd52efa7959c95084fcd4d96cc4a61b0561'
             'c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9'
             'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2'
             '09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384'
+            '2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143'
+            '9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
             'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
@@ -195,13 +201,13 @@ build() {
 		--enable-ext-nlpsolver \
 		--without-fonts\
 		--with-system-libcdr \
-		--with-system-mdds\
+		--without-system-mdds\
 		--without-myspell-dicts \
 		--with-system-libvisio \
 		--without-system-libcmis \
 		--with-system-libmspub \
 		--with-system-libexttextcat \
-		--with-system-orcus \
+		--without-system-orcus \
 		--with-system-liblangtag \
 		--with-system-libodfgen \
 		--with-system-libmwaw \
@@ -294,7 +300,7 @@ package_libreoffice-still() {
 		'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
 		'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
 		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
-		'liblangtag' 'libexttextcat' 'liborcus' 'libwebp' # 'libfbclient' 'libcmis'
+		'liblangtag' 'libexttextcat' 'libwebp' # 'libfbclient' 'libcmis' 'liborcus'
 		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' 'gpgme' 
 		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
 		'zxing-cpp' 'xdg-utils'