extra/libreoffice-still to 24.2.6-3

This commit is contained in:
Kevin Mihelich 2024-09-10 23:05:33 +00:00
parent 56cae3e167
commit 4c29cf67ac
3 changed files with 22 additions and 34 deletions

View file

@ -1,6 +1,6 @@
pkgbase = libreoffice-still
pkgver = 24.2.6
pkgrel = 2
pkgrel = 3
url = https://www.libreoffice.org/
arch = x86_64
license = MPL-2.0
@ -151,7 +151,6 @@ pkgbase = libreoffice-still
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
source = make-pyuno-work-with-system-wide-module-install.diff
source = 623ea5c.diff
source = libreoffice-7.5.8.2-icu-74-compatibility.patch
source = soffice-template.desktop.in
@ -185,7 +184,6 @@ pkgbase = libreoffice-still
sha256sums = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
sha256sums = 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
sha256sums = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563
sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5
sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599
sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879

View file

@ -20,7 +20,7 @@ pkgbase=libreoffice-still
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
_LOver=24.2.6.2
pkgver=24.2.6
pkgrel=2
pkgrel=3
arch=('x86_64')
license=('MPL-2.0' 'LGPL-3.0-or-later')
url="https://www.libreoffice.org/"
@ -71,7 +71,6 @@ 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
make-pyuno-work-with-system-wide-module-install.diff
623ea5c.diff
libreoffice-7.5.8.2-icu-74-compatibility.patch
soffice-template.desktop.in
@ -126,7 +125,6 @@ sha256sums=('f6ea4df022696065b5dcdca4e28bf06906ac852df4ba6dc50aa8fe59c8e11db3'
'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
'984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
@ -144,10 +142,6 @@ prepare() {
done
popd
# should be obsolete - Debian has dropped this long time ago
# fix not upstreamable pyuno paths - FS#54250
# patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
# fix build - https://gerrit.libreoffice.org/c/core/+/145421
patch -Np1 -i "${srcdir}"/623ea5c.diff
@ -370,14 +364,28 @@ package_libreoffice-still() {
install -dm755 "${pkgdir}"/etc/profile.d
install -m644 "${srcdir}"/libreoffice-still.{sh,csh} "${pkgdir}"/etc/profile.d/
# make pyuno find its modules
# move python bits into 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}"/$site_packages/uno.py
ln -svf /usr/lib/libreoffice/program/unohelper.py \
"${pkgdir}"/$site_packages/unohelper.py
pushd "${pkgdir}"/$site_packages
echo "import sys, os" > uno.py
echo "sys.path.append('/usr/lib/libreoffice/program/')" >> uno.py
echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc')" >> uno.py
cat "${pkgdir}"/usr/lib/libreoffice/program/uno.py >> uno.py
rm -f "${pkgdir}"/usr/lib/libreoffice/program/uno.py*
mv -f "${pkgdir}"/usr/lib/libreoffice/program/unohelper.py* .
mv -f "${pkgdir}"/usr/lib/libreoffice/program/officehelper.py* .
popd
# # make pyuno find its modules
# 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}"/$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

View file

@ -1,18 +0,0 @@
--- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200
+++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200
@@ -16,8 +16,14 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-import pyuno
+
+# Special modification to make uno load on Arch
+import os
import sys
+sys.path.append("/usr/lib/libreoffice/program/")
+os.putenv("URE_BOOTSTRAP", "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc")
+
+import pyuno
import traceback
import warnings