Bug#926339: unblock: libreoffice/1:6.1.5-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libreoffice
unblock libreoffice/1:6.1.5-2
The main reason for this update is basically the fix for #926281 so that
openjdk-8 can properly be removed.
To get it build on sid with the changed java.vendor variable (I still
think this change should be reverted...) to "Debian" instead of "Oracle
Corporation", I need to fix that too (see #926318), While debugging that
issue I saw a (admittedly minor) doc problem which I just fixed.
Last but not least there's the new recommendation for gstreamer1.0-gtk3
for better experience in Impress with LibreOffice using gtk3 (as in
GNOME)
Diff:
diff -Nru libreoffice-6.1.5/debian/changelog libreoffice-6.1.5/debian/changelog
--- libreoffice-6.1.5/debian/changelog 2019-02-02 22:49:54.000000000 +0100
+++ libreoffice-6.1.5/debian/changelog 2019-04-03 13:19:34.000000000 +0200
@@ -1,3 +1,20 @@
+libreoffice (1:6.1.5-2) unstable; urgency=medium
+
+ * debian/patches/mention-java-common-package.diff: update message to
+ reflect current config dir...
+ * debian/patches/java.vendor-Debian.diff: make jvmfwk recognize "Debian"
+ as java.vendor as that's what is set in openjdk 11 >= 11.0.3+4-2
+ - see #926009 (closes: #926318)
+
+ * debian/control.gtk3.in:
+ - make libreoffice-gtk3 recommend gstreamer1.0-gtk3 (see LP: #1820062)
+ * debian/rules:
+ - remove i386 special-casing for openjdk-8 and -9 from old "stack clash
+ fix broken on i386" days preventing removal openjdk-8
+ (closes: #926281)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 03 Apr 2019 13:19:34 +0200
+
libreoffice (1:6.1.5-1) unstable; urgency=medium
* New upstream release
@@ -66,6 +83,8 @@
libreoffice (1:6.1.4-1) unstable; urgency=medium
* New upstream release
+ - show partial signatures even if cert validation fails
+ (CERT-Bund#2018100828000257)
* debian/patches/disableClassPathURLCheck.diff: add new upstream
configure check for this (from master)
diff -Nru libreoffice-6.1.5/debian/control libreoffice-6.1.5/debian/control
--- libreoffice-6.1.5/debian/control 2019-02-02 22:49:54.000000000 +0100
+++ libreoffice-6.1.5/debian/control 2019-04-03 13:19:34.000000000 +0200
@@ -4246,6 +4246,7 @@
${misc:Depends},
${shlibs:Depends}
Suggests: libreofficekit-data
+Recommends: gstreamer1.0-gtk3
Section: gnome
Enhances: libreoffice
Description: office productivity suite -- GTK+ 3 integration
diff -Nru libreoffice-6.1.5/debian/control.gtk3.in libreoffice-6.1.5/debian/control.gtk3.in
--- libreoffice-6.1.5/debian/control.gtk3.in 2018-01-22 17:38:50.000000000 +0100
+++ libreoffice-6.1.5/debian/control.gtk3.in 2019-04-03 13:19:34.000000000 +0200
@@ -4,6 +4,7 @@
${misc:Depends},
${shlibs:Depends}
Suggests: libreofficekit-data
+Recommends: gstreamer1.0-gtk3
Section: gnome
Enhances: libreoffice
Description: office productivity suite -- GTK+ 3 integration
diff -Nru libreoffice-6.1.5/debian/patches/java.vendor-Debian.diff libreoffice-6.1.5/debian/patches/java.vendor-Debian.diff
--- libreoffice-6.1.5/debian/patches/java.vendor-Debian.diff 1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-6.1.5/debian/patches/java.vendor-Debian.diff 2019-04-03 13:19:34.000000000 +0200
@@ -0,0 +1,39 @@
+diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+index b008bb1fc0f7..ea0ddc4e7c91 100644
+--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
++++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+@@ -25,6 +25,9 @@
+ <vendor name="Oracle Corporation">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
++ <vendor name="Debian">
++ <minVersion>1.6.0</minVersion>
++ </vendor>
+ <vendor name="IBM Corporation">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+index 60911f8a63ca..eaa26f441ad7 100644
+--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
++++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+@@ -41,6 +41,7 @@
+ #endif
+ VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
+ VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
++ VENDOR_MAP_ENTRY("Debian", SunInfo)
+ VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
+ #ifndef MACOSX
+ VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
+diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+index 67ace100fb5f..46cdb32fd276 100644
+--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
++++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+@@ -250,7 +250,7 @@ public class LocalOfficeWindow
+ if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW )
+ {
+ String vendor = System.getProperty("java.vendor");
+- if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation"))
++ if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation") || vendor.equals("Debian"))
+ && Boolean.getBoolean("sun.awt.xembedserver"))
+ {
+ xembed = new NamedValue(
diff -Nru libreoffice-6.1.5/debian/patches/mention-java-common-package.diff libreoffice-6.1.5/debian/patches/mention-java-common-package.diff
--- libreoffice-6.1.5/debian/patches/mention-java-common-package.diff 2019-01-16 22:01:47.000000000 +0100
+++ libreoffice-6.1.5/debian/patches/mention-java-common-package.diff 2019-04-03 13:19:34.000000000 +0200
@@ -8,7 +8,7 @@
fprintf(stderr,"javaldx: Could not find a Java Runtime Environment!\n");
+ fprintf(stderr,"Please ensure that a JVM and the package libreoffice-java-common\n");
+ fprintf(stderr,"is installed.\n");
-+ fprintf(stderr,"If it is already installed then try removing ~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n");
++ fprintf(stderr,"If it is already installed then try removing ~/.config/libreoffice/4/user/config/javasettings_Linux_*.xml\n");
return false;
}
else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
diff -Nru libreoffice-6.1.5/debian/patches/series libreoffice-6.1.5/debian/patches/series
--- libreoffice-6.1.5/debian/patches/series 2019-02-02 12:19:47.000000000 +0100
+++ libreoffice-6.1.5/debian/patches/series 2019-04-03 13:19:34.000000000 +0200
@@ -48,3 +48,4 @@
m68k-fix-parameter-type.patch
apparmor-opencl.diff
tdf123077.diff
+java.vendor-Debian.diff
diff -Nru libreoffice-6.1.5/debian/rules libreoffice-6.1.5/debian/rules
--- libreoffice-6.1.5/debian/rules 2019-02-02 22:49:54.000000000 +0100
+++ libreoffice-6.1.5/debian/rules 2019-04-03 13:19:34.000000000 +0200
@@ -1017,10 +1017,6 @@
BUILD_DEPS_INDEP += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
endif
endif
- # force Java with #876069 (9) and #882436 (8) fixed on i386
- ifeq "$(DEB_HOST_ARCH)" "i386"
- JAVA_RUNTIME_DEPENDS := openjdk-8-jre (>= 8u151-b12-2~) | openjdk-9-jre (>= 9.0.1+11-1~)
- else
JAVA_RUNTIME_DEPENDS = default-jre
ifneq (,$(filter $(DEB_HOST_ARCH), $(OOO_OPENJDK_ARCHS)))
ifneq "$(DEB_HOST_ARCH)" "ia64"
@@ -1035,7 +1031,6 @@
JAVA_RUNTIME_DEPENDS += | java6-runtime
# Suns Java "packages"
JAVA_RUNTIME_DEPENDS += | jre
- endif
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , libreoffice-java-common
Regards,
Rene
Reply to: