[arch-commits] Commit in libreoffice-fresh/trunk (2 files)

[Andreas Radke]

    Date: Thursday, December 25, 2014 @ 23:10:01
  Author: andyrtr
Revision: 228050

prepare next release

Added:
  libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install_LibO44.diff
Modified:
  libreoffice-fresh/trunk/PKGBUILD.44

-------------------------------------------------------------+
 PKGBUILD.44                                                 |   18 ++--
 make-pyuno-work-with-system-wide-module-install_LibO44.diff |   44 ++++++++++
 2 files changed, 53 insertions(+), 9 deletions(-)

Modified: PKGBUILD.44
===================================================================
--- PKGBUILD.44	2014-12-25 20:51:13 UTC (rev 228049)
+++ PKGBUILD.44	2014-12-25 22:10:01 UTC (rev 228050)
@@ -49,7 +49,7 @@
 	${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	${_additional_source_url}/libmwaw-0.3.3.tar.bz2
-	${_additional_source_url}/language-subtag-registry-2014-04-10.tar.bz2
+	${_additional_source_url}/language-subtag-registry-2014-12-03.tar.bz2
 	${_additional_source_url}/CoinMP-1.7.6.tgz
 	${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
 	${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
@@ -58,12 +58,12 @@
 	${_additional_source_url}/libgltf/libgltf-0.0.2.tar.bz2
 	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
+	${_additional_source_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
 	${_additional_source_url}/libe-book-0.1.1.tar.bz2
 	${_additional_source_url}/libfreehand-0.1.0.tar.bz2
 	${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	make-pyuno-work-with-system-wide-module-install.diff
+	make-pyuno-work-with-system-wide-module-install_LibO44.diff
 	libreoffice-fresh.sh libreoffice-fresh.csh)
 noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -87,7 +87,7 @@
 	7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	libmwaw-0.3.3.tar.bz2
-	language-subtag-registry-2014-04-10.tar.bz2
+	language-subtag-registry-2014-12-03.tar.bz2
 	CoinMP-1.7.6.tgz
 	4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
 	OpenCOLLADA-master-6509aa13af.tar.bz2
@@ -96,7 +96,7 @@
 	libgltf-0.0.2.tar.bz2
 	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
+	5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
 	libe-book-0.1.1.tar.bz2
 	libfreehand-0.1.0.tar.bz2
 	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
@@ -129,7 +129,7 @@
          '7681383be6ce489d84c1c74f4e7f9643'
          '0168229624cfac409e766913506961a8'
          '19b879c2a27251db6fb274d6c585d488'
-         '49c94710f7858b1969d74ff72e6aac84'
+         '0f2677ec23bb43ddc7355d1b4cc8ed45'
          '1cce53bf4b40ae29790d2c5c9f8b1129'
          '4b87018f7fff1d054939d19920b751a0'
          '4ca8a6ef0afeefc864e9ef21b9f14bd6'
@@ -138,12 +138,12 @@
          'd63a9f47ab048f5009d90693d6aa6424'
          'd8bd5eed178db6e2b18eeed243f85aa8'
          'ba2930200c9f019c2d93a8c88c651a0f'
-         '22f8a85daf4a012180322e1f52a7563b'
+         '5821b806a98e6c38370970e682ce76e8'
          'c25a881d21abc5b4da19205db513cc22'
          '5f029fef73e42a2c2ae4524a7513f97d'
          '36271d3fa0d9dec1632029b6d7aac925'
          '185d60944ea767075d27247c3162b3bc'
-         '07d2bf5ad839a394cca008b3ec6e7bb1'
+         'dcb5ad3e5f7139227677ea064b075422'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3')
@@ -164,7 +164,7 @@
 	cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
 
 	# fix not upstreamable pyuno paths - patch taken from Debian
-	patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
+	patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install_LibO44.diff
 
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do

Added: make-pyuno-work-with-system-wide-module-install_LibO44.diff
===================================================================
--- make-pyuno-work-with-system-wide-module-install_LibO44.diff	                        (rev 0)
+++ make-pyuno-work-with-system-wide-module-install_LibO44.diff	2014-12-25 22:10:01 UTC (rev 228050)
@@ -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"