| author | Andreas Radke
<andyrtr@archlinux.org> 2024-01-31 20:06:50 UTC |
| committer | Andreas Radke
<andyrtr@archlinux.org> 2024-01-31 20:06:50 UTC |
| parent | 07226a80dfb84994dfc360e17baf46dfb3b826b0 |
| .SRCINFO | +4 | -3 |
| PKGBUILD | +7 | -3 |
diff --git a/.SRCINFO b/.SRCINFO index a379036..c547659 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = libreoffice-still pkgver = 7.6.4 - pkgrel = 1 + pkgrel = 2 url = https://www.libreoffice.org/ arch = x86_64 license = MPL-2.0 @@ -80,7 +80,6 @@ pkgbase = libreoffice-still makedepends = libcmis makedepends = libtommath makedepends = libzmf - makedepends = xmlsec makedepends = rxvt-unicode makedepends = gpgme makedepends = libwebp @@ -111,6 +110,7 @@ pkgbase = libreoffice-still noextract = skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz noextract = dragonbox-1.1.3.tar.gz noextract = frozen-1.1.1.tar.gz + noextract = xmlsec1-1.2.37.tar.gz noextract = 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar noextract = odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar noextract = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf @@ -136,6 +136,7 @@ pkgbase = libreoffice-still source = https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz source = https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz source = https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz + source = https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz source = https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar source = https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar source = https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf @@ -168,6 +169,7 @@ pkgbase = libreoffice-still sha256sums = 0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9 sha256sums = 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384 sha256sums = f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 + sha256sums = 5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c sha256sums = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 sha256sums = 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504 sha256sums = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140 @@ -239,7 +241,6 @@ pkgname = libreoffice-still depends = libtommath depends = libzmf depends = libatomic_ops - depends = xmlsec depends = libnumbertext depends = gpgme depends = libfreehand diff --git a/PKGBUILD b/PKGBUILD index bbcd295..8c570bb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') _LOver=7.6.4.1 pkgver=7.6.4 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('MPL-2.0' 'LGPL-3.0-or-later') url="https://www.libreoffice.org/" @@ -28,7 +28,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm' 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 'libexttextcat' 'gobject-introspection' 'libcmis' # 'libfbclient' - 'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 'libwebp' + 'libtommath' 'libzmf' 'rxvt-unicode' 'gpgme' 'libwebp' # 'xmlsec' 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext' 'abseil-cpp' 'clang' 'zxing-cpp' 'libffi' 'box2d' 'git' @@ -54,6 +54,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz ${_additional_source_url}/dragonbox-1.1.3.tar.gz ${_additional_source_url}/frozen-1.1.1.tar.gz + ${_additional_source_url}/xmlsec1-1.2.37.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}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf @@ -78,6 +79,7 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz dragonbox-1.1.3.tar.gz frozen-1.1.1.tar.gz + xmlsec1-1.2.37.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 f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf @@ -104,6 +106,7 @@ sha256sums=('13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e' '0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9' '09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384' 'f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45' + '5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504' 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' @@ -241,6 +244,7 @@ build() { --with-system-libzmf \ --with-system-gpgmepp \ --with-system-libstaroffice \ + --without-system-xmlsec \ --with-jdk-home="/usr/lib/jvm/default" \ --with-ant-home="/usr/share/ant"\ --with-system-boost\ @@ -308,7 +312,7 @@ package_libreoffice-still() { 'desktop-file-utils' 'shared-mime-info' 'libpagemaker' 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'liblangtag' 'libexttextcat' 'liborcus' 'libwebp' 'libcmis' # 'libfbclient' - 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' 'gpgme' + 'libtommath' 'libzmf' 'libatomic_ops' 'libnumbertext' 'gpgme' # 'xmlsec' 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d' 'zxing-cpp' 'xdg-utils' 'libldap' 'fontconfig' 'zlib' 'libpng' 'freetype2' 'raptor' 'libxml2'