Permalink
Browse files

FL-590: fix libreoffice postgres issues

  • Loading branch information...
1 parent 07a1d8d commit ddf7e40fb72a18919dee80f91c8cbbad610ef22c @angryvincent angryvincent committed Jun 20, 2013
@@ -0,0 +1,15 @@
+DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
+DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
+DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
+DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
+DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
+DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
+DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825 SHA512 bba2fe76d09e3ab99b170685525ceb4ce8ce8d95ffa0df97c05ce18cd7edbe73028861e19c501bf00db369d36f43fe274d4220ad046518d89737249f61c7cf3a WHIRLPOOL 2dd0924defb85dc6a266126fdaabc29f051ccf525d1e1e7a5f74db19f162ee2d17f98ae96fd832dbd1600c006e277b75a4d88d9b3128c7ec9e2365a6704d32e9
+DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5
+DIST libreoffice-4.0.3.3.tar.xz 104219900 SHA256 b490517aba0c7b52c4b537910bb63af01304512342c3d5e553a14eba5f5641a1 SHA512 417dae117c0e719dbaf3050fae7dcb88c9c7e0f1a932f0e497a2f8a8e9add34057e1773e587158cc887d54529081924fa90355ff8127f94ff47dd985d997d30c WHIRLPOOL 651be25621631d0167402fd24e60b9a84fe2c56c0a8f9b66e1b6a362b60e508383db20559a3666252ac95c71ea0ce1e0e6c395e103705b5f6288b1e545a8b8ac
+DIST libreoffice-binfilter-3.6.6.2.tar.xz 5969848 SHA256 b88c297f5cf5459049c0f00074ddf3fdb4946ba4c6880ac786d6236bb1636e67 SHA512 577c7e403046d185fceb092287f3ad99856010b9f18b43490f4d05c48815eef314d7554f24e0c064695fc05bff922a5d0924a10e7ffbe483338a54ddd73539a4 WHIRLPOOL 933574d32df1104a91e8489572b5a41204fde97c55896c4177c99e3b261169d830eab096258f23954854eb9b8900575aac9ef5df76bffcfee90387bf38f7ed97
+DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91
+DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b
+DIST libreoffice-core-3.6.6.2.tar.xz 107650196 SHA256 f6a20418a36678550241f66b2a005b25d5ad6ed95787edc61cf3b17194368377 SHA512 5fad2db063e8a2297f9935bf71d66abaa57d3f20dc31b09c486c9c9e7a39453c553232f7beaa497fda373bc78adc1033b0a266e483d090b118dee464562ceba1 WHIRLPOOL b0e8d545ba63e08ac6f47e54d6770378e14135db0991a9e6ab6269a7876d646b4983ab096b075b6ed87dffa3d65560dc0289b2869908e228c116e6dd065f24ff
+DIST libreoffice-help-3.6.6.2.tar.xz 1860668 SHA256 b3ebb29bb6077ccdeb65e5ae883ac349c7e81c263277f5030f242e6d782d2b8b SHA512 425e7ca64e60316a8ee5b05672bc5079400c0c0ccfe0f12079bb4b9867e88191233cc7d5770dad6a92daf50dcbf43aeecdf32dd76994b1393a486d4a5f876272 WHIRLPOOL 6e4583ee7e6d7a68a189853e74c87b60f35e4edb5addd804891082998da23eefa8b28c71975cc10c11f2373a69e95340d2d01e1f4f40ee38dfb97eab3b4282e2
+DIST libreoffice-help-4.0.3.3.tar.xz 1855496 SHA256 7a31dc0cdc69137b3be4c439f961df0d0d12b048f8ae6553f967082d2b16b6ac SHA512 02e0196880750927f0e1b9359ca63abc5b68e5345e2992c33f84c6240338ddf81f26d7e60368f3a06090cc42b3efe1051ce255c0c20abcd2011e5febba558985 WHIRLPOOL 7355d5288a3975d45fb358d4c07cdcb0ddc3f1a709f020b578c064271b6fbc0e92b0410ca0bc270c2d1405abcf12413556136ec08ffe36a218a4dc2ab8b5a61b
@@ -0,0 +1,151 @@
+#!/bin/bash
+
+# important: you need to use the most general CFLAGS to build the packages:
+# * for x86 : CFLAGS="-march=i586 -mtune=generic -O2 -pipe -g"
+# * for amd64: CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -g"
+
+# What you can set:
+VERSION="3.6.6.2"
+BINVERSION="3.6.6.2"
+OPTS="-v"
+USEFILE="/etc/portage/package.use/libreo"
+MYPKGDIR="$( portageq pkgdir )"
+################################################
+
+die() {
+ echo "${1}"
+ exit 1
+}
+
+if [ "$( uname -m )" = "x86_64" ] ; then
+ MYFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -g"
+ ARCH="amd64"
+elif [ "$( uname -m )" = "i686" ] ; then
+ MYFLAGS="-march=i586 -mtune=generic -O2 -pipe -g"
+ ARCH="x86"
+else
+ die "Arch $( uname -m ) not supported"
+fi
+
+for i in \
+ "/bin/echo" \
+ "/bin/mkdir" \
+ "/bin/mv" \
+ "/bin/rm" \
+ "/bin/sed" \
+ "/bin/tar" \
+ "/usr/bin/emerge" \
+ "/usr/bin/portageq" \
+ "/usr/bin/quickpkg"
+do
+ if [ ! -e "${i}" ] ; then
+ die "Missing some basic utility in your system"
+ fi
+done
+
+# first the default subset of useflags
+IUSES_BASE="bash-completion branding cups dbus gstreamer gtk opengl vba webdav -aqua -binfilter -jemalloc -mysql -odk -postgres"
+
+ENABLE_EXTENSIONS="presenter-console presenter-minimizer"
+DISABLE_EXTENSIONS="nlpsolver pdfimport scripting-beanshell scripting-javascript wiki-publisher"
+
+for lo_xt in ${ENABLE_EXTENSIONS}; do
+ IUSES_BASE+=" libreoffice_extensions_${lo_xt}"
+done
+for lo_xt in ${DISABLE_EXTENSIONS}; do
+ IUSES_BASE+=" -libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+# now for the options
+IUSES_J="java libreoffice_extensions_nlpsolver"
+IUSES_NJ="-java"
+IUSES_G="gnome eds"
+IUSES_NG="-gnome -eds"
+IUSES_K="kde"
+IUSES_NK="-kde"
+
+if [ -f /etc/portage/package.use ] ; then
+ die "Please save your package.use and re-create it as a directory"
+fi
+
+mkdir -p /etc/portage/package.use/ || die
+
+mkdir -p "${MYPKGDIR}"
+if [ -z "${MYPKGDIR}" -o ! -d "${MYPKGDIR}" ] ; then
+ die "Anything goes wrong"
+fi
+
+# compile the flavor
+echo "Base"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_NK}" > ${USEFILE}
+FEATURES="${FEATURES} splitdebug" CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+quickpkg libreoffice --include-config=y
+mv ${MYPKGDIR}/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-${BINVERSION}.tbz2 || die "Moving package failed"
+
+echo "Base - java"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_NK}" > ${USEFILE}
+FEATURES="${FEATURES} splitdebug" CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+quickpkg libreoffice --include-config=y
+mv ${MYPKGDIR}/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-java-${BINVERSION}.tbz2 || die "Moving package failed"
+
+# kde flavor
+echo "KDE"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_K}" > ${USEFILE}
+FEATURES="${FEATURES} splitdebug" CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+quickpkg libreoffice --include-config=y
+mv ${MYPKGDIR}/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-${BINVERSION}.tbz2 || die "Moving package failed"
+
+echo "KDE - java"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_K}" > ${USEFILE}
+FEATURES="${FEATURES} splitdebug" CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+quickpkg libreoffice --include-config=y
+mv ${MYPKGDIR}/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-java-${BINVERSION}.tbz2 || die "Moving package failed"
+
+# gnome flavor
+echo "Gnome"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_G} ${IUSES_NK}" > ${USEFILE}
+FEATURES="${FEATURES} splitdebug" CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+quickpkg libreoffice --include-config=y
+mv ${MYPKGDIR}/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-${BINVERSION}.tbz2 || die "Moving package failed"
+
+echo "Gnome -java"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_G} ${IUSES_NK}" > ${USEFILE}
+FEATURES="${FEATURES} splitdebug" CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+quickpkg libreoffice --include-config=y
+mv ${MYPKGDIR}/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${BINVERSION}.tbz2 || die "Moving package failed"
+
+
+for name in ./libreoffice-*-${BINVERSION}.tbz2 ; do
+
+ BN=`basename $name .tbz2`
+
+ rm -rf tmp.lo
+ mkdir -vp tmp.lo/p1 tmp.lo/p2
+ cd tmp.lo/p1
+
+ echo "Unpacking complete archive $BN.tbz2"
+ tar xfvjp ../../$BN.tbz2
+
+ echo "Moving debug info"
+ mkdir -vp ../p2/usr/lib
+ mv -v usr/lib/debug ../p2/usr/lib/
+
+ echo "Re-packing program"
+ tar cfvJ ../../$ARCH-bin-$BN.tar.xz --owner root --group root ./*
+
+ echo "Re-packing debug info"
+ cd ../p2
+ tar cfvJ ../../$ARCH-debug-$BN.tar.xz --owner root --group root ./*
+
+ echo "Removing unpacked files"
+ cd ../..
+ rm -rf tmp.lo
+
+ echo "Done with $BN.tbz2"
+
+done
+
+rm -f ${USEFILE} || die "Removing ${USEFILE} failed"
+
+rm -f libreoffice*${VERSION}*.tbz2 || die "Removing un-split package files failed"
@@ -0,0 +1,74 @@
+From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Sun, 24 Jun 2012 14:01:54 +0200
+Subject: [PATCH] dont run check targets in build, to allow running them
+ separately later
+
+Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243
+---
+ Makefile.top | 10 ++++++++--
+ solenv/bin/build.pl | 2 +-
+ solenv/gbuild/Module.mk | 2 +-
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.top b/Makefile.top
+index 7362bbc..ae849fb 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -243,7 +243,7 @@ xsltml\
+ zlib\
+
+ gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)
+-export gb_TAILBUILDTARGET=all slowcheck
++export gb_TAILBUILDTARGET=all
+
+ define gbuild_module_rules
+ .PHONY: $(1) $(1).all $(1).clean $(1).deliver
+@@ -480,11 +480,17 @@ findunusedcode:
+ | grep -v WPX \
+ > unusedcode.easy
+
+-check: dev-install subsequentcheck
++check: unitcheck slowcheck dev-install subsequentcheck
+
+ subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
+ $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+
++unitcheck:
++ $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
++
++slowcheck:
++ $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
++
+ debugrun:
+ $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+
+diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
+index 74d0f32..daa4ae0 100755
+--- a/solenv/bin/build.pl
++++ b/solenv/bin/build.pl
+@@ -1901,7 +1901,7 @@ sub run_job {
+ return 1 if (! $path =~ /prj$/ );
+ mkpath("$workdir/Logs");
+ my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+- my $gbuild_target = 'all slowcheck';
++ my $gbuild_target = 'all';
+ if ($registered_name =~ /tail_build\/prj$/ )
+ {
+ $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
+diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
+index e5f87f0..9c2608c 100644
+--- a/solenv/gbuild/Module.mk
++++ b/solenv/gbuild/Module.mk
+@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
+ debugrun :| build
+ endif
+
+-all : build unitcheck
++all : build
+ $(info $(gb_Module_BUILDHINT))
+
+ build :
+--
+1.7.9.5
+
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
+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 @@
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
++import os
+ import sys
+
++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"
+ import pyuno
+
+ try:
+diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
+index 610ac5f..df243d0 100755
+--- a/scripting/source/pyprov/officehelper.py
++++ b/scripting/source/pyprov/officehelper.py
+@@ -53,7 +53,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"
@@ -0,0 +1,48 @@
+diff --git a/Makefile.top b/Makefile.top
+index 9e67a71..64a7b6c 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -244,7 +244,7 @@ stlport\
+ sysui\
+ xpdf\
+
+-export gb_TAILBUILDTARGET=all slowcheck
++export gb_TAILBUILDTARGET=all
+
+ define gbuild_module_rules
+ .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver
+@@ -546,7 +546,7 @@ findunusedcode:
+ | grep -v ^WSObject \
+ > unusedcode.easy
+
+-check: dev-install subsequentcheck
++check: unitcheck slowcheck dev-install subsequentcheck
+
+ subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
+ $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
+index c8e62ee..11a9069 100755
+--- a/solenv/bin/build.pl
++++ b/solenv/bin/build.pl
+@@ -1902,7 +1902,7 @@ sub run_job {
+ return 1 if (! $path =~ /prj$/ );
+ mkpath("$workdir/Logs");
+ my $gbuild_flags = '-j' . $ENV{PARALLELISM};
+- my $gbuild_target = 'all slowcheck';
++ my $gbuild_target = 'all';
+ if ($registered_name =~ /tail_build\/prj$/ )
+ {
+ $gbuild_target = $ENV{gb_TAILBUILDTARGET};
+diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
+index 97f1a81..c7ae7f4 100644
+--- a/solenv/gbuild/Module.mk
++++ b/solenv/gbuild/Module.mk
+@@ -139,7 +139,7 @@ gb_Module_DEVINSTALLHINT=
+ debugrun :| build
+ endif
+
+-all : build unitcheck
++all : build
+ $(info $(gb_Module_BUILDHINT))
+
+ build :
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index a259bf6..672fa23 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -129,6 +129,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 4ff2606..6a05eed 100644
+--- a/pyuno/source/module/uno.py
++++ b/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('%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"
+ import pyuno
+
+ try:
+diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
+index 99d3b03..704edab 100755
+--- a/scripting/source/pyprov/officehelper.py
++++ b/scripting/source/pyprov/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 = "%eprefix%/usr/%libdir%/libreoffice/program"
+ sOffice = os.path.join(sOffice, "soffice")
+ if platform.startswith("win"):
+ sOffice += ".exe"
Oops, something went wrong.

0 comments on commit ddf7e40

Please sign in to comment.