[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.4-1-1-g8c7b515
The following commit has been merged in the master branch:
commit 8c7b515d82bc2bed004f894c60e3aeb9bcb79795
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 19 17:29:04 2011 +0200
fix JFW_PLUGIN_ARCH (s/mips32/mipsel/) in jvmfwk for mipsel, thanks Aurelien Jarno
diff --git a/changelog b/changelog
index 78fa7fa..7bb64fb 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.3.4-2) UNRELEASED; urgency=low
+
+ * debian/patches/mipsel-jfw-plugin-arch.diff: fix JFW_PLUGIN_ARCH
+ (s/mips32/mipsel/) in jvmfwk for mipsel, thanks Aurelien Jarno
+
+ -- Rene Engelhard <rene@debian.org> Fri, 19 Aug 2011 17:19:56 +0200
+
libreoffice (1:3.3.4-1) unstable; urgency=low
* New upstream release
diff --git a/patches/mipsel-jfw-plugin-arch.diff b/patches/mipsel-jfw-plugin-arch.diff
new file mode 100644
index 0000000..3d3f764
--- /dev/null
+++ b/patches/mipsel-jfw-plugin-arch.diff
@@ -0,0 +1,21 @@
+--- /dev/null 2011-06-27 20:29:01.643585831 +0200
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/mipsel-jfw-plugin-arch.diff 2011-06-28 16:06:31.000000000 +0200
+@@ -0,0 +1,11 @@
++--- jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx-old 2011-08-19 17:16:05.000000000 +0200
+++++ jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx 2011-08-19 17:14:42.000000000 +0200
++@@ -56,7 +56,7 @@
++ #ifdef OSL_BIGENDIAN
++ # define JFW_PLUGIN_ARCH "mips"
++ #else
++-# define JFW_PLUGIN_ARCH "mips32"
+++# define JFW_PLUGIN_ARCH "mipsel"
++ #endif
++ #elif defined S390X
++ #define JFW_PLUGIN_ARCH "s390x"
+--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-08-19 17:25:31.000000000 +0200
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-08-19 17:25:52.000000000 +0200
+@@ -2396,3 +2396,4 @@
+
+ [ MIPS ]
+ mips-openjdk-jre-paths.diff
++mipsel-jfw-plugin-arch.diff
diff --git a/patches/series b/patches/series
index 1454acd..10a4fab 100644
--- a/patches/series
+++ b/patches/series
@@ -18,3 +18,4 @@ mips-openjdk-jre-paths.diff
libebook-1.2.so.11.diff
fix-bridges-cpp-uno-depends.diff
fdo35784.diff
+mipsel-jfw-plugin-arch.diff
--
LibreOffice packaging repository
Reply to: