Attachment #392098 for bug #533138

Lines 129-134 if echo "$checks" \| grep -q "cc" ; then Link Here

(-)a/desktop/scripts/soffice.sh (+3 lines)
129	exit 1;	129	exit 1;
130	fi	130	fi
131		131
		132	PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
		133	export PYTHONPATH
		134
132	case "`uname -s`" in	135	case "`uname -s`" in
133	NetBSD\|OpenBSD\|FreeBSD\|DragonFly)	136	NetBSD\|OpenBSD\|FreeBSD\|DragonFly)
134	# this is a temporary hack until we can live with the default search paths	137	# this is a temporary hack until we can live with the default search paths

Lines 16-23 Link Here

(-)a/pyuno/source/module/uno.py (+4 lines)
16	# except in compliance with the License. You may obtain a copy of	16	# except in compliance with the License. You may obtain a copy of
17	# the License at http://www.apache.org/licenses/LICENSE-2.0 .	17	# the License at http://www.apache.org/licenses/LICENSE-2.0 .
18	#	18	#
		19	import os
19	import sys	20	import sys
20		21
		22	sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
		23	if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
		24	os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
21	import pyuno	25	import pyuno
22		26
23	try:	27	try:

Lines 44-50 def bootstrap(): Link Here

(-)a/pyuno/source/officehelper.py (-1 / +1 lines)
44	if "UNO_PATH" in os.environ:	44	if "UNO_PATH" in os.environ:
45	sOffice = os.environ["UNO_PATH"]	45	sOffice = os.environ["UNO_PATH"]
46	else:	46	else:
47	sOffice = "" # lets hope for the best	47	sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
48	sOffice = os.path.join(sOffice, "soffice")	48	sOffice = os.path.join(sOffice, "soffice")
49	if platform.startswith("win"):	49	if platform.startswith("win"):
50	sOffice += ".exe"	50	sOffice += ".exe"

Return to bug 533138