[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-2-5-g62a5875
The following commit has been merged in the master branch:
commit 62a5875defb32952ceabf1c76ce717ed498a8953
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 22 20:32:29 2011 +0200
allow "Oracle Corporation" JDK >= 1.7.0 (closes: #642425)
diff --git a/changelog b/changelog
index 0a00728..2285078 100644
--- a/changelog
+++ b/changelog
@@ -1,12 +1,15 @@
libreoffice (1:3.4.3-3) UNRELEASED; urgency=low
+ * debian/patches/jdk-1.7.0-vendorname.diff: backport from master; allow
+ "Oracle Corporation" JDK >= 1.7.0 (closes: #642425)
+
* debian/rules:
- temporarily build with internal "jfreereport" libs until we figure
out how we best package the new, patched(?) versions (closes: #641594)
- build with -g on {,kfreebsd}{i386,amd64} (similar to linux-2.6's -dbgs)
as policy says. Compress with xz
- -- Rene Engelhard <rene@debian.org> Mon, 19 Sep 2011 19:42:34 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 22 Sep 2011 20:31:46 +0200
libreoffice (1:3.4.3-2) unstable; urgency=medium
diff --git a/patches/jdk-1.7.0-vendorname.diff b/patches/jdk-1.7.0-vendorname.diff
new file mode 100644
index 0000000..be08ae5
--- /dev/null
+++ b/patches/jdk-1.7.0-vendorname.diff
@@ -0,0 +1,65 @@
+--- /dev/null 2011-09-14 22:08:43.143634037 +0200
++++ libreoffice-3.4.3/libreoffice-build/patches/hotfixes/jdk-1.7.0-vendorname.diff 2011-09-22 18:31:03.000000000 +0200
+@@ -0,0 +1,62 @@
++From 549e54fb2f8113502743c443d6deadfe648dede1 Mon Sep 17 00:00:00 2001
++From: Hanno Meyer-Thurow <h.mth@web.de>
++Date: Tue, 13 Sep 2011 12:23:28 +0000
++Subject: add Oracle Java 1.7.0 recognition
++
++---
++diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
++index ed329e5..489511f 100644
++--- jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++++ jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
++@@ -9,6 +9,9 @@
++ <vendor name="Sun Microsystems Inc.">
++ <minVersion>1.5.0</minVersion>
++ </vendor>
+++ <vendor name="Oracle Corporation">
+++ <minVersion>1.7.0</minVersion>
+++ </vendor>
++ <vendor name="IBM Corporation">
++ <minVersion>1.5.0</minVersion>
++ </vendor>
++@@ -25,6 +28,7 @@
++
++ <plugins>
++ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+++ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
++ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
++ <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
++ <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
++diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
++index 8567d79..91ad4c6 100644
++--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
++@@ -112,6 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
++
++ //Only do something if the sunjavaplugin created this JavaInfo
++ rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
+++ rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation"));
++ rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
++ rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
++ rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc."));
++@@ -121,6 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
++ rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
++ if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
++ || sVendor2.equals(pInfo->sVendor) == sal_True
+++ || sVendor9.equals(pInfo->sVendor) == sal_True
++ || sVendor3.equals(pInfo->sVendor) == sal_True
++ || sVendor4.equals(pInfo->sVendor) == sal_True
++ || sVendor5.equals(pInfo->sVendor) == sal_True
++diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
++index f24b6ff..5e87002 100644
++--- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
++@@ -52,6 +52,7 @@ namespace jfw_plugin
++ */
++ BEGIN_VENDOR_MAP()
++ VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
+++ VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
++ VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
++ VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
++ VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo)
++--
++cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 3cfe7b1..5469206 100644
--- a/patches/series
+++ b/patches/series
@@ -23,3 +23,4 @@ no-deprecated-options-in-qstart-wrappers.diff
fix-sample-icc-1.3.2-patch.diff
update-sdbc-postgresql.diff
handle-NULL-display-gracefully.diff
+jdk-1.7.0-vendorname.diff
--
LibreOffice packaging repository
Reply to: