Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages / 
libreoffice-fresh


Commits:
801579fd by Andreas Radke at 2024-09-10T18:36:42+02:00
upgpkg: 24.8.0-5; fix pyuno packaging libreoffice-fresh issues #3

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
 pkgbase = libreoffice-fresh
        pkgver = 24.8.0
-       pkgrel = 4
+       pkgrel = 5
        url = https://www.libreoffice.org/
        arch = x86_64
        license = MPL-2.0


=====================================
PKGBUILD
=====================================
@@ -12,7 +12,7 @@ pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=24.8.0.3
 pkgver=24.8.0
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 license=('MPL-2.0' 'LGPL-3.0-or-later')
 url="https://www.libreoffice.org/";
@@ -344,14 +344,30 @@ package_libreoffice-fresh() {
     install -dm755 "${pkgdir}"/etc/profile.d
     install -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} 
"${pkgdir}"/etc/profile.d/
 
-    # make pyuno find its modules
-    local site_packages=$(python -c "import site; 
print(site.getsitepackages()[0])")
 
+    # 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 it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/commit/801579fd2ec95d80136f411308656da93330f6e0

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/commit/801579fd2ec95d80136f411308656da93330f6e0
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to