pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Drop system-pyuno.diff patch as it breaks services tests as the

Browse Source 
pyuno was not loadable

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=459
This commit is contained in:
Tomáš Chvátal 2017-01-17 12:39:45 +00:00 committed by Git OBS Bridge
parent 8f0e2aab03
commit a945842c83
3 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 17 12:38:47 UTC 2017 - tchvatal@suse.com
- Drop system-pyuno.diff patch as it breaks services tests as the
pyuno was not loadable
-------------------------------------------------------------------
Fri Jan 13 09:21:39 UTC 2017 - tchvatal@suse.com

6
libreoffice.spec
View File

@ -72,8 +72,6 @@ Patch0: disable-flaky-hsqldb-test.patch
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build
Patch1: scp2-user-config-suse.diff
# correctly bootstrap python stuff with system python (deb#501028, bnc#90701)
Patch3: system-pyuno.diff
# do not use the broken help; unopkg complained about it when registering extensions
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch4: nlpsolver-no-broken-help.diff
@ -936,7 +934,6 @@ Provides additional %{langname} translations and resources for %{project}. \
%if 0%{?suse_version} < 1330
%patch1
%endif
%patch3 -p1
%patch4
%patch5
%patch6 -p1
@ -1061,9 +1058,6 @@ export NOCONFIGURE=yes
--enable-symbols
# no coinormp packages for coinmp
# hack to correctly bootstrap python stuff with system python, (deb#501028, bnc#90701)
sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py
# just call make here as we added the jobs in configure
# The check phase is run here too if it is split with nocheck
# install of jars get broken sometimes

42
system-pyuno.diff
View File

@ -1,42 +0,0 @@
Index: libreoffice-5.3.0.0.beta1/desktop/scripts/soffice.sh
===================================================================
--- libreoffice-5.3.0.0.beta1.orig/desktop/scripts/soffice.sh
+++ libreoffice-5.3.0.0.beta1/desktop/scripts/soffice.sh
@@ -137,6 +137,9 @@ if echo "$checks" | grep -q "cc" ; then
exit 1;
fi
+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
+export PYTHONPATH
+
case "`uname -s`" in
NetBSD|OpenBSD|DragonFly)
# this is a temporary hack until we can live with the default search paths
Index: libreoffice-5.3.0.0.beta1/pyuno/source/module/uno.py
===================================================================
--- libreoffice-5.3.0.0.beta1.orig/pyuno/source/module/uno.py
+++ libreoffice-5.3.0.0.beta1/pyuno/source/module/uno.py
@@ -16,6 +16,10 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+import os
+sys.path.append('@INSTALLDIR@/program')
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc"
import pyuno
import sys
import traceback
Index: libreoffice-5.3.0.0.beta1/pyuno/source/officehelper.py
===================================================================
--- libreoffice-5.3.0.0.beta1.orig/pyuno/source/officehelper.py
+++ libreoffice-5.3.0.0.beta1/pyuno/source/officehelper.py
@@ -45,7 +45,7 @@ def bootstrap():
if "UNO_PATH" in os.environ:
sOffice = os.environ["UNO_PATH"]
else:
- sOffice = "" # lets hope for the best
+ sOffice = "@INSTALLDIR@/program"
sOffice = os.path.join(sOffice, "soffice")
if platform.startswith("win"):
sOffice += ".exe"