------------------------------------------------------------
revno: 2375 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Thu 2011-02-10 23:03:25 +0100
message:
fix STLPORTLIB setting (aka make it empty) on kfreebsd-*,powerpc,sparc
added:
patches/odk-settings-fix-STLPORTLIB.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2011-02-10 08:16:16 +0000
+++ b/changelog 2011-02-10 22:03:25 +0000
@@ -6,6 +6,9 @@
libreoffice (1:3.3.0-3) UNRELEASED; urgency=low
+ * debian/patches/odk-settings-fix-STLPORTLIB.diff: fix STLPORTLIB setting
+ (aka make it empty) on kfreebsd-*,powerpc,sparc
+
* debian/rules:
- allow squeeze backports
- explicitely set export HOME=$(CURDIR)/debian/smoketest for the
@@ -22,7 +25,7 @@
* libreoffice-common.postinst.in: run sync_extensions() in postinst when
upgrading
from versions before 3.3.0-3 explicitly
- -- Rene Engelhard <r...@debian.org> Thu, 10 Feb 2011 09:14:22 +0100
+ -- Rene Engelhard <r...@debian.org> Thu, 10 Feb 2011 22:45:37 +0100
libreoffice (1:3.3.0-2) unstable; urgency=low
=== added file 'patches/odk-settings-fix-STLPORTLIB.diff'
--- a/patches/odk-settings-fix-STLPORTLIB.diff 1970-01-01 00:00:00 +0000
+++ b/patches/odk-settings-fix-STLPORTLIB.diff 2011-02-10 22:03:25 +0000
@@ -0,0 +1,59 @@
+--- /dev/null 2011-02-09 23:43:13.080975836 +0100
++++
libreoffice-3.3.0/libreoffice-build/patches/dev300/odk-settings-fix-STLPORTLIB.diff
2011-02-10 22:38:01.000000000 +0100
+@@ -0,0 +1,47 @@
++diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
++index 188ff88..3d67ee5 100644
++--- odk/settings/settings.mk
+++++ odk/settings/settings.mk
++@@ -262,14 +262,12 @@ ifeq "$(PROCTYPE)" "powerpc"
++ PACKAGE_LIB_DIR=linux_powerpc.plt
++ UNOPKG_PLATFORM=Linux_PowerPC
++ JAVA_PROC_TYPE=ppc
++-STLPORT=yes
++ endif
++
++ ifeq "$(PROCTYPE)" "sparc"
++ PACKAGE_LIB_DIR=linux_sparc.plt
++ UNOPKG_PLATFORM=Linux_SPARC
++ JAVA_PROC_TYPE=sparc
++-STLPORT=yes
++ endif
++
++ ifeq "$(PROCTYPE)" "x86_64"
++@@ -503,9 +501,11 @@ PLATFORM=kfreebsd
++ ifeq "$(PROCTYPE)" "x86_64"
++ PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
++ UNOPKG_PLATFORM=kFreeBSD_x86_64
+++STLPORT=no
++ else
++ PACKAGE_LIB_DIR=kfreebsd_x86.plt
++ UNOPKG_PLATFORM=kFreeBSD_x86
+++STLPORT=no
++ endif
++ else
++ PLATFORM=freebsd
++@@ -569,11 +569,15 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
++ SALHELPERLIB=-luno_salhelper$(COMID)
++ REGLIB=-lreg
++ STORELIB=-lstore
+++ifeq "$(STLPORT)" "yes"
++ ifeq "$(STLPORT_VER)" "500"
++ STLPORTLIB=-lstlport
++ else
++ STLPORTLIB=-lstlport_gcc$(STLDEBUG)
++ endif
+++else
+++STLPORTLIB=
+++endif
++
++ EMPTYSTRING=
++ PATH_SEPARATOR=:
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old
2011-02-10 22:48:27.000000000 +0100
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply 2011-02-10
22:48:35.000000000 +0100
+@@ -2386,3 +2386,6 @@
+
+ [ TemporaryHacks ]
+ hack-no-rm-fr-of-smoketest-userconfig.diff
++
++[ Fixes ]
++odk-settings-fix-STLPORTLIB.diff
=== modified file 'patches/series'
--- a/patches/series 2011-02-09 09:12:46 +0000
+++ b/patches/series 2011-02-10 22:03:25 +0000
@@ -5,3 +5,4 @@
do-not-switch-workspaces-of-wm.diff
bridges-mkstemp-error-better-message.diff
pyuno-demo-fix-PYTHONPATH.diff
+odk-settings-fix-STLPORTLIB.diff
