The following commit has been merged in the master branch:
commit 705eb737878df730a59e83ccd08bace099e17dbe
Author: Rene Engelhard <[email protected]>
Date: Tue Jun 28 16:12:15 2011 +0200
add patch adding missing jre/ for MIPS' set_soenv Java config
diff --git a/changelog b/changelog
index ac99d84..e6b8326 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ libreoffice (1:3.3.3-2) UNRELEASED; urgency=low
with the still broken gcj multiarch/ant combo. Disable rhino completely
as we can't patch the envvar usage out in a sane way
* debian/patches/disable-sdbc-postgresql.diff: also disable the build
+ * debian/patches/mips-openjdk-jre-paths.diff: add missing jre/ to
+ set_soenv for MIPS
* debian/rules:
- make multiarch changes conditional and skip them for squeeze
@@ -20,7 +22,7 @@ libreoffice (1:3.3.3-2) UNRELEASED; urgency=low
* debian/control.in, debian/ruleS: move libpq-dev builddep to a
conditional
- -- Rene Engelhard <[email protected]> Tue, 28 Jun 2011 09:49:36 +0000
+ -- Rene Engelhard <[email protected]> Tue, 28 Jun 2011 16:10:32 +0200
libreoffice (1:3.3.3-1) unstable; urgency=medium
diff --git a/patches/mips-openjdk-jre-paths.diff
b/patches/mips-openjdk-jre-paths.diff
new file mode 100644
index 0000000..1c31206
--- /dev/null
+++ b/patches/mips-openjdk-jre-paths.diff
@@ -0,0 +1,47 @@
+--- /dev/null 2011-06-27 20:29:01.643585831 +0200
++++
libreoffice-3.4.0/libreoffice-build/patches/dev300/mips-openjdk-jre-paths.diff
2011-06-28 16:06:31.000000000 +0200
+@@ -0,0 +1,17 @@
++--- set_soenv.in-old 2011-06-28 16:05:08.000000000 +0200
+++++ set_soenv.in 2011-06-28 16:06:07.000000000 +0200
++@@ -651,11 +651,11 @@
++
++ $JRELIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
++ if ( $JDK =~ m/sun/ && -d
"@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) {
++- $JRETOOLKITDIR =
'$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
+++ $JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
++ } else {
++- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."server";
+++ $JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
++ }
++- $JRETHREADDIR =
'$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
+++ $JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
++ }
++
++
+--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old
2011-06-28 16:06:54.000000000 +0200
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-28
16:07:30.000000000 +0200
+@@ -34,7 +34,7 @@
+ KDE4Experimental, MinGW, CalcExperimental, \
+ OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
+ WriterNavigation \
+- HPPA, AXP, PowerPC, Speed, GSoC2010, Toolbars, Win32Packaging
++ HPPA, AXP, PowerPC, MIPS, Speed, GSoC2010, Toolbars,
Win32Packaging
+ DebianLooseSections: DebianBaseNoHelpContent
+ # Optional sections
+ Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
+@@ -66,7 +66,7 @@
+ # Slackware
+ Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess
+ # Debian
+-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PowerPC
++DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split,
PowerPC, MIPS
+ Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, HPPA, AXP,
kFreeBSD
+ DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
+ # Ubuntu
+@@ -2393,3 +2393,6 @@
+ [ TemporaryHacks ]
+ disable-rhino.diff
+ bsh-hardcode-path.diff
++
++[ MIPS ]
++mips-openjdk-jre-paths.diff
diff --git a/patches/series b/patches/series
index 95994c4..50a0832 100644
--- a/patches/series
+++ b/patches/series
@@ -15,3 +15,4 @@ disable-optional-outplace-ole.diff
jurt-soffice-location.diff
disable-rhino.diff
bsh-hardcode-path.diff
+mips-openjdk-jre-paths.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
