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

- Refresh patch system-pyuno.diff

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=448
This commit is contained in:
Tomáš Chvátal 2016-12-03 12:23:39 +00:00 committed by Git OBS Bridge
parent 991c277710
commit e37075d005
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libreoffice.changes
View File

@ -3,7 +3,7 @@ Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com
- Version update to 5.3.0.beta1: - Version update to 5.3.0.beta1:
* Starting of testing of new major release * Starting of testing of new major release
- Refresh patch system-pyuno.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com

28
system-pyuno.diff
View File

@ -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.3.0.0.beta1.orig/desktop/scripts/soffice.sh
+++ libreoffice-5.2.0.0.alpha1/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 @@ -137,6 +137,9 @@ if echo "$checks" | grep -q "cc" ; then
exit 1; exit 1;
fi fi
@ -12,28 +12,26 @@ Index: libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh
case "`uname -s`" in case "`uname -s`" in
NetBSD|OpenBSD|DragonFly) NetBSD|OpenBSD|DragonFly)
# this is a temporary hack until we can live with the default search paths # 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.3.0.0.beta1.orig/pyuno/source/module/uno.py
+++ libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py +++ libreoffice-5.3.0.0.beta1/pyuno/source/module/uno.py
@@ -16,8 +16,12 @@ @@ -16,6 +16,10 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
+import os +import os
import sys
+sys.path.append('@INSTALLDIR@/program') +sys.path.append('@INSTALLDIR@/program')
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: +if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc" + os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc"
import pyuno import pyuno
import sys
try: import traceback
Index: libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py Index: libreoffice-5.3.0.0.beta1/pyuno/source/officehelper.py
=================================================================== ===================================================================
--- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/officehelper.py --- libreoffice-5.3.0.0.beta1.orig/pyuno/source/officehelper.py
+++ libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py +++ libreoffice-5.3.0.0.beta1/pyuno/source/officehelper.py
@@ -44,7 +44,7 @@ def bootstrap(): @@ -45,7 +45,7 @@ def bootstrap():
if "UNO_PATH" in os.environ: if "UNO_PATH" in os.environ:
sOffice = os.environ["UNO_PATH"] sOffice = os.environ["UNO_PATH"]
else: else: