diff --git a/libreoffice.changes b/libreoffice.changes index 6923563..96988ea 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -3,7 +3,7 @@ Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com - Version update to 5.3.0.beta1: * Starting of testing of new major release - +- Refresh patch system-pyuno.diff ------------------------------------------------------------------- Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com diff --git a/system-pyuno.diff b/system-pyuno.diff index 10f03fd..d5354cd 100644 --- a/system-pyuno.diff +++ b/system-pyuno.diff @@ -1,7 +1,7 @@ -Index: libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh +Index: libreoffice-5.3.0.0.beta1/desktop/scripts/soffice.sh =================================================================== ---- libreoffice-5.2.0.0.alpha1.orig/desktop/scripts/soffice.sh -+++ libreoffice-5.2.0.0.alpha1/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 @@ -12,28 +12,26 @@ Index: libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh case "`uname -s`" in NetBSD|OpenBSD|DragonFly) # this is a temporary hack until we can live with the default search paths -Index: libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py +Index: libreoffice-5.3.0.0.beta1/pyuno/source/module/uno.py =================================================================== ---- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/module/uno.py -+++ libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py -@@ -16,8 +16,12 @@ +--- 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 - import sys - +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 - - try: -Index: libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py + import sys + import traceback +Index: libreoffice-5.3.0.0.beta1/pyuno/source/officehelper.py =================================================================== ---- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/officehelper.py -+++ libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py -@@ -44,7 +44,7 @@ def bootstrap(): +--- 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: