diff --git a/extra/libreoffice-fresh/.SRCINFO b/extra/libreoffice-fresh/.SRCINFO index f5f7c2f96..42928820a 100644 --- a/extra/libreoffice-fresh/.SRCINFO +++ b/extra/libreoffice-fresh/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = libreoffice-fresh pkgver = 24.8.0 - pkgrel = 1 + pkgrel = 2 url = https://www.libreoffice.org/ arch = x86_64 license = MPL-2.0 @@ -101,7 +101,6 @@ pkgbase = libreoffice-fresh makedepends = clang makedepends = zxing-cpp makedepends = libffi - makedepends = box2d makedepends = git makedepends = python-setuptools makedepends = rhino @@ -116,6 +115,7 @@ pkgbase = libreoffice-fresh noextract = lxml-4.1.1.tgz noextract = Firebird-3.0.7.33374-0.tar.bz2 noextract = skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz + noextract = box2d-2.4.1.tar.gz noextract = dragonbox-1.1.3.tar.gz noextract = frozen-1.1.1.tar.gz noextract = zxcvbn-c-2.5.tar.gz @@ -141,6 +141,7 @@ pkgbase = libreoffice-fresh source = https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz source = https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2 source = https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz + source = https://dev-www.libreoffice.org/src/box2d-2.4.1.tar.gz 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/zxcvbn-c-2.5.tar.gz @@ -169,6 +170,7 @@ pkgbase = libreoffice-fresh sha256sums = 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e sha256sums = acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76 sha256sums = 2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01 + sha256sums = d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2 sha256sums = 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384 sha256sums = f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 sha256sums = 77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd @@ -249,7 +251,6 @@ pkgname = libreoffice-fresh depends = libepubgen depends = libqxp depends = libepoxy - depends = box2d depends = zxing-cpp depends = xdg-utils depends = libldap diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index 1113a7bea..6819e72f7 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -20,7 +20,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=24.8.0.3 pkgver=24.8.0 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('MPL-2.0' 'LGPL-3.0-or-later') url="https://www.libreoffice.org/" @@ -41,7 +41,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps' 'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 'libwebp' 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext' 'abseil-cpp' 'clang' 'zxing-cpp' - 'libffi' 'box2d' 'git' 'python-setuptools' 'rhino' + 'libffi' 'git' 'python-setuptools' 'rhino' ) options=('!lto') # using --enable-lto (for parallel link-time optimization) _mirror="https://ftp.osuosl.org/pub/tdf/libreoffice/src/${pkgver}" @@ -61,6 +61,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/lxml-4.1.1.tgz ${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2 ${_additional_source_url}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz + ${_additional_source_url}/box2d-2.4.1.tar.gz ${_additional_source_url}/dragonbox-1.1.3.tar.gz ${_additional_source_url}/frozen-1.1.1.tar.gz ${_additional_source_url}/zxcvbn-c-2.5.tar.gz @@ -68,7 +69,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_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 - soffice-template.desktop.in + soffice-template.desktop.in libreoffice-fresh.sh libreoffice-fresh.csh) noextract=(a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz @@ -81,6 +82,7 @@ noextract=(a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip lxml-4.1.1.tgz Firebird-3.0.7.33374-0.tar.bz2 skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz + box2d-2.4.1.tar.gz dragonbox-1.1.3.tar.gz frozen-1.1.1.tar.gz zxcvbn-c-2.5.tar.gz @@ -107,6 +109,7 @@ sha256sums=('5b11468cd1b68c05c33b151fcd7d044eea0c7e1dbf4bda028b490e18df7d78c1' '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e' 'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76' '2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01' + 'd6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2' '09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384' 'f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45' '77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd' @@ -238,6 +241,7 @@ build() { --with-system-headers \ --without-system-hsqldb \ --with-system-clucene \ + --without-system-box2d \ --without-system-dragonbox \ --without-system-libfixmath \ --without-system-frozen \ @@ -277,7 +281,7 @@ package_libreoffice-fresh-sdk() { # fix permissions find "${pkgdir}"/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} + - + # add LibreOfficeKit headers; FS#48066 install -dm755 "${pkgdir}"/usr/include/LibreOfficeKit install -v -m644 "${srcdir}"/libreoffice-$_LOver/include/LibreOfficeKit/* "${pkgdir}"/usr/include/LibreOfficeKit @@ -293,8 +297,8 @@ package_libreoffice-fresh() { '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' - 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d' + 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' 'gpgme' + 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'zxing-cpp' 'xdg-utils' 'libldap' 'fontconfig' 'zlib' 'libpng' 'freetype2' 'raptor' 'libxml2' 'cairo' 'libx11' 'expat' 'glib2' 'boost-libs' 'libtiff' 'dbus' 'glibc' @@ -353,11 +357,11 @@ package_libreoffice-fresh() { "${pkgdir}"/$site_packages/uno.py ln -svf /usr/lib/libreoffice/program/unohelper.py \ "${pkgdir}"/$site_packages/unohelper.py - + # add a symlink required for gnome-documents; FS#51887 # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \ - "${pkgdir}"/usr/lib/liblibreofficekitgtk.so + "${pkgdir}"/usr/lib/liblibreofficekitgtk.so # cleanup rm -rf "${pkgdir}"/usr/share/libreoffice/sdk