diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index c31413c32..9885c6f8a 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -19,11 +19,11 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=7.4.4.2 pkgver=7.4.4 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" -makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps' +makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps' 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' @@ -66,6 +66,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_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 + libreoffice-boost-1.81.0-locale.patch::https://github.com/LibreOffice/core/commit/23dcd4339428.patch make-pyuno-work-with-system-wide-module-install.diff 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch 623ea5c.diff @@ -117,6 +118,7 @@ sha256sums=('8ae1d9a91fab98d9601ee5e256389e3da26c6ad9836930b151504b742e729d0b' '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504' 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' + '9754c1c9025dd34b010b3e9c9c39ef2f850331e486b5d0adbf5c86f554259b04' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' 'fa0073dee8fc0519b84ed6af6fa9769b88abb24e694c314344c4606478101547' '440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5' @@ -140,6 +142,9 @@ prepare() { rm "${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll "${srcdir}"/ext_sources + # https://gerrit.libreoffice.org/c/core/+/143343 + patch -Np1 -i "${srcdir}"/libreoffice-boost-1.81.0-locale.patch + # fix not upstreamable pyuno paths - FS#54250 patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff @@ -295,7 +300,7 @@ package_libreoffice-fresh-sdk() { package_libreoffice-fresh() { pkgdesc="LibreOffice branch which contains new features and program enhancements" - depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps' + depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps' 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' @@ -352,11 +357,13 @@ package_libreoffice-fresh() { install -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} "${pkgdir}"/etc/profile.d/ # make pyuno find its modules - install -dm755 "${pkgdir}"/usr/lib/python3.10/site-packages + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + + install -dm755 "${pkgdir}"/$site_packages ln -svf /usr/lib/libreoffice/program/uno.py \ - "${pkgdir}"/usr/lib/python3.10/site-packages/uno.py + "${pkgdir}"/$site_packages/uno.py ln -svf /usr/lib/libreoffice/program/unohelper.py \ - "${pkgdir}"/usr/lib/python3.10/site-packages/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