Attachment #463404 for bug #609054

View | Details | Raw Unified | Return to bug 609054
Collapse All | Expand All

Lines 4-9 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291 Link Here

(-)a/app-office/libreoffice/Manifest (+1 lines)
4	DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34	4	DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
5	DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4	5	DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
6	DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512 20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 WHIRLPOOL f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364adddd43766aa01770070a0081d1adcc588e4f84786f9	6	DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512 20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 WHIRLPOOL f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364adddd43766aa01770070a0081d1adcc588e4f84786f9
		7	DIST 9ac66c71463f9440e3ccc996c5e66556-pdfium-3004.tar.bz2 5132024 SHA256 4f1c033c3850dc01cc85d22a4836182e1523b95198408ecd11f1c34b9a96ec9c SHA512 3fc40c230ed66d7b5894e15cf7d3814d125342e5d9815df9739963d6e45ff0a700e36a247336bf8e29886652e5a6bec8e6ccf02b89c811e83f6fd5f3e5350807 WHIRLPOOL ea4ceabfbddeeee6332b719adde4d5ae0b187f14e9dbf83253274f603d955d40e69a41d832716ad7e3a74c5b090116f9ef83b9520d069a4f49df9f42df476719
7	DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c	8	DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
8	DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7	9	DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
9	DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb	10	DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb




diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index f855fe79e8b..5014de5865e 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -147,6 +147,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
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index bccf22d0f8a..01f760ba969 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -16,11 +16,16 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .

 import sys
 import traceback
 import warnings
 
+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
+    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
+
 # since on Windows sal3.dll no longer calls WSAStartup
 import socket
 
diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
index 53bd5943e3c..40899c5a426 100644
--- a/pyuno/source/officehelper.py
+++ b/pyuno/source/officehelper.py
@@ -45,7 +45,7 @@ def bootstrap():
         if "UNO_PATH" in os.environ:
             sOffice = os.environ["UNO_PATH"]
         else:
-            sOffice = "" # lets hope for the best
+            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
         sOffice = os.path.join(sOffice, "soffice")
         if platform.startswith("win"):
             sOffice += ".exe"




	"${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
	"${ADDONS_URI}/9ac66c71463f9440e3ccc996c5e66556-pdfium-3004.tar.bz2"
	# no release for 8 years, should we package it?
	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
	# Does not build with 1.6 rhino at all

LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"

IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport pdfium postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"

LICENSE="|| ( LGPL-3 MPL-1.1 )"

		$(use_enable quickstarter systray) \
		$(use_enable telepathy) \
		$(use_enable vlc) \
		$(use_enable pdfium) \
		$(use_with coinmp system-coinmp) \
		$(use_with collada system-opencollada) \
		$(use_with gltf system-libgltf) \

Return to bug 609054

Lines 1-20 Link Here

(-)a/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch (-11 / +12 lines)
1	diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh	1	diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
2	index a259bf6..672fa23 100755	2	index f855fe79e8b..5014de5865e 100755
3	--- a/desktop/scripts/soffice.sh	3	--- a/desktop/scripts/soffice.sh
4	+++ b/desktop/scripts/soffice.sh	4	+++ b/desktop/scripts/soffice.sh
5	@@ -139,6 +139,9 @@ if echo "$checks" \| grep -q "cc" ; then	5	@@ -147,6 +147,9 @@ if echo "$checks" \| grep -q "cc" ; then
6	exit 1;	6	exit 1;
7	fi	7	fi
8		8
9	+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}	9	+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
10	+export PYTHONPATH	10	+export PYTHONPATH
11	+	11	+
12	case "`uname -s`" in	12	case "$(uname -s)" in
13	NetBSD\|OpenBSD\|DragonFly)	13	NetBSD\|OpenBSD\|DragonFly)
14	# this is a temporary hack until we can live with the default search paths	14	# this is a temporary hack until we can live with the default search paths
15		15	diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
16	--- a/pyuno/source/module/uno.py 2016-08-07 20:57:51.653712240 -0400	16	index bccf22d0f8a..01f760ba969 100644
17	+++ b/pyuno/source/module/uno.py 2016-08-07 20:59:33.958896861 -0400	17	--- a/pyuno/source/module/uno.py
		18	+++ b/pyuno/source/module/uno.py
18	@@ -16,11 +16,16 @@	19	@@ -16,11 +16,16 @@
19	# except in compliance with the License. You may obtain a copy of	20	# except in compliance with the License. You may obtain a copy of
20	# the License at http://www.apache.org/licenses/LICENSE-2.0 .	21	# the License at http://www.apache.org/licenses/LICENSE-2.0 .
Lines 24-47 index a259bf6..672fa23 100755 Link Here
24	import sys	25	import sys
25	import traceback	26	import traceback
26	import warnings	27	import warnings
27		28
28	+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')	29	+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
29	+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:	30	+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
30	+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"	31	+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
31	+	32	+
32	# since on Windows sal3.dll no longer calls WSAStartup	33	# since on Windows sal3.dll no longer calls WSAStartup
33	import socket	34	import socket
34		35
35	diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py	36	diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
36	index 99d3b03..704edab 100755	37	index 53bd5943e3c..40899c5a426 100644
37	--- a/pyuno/source/officehelper.py	38	--- a/pyuno/source/officehelper.py
38	+++ b/pyuno/source/officehelper.py	39	+++ b/pyuno/source/officehelper.py
39	@@ -44,7 +44,7 @@ def bootstrap():	40	@@ -45,7 +45,7 @@ def bootstrap():
40	if "UNO_PATH" in os.environ:	41	if "UNO_PATH" in os.environ:
41	sOffice = os.environ["UNO_PATH"]	42	sOffice = os.environ["UNO_PATH"]
42	else:	43	else:
43	- sOffice = "" # lets hope for the best	44	- sOffice = "" # lets hope for the best
44	+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"	45	+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
45	sOffice = os.path.join(sOffice, "soffice")	46	sOffice = os.path.join(sOffice, "soffice")
46	if platform.startswith("win"):	47	if platform.startswith("win"):
47	sOffice += ".exe"	48	sOffice += ".exe"

Lines 60-65 ADDONS_SRC=( Link Here

(-)a/app-office/libreoffice/libreoffice-9999.ebuild (-1 / +3 lines)
60	"${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code	60	"${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
61	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"	61	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
62	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"	62	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
		63	"${ADDONS_URI}/9ac66c71463f9440e3ccc996c5e66556-pdfium-3004.tar.bz2"
63	# no release for 8 years, should we package it?	64	# no release for 8 years, should we package it?
64	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"	65	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
65	# Does not build with 1.6 rhino at all	66	# Does not build with 1.6 rhino at all
Lines 78-84 unset ADDONS_SRC Link Here
78	LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"	79	LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
79		80
80	IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive	81	IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
81	gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc	82	gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport pdfium postgres quickstarter telepathy test vlc
82	$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"	83	$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
83		84
84	LICENSE="\|\| ( LGPL-3 MPL-1.1 )"	85	LICENSE="\|\| ( LGPL-3 MPL-1.1 )"
Lines 492-497 src_configure() { Link Here
492	$(use_enable quickstarter systray) \	493	$(use_enable quickstarter systray) \
493	$(use_enable telepathy) \	494	$(use_enable telepathy) \
494	$(use_enable vlc) \	495	$(use_enable vlc) \
		496	$(use_enable pdfium) \
495	$(use_with coinmp system-coinmp) \	497	$(use_with coinmp system-coinmp) \
496	$(use_with collada system-opencollada) \	498	$(use_with collada system-opencollada) \
497	$(use_with gltf system-libgltf) \	499	$(use_with gltf system-libgltf) \