diff --git a/office/libreoffice/libreoffice/actions.py b/office/libreoffice/libreoffice/actions.py index dfab1064c2..bbb8d2f605 100644 --- a/office/libreoffice/libreoffice/actions.py +++ b/office/libreoffice/libreoffice/actions.py @@ -19,7 +19,7 @@ def setup(): shelltools.system('sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac') shelltools.chmod("%s/bin/unpack-sources" % OurWorkDir) shelltools.export("LO_PREFIX", "/usr") - shelltools.export("PYTHON", "python2.7") + shelltools.export("PYTHON", "python3.4") shelltools.cd(OurWorkDir) shelltools.touch("autogen.lastrun") @@ -28,14 +28,14 @@ def setup(): -i svl/source/misc/gridprinter.cxx') shelltools.system('./autogen.sh \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc \ --with-vendor=PisiLinux \ - --with-lang="ALL" \ - --disable-gtk3 \ - --with-help \ - --with-myspell-dicts \ - --with-alloc=system \ - --with-java \ + --with-lang="ALL" \ + --enable-gtk3 \ + --with-help \ + --with-myspell-dicts \ + --with-alloc=system \ + --with-java \ --without-system-dicts \ --disable-postgresql-sdbc \ --enable-release-build=yes \ diff --git a/office/libreoffice/libreoffice/files/make-pyuno-work-with-system-wide-module-install.diff b/office/libreoffice/libreoffice/files/make-pyuno-work-with-system-wide-module-install.diff new file mode 100644 index 0000000000..881ff5122b --- /dev/null +++ b/office/libreoffice/libreoffice/files/make-pyuno-work-with-system-wide-module-install.diff @@ -0,0 +1,44 @@ +diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh +index defd7b2..ea2a809 100755 +--- a/desktop/scripts/soffice.sh ++++ b/desktop/scripts/soffice.sh +@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then + exit 1; + fi + ++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} ++export PYTHONPATH ++ + case "`uname -s`" in + NetBSD|OpenBSD|FreeBSD|DragonFly) + # this is a temporary hack until we can live with the default search paths +diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py +index f93ac5e..92a2891 100644 +--- a/pyuno/source/module/uno.py ++++ b/pyuno/source/module/uno.py +@@ -26,8 +26,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('/usr/lib/libreoffice/program') ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" + import pyuno + + try: +diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py +index 610ac5f..df243d0 100755 +--- a/pyuno/source/officehelper.py ++++ b/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 = "/usr/lib/libreoffice/program" + sOffice = os.path.join(sOffice, "soffice") + if platform.startswith("win"): + sOffice += ".exe" diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index d020feea5b..36fd2d2b51 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -13,12 +13,13 @@ app:gui LibreOffice office suite LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office. - http://download.documentfoundation.org/libreoffice/src/5.1.2/libreoffice-5.1.2.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.1.2/libreoffice-help-5.1.2.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.1.2/libreoffice-dictionaries-5.1.2.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.1.2/libreoffice-translations-5.1.2.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.2.0/libreoffice-5.2.0.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.2.0/libreoffice-help-5.2.0.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.2.0/libreoffice-dictionaries-5.2.0.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.2.0/libreoffice-translations-5.2.0.1.tar.xz - remove_unnecessary_orcus_external_usage_from_makefiles.diff + make-pyuno-work-with-system-wide-module-install.diff + remove_unnecessary_orcus_external_usage_from_makefiles.diff ant @@ -50,7 +51,7 @@ libXcomposite-devel libjpeg-turbo-devel gst-plugins-base-next-devel - + gtk3-devel gtk2-devel libatomic_ops-devel librsvg-devel @@ -3107,6 +3108,13 @@ + + 2016-06-26 + 5.2.0.1 + Release Bump + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2016-06-09 5.1.2.2