8f368a0d1a
- Version update to 5.2.0.0.beta1:
* Disable support for sle11, not needed anymore
* Cleanup the specfile from all the compat conditionals per above
* Disable bundled help and point to upstream wiki always (speeds
up build quite a bit)
* Use pkgconfig style dependencies instead of the develpkgs
* Remove all the bundled tarballs that were aedded for sle11
* Adjust the constraints a bit to reflect reality
* Remove merged patches:
* scp2-user-config-suse.diff
* 0001-Make-HAVE_JAVA6-be-always-false.patch
* 0001-mdds-1.0.patch
* 0001-liborcus-0.11.patch
* 0002-boost-filesystem1.patch
* 0003-boost-filesystem2.patch
* bnc856729.patch
* bnc939998.patch
* bnc945443.patch
* bnc945445.patch
* Refresh patches:
* libreoffice-hotfix-disablebrokenshapetest.patch
* system-pyuno.diff
OBS-URL: https://build.opensuse.org/request/show/399630
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=407
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
Index: libreoffice-5.2.0.0.alpha1/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
|
|
@@ -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.2.0.0.alpha1/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 @@
|
|
# 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
|
|
===================================================================
|
|
--- 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():
|
|
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"
|