[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#819797: marked as done (jessie-pu: package libreoffice/1:4.3.3-2+deb8u2)

Your message dated Sat, 04 Jun 2016 14:57:25 +0100
with message-id <1465048645.7545.11.camel@adam-barratt.org.uk>
and subject line Closing bugs for fixes included in 8.5
has caused the Debian Bug report #819797,
regarding jessie-pu: package libreoffice/1:4.3.3-2+deb8u2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
819797: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819797
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

OpenJDK changed soe JDK paths on ppc64el which made the last security update
FTBFS... See #819375.
That should be fixed soon so that a) a eventual new security update
can build and b) the existing one has a chance of going into stable.

While at it I think we can also include the trivial fix for #780497.

Diff attached.

Regards,

Rene

-- System Information:
Debian Release: 8.3
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff --git a/changelog b/changelog
index 9770009..9a27363 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+libreoffice (1:4.3.3-2+deb8u4) jessie; urgency=medium
+
+  * debian/patches/ppc64el-jdk-paths.diff: fix ppc64el FTBFS due to changed
+    OpenJDK paths, thanks Slavek Banko (closes: #819375)
+
+  * debian/rules:
+    - fix logic to not install sound files (closes: #780497)
+
+ -- Rene Engelhard <rene@debian.org>  Mon, 28 Mar 2016 14:09:18 +0200
+
 libreoffice (1:4.3.3-2+deb8u3) jessie-security; urgency=high
 
   * debian/patches/V-1lp8t84lh4.diff: fix "LibreOffice Writer Lotus Word Pro
diff --git a/patches/ppc64el-jdk-paths.diff b/patches/ppc64el-jdk-paths.diff
new file mode 100644
index 0000000..4b08462
--- /dev/null
+++ b/patches/ppc64el-jdk-paths.diff
@@ -0,0 +1,148 @@
+commit 7a66dbe982623be620ad6ac426fe689a434e5f51
+Author: David Tardon <dtardon@redhat.com>
+Date:   Tue May 12 10:37:53 2015 +0200
+
+    java dir for powepc64 and powepc64le can differ
+    
+    E.g., RHEL >= 7.1 uses ppc64le for reasons listed in
+    https://bugs.openjdk.java.net/browse/JDK-8073139 .
+    
+    Change-Id: I982e65cdf99999e8a5ed23cf444ccb2aee764c4c
+
+diff --git a/configure.ac b/configure.ac
+index 26071dc..55157a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6997,9 +6997,12 @@ then
+         powerpc)
+             my_java_arch=ppc
+             ;;
+-        powerpc64*)
++        powerpc64)
+             my_java_arch=ppc64
+             ;;
++        powerpc64le)
++            AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64])
++            ;;
+         x86_64)
+             my_java_arch=amd64
+             ;;
+commit d8eee8e4d1a303044bf34b28c2e95bd6da23fd79
+Author: David Tardon <dtardon@redhat.com>
+Date:   Tue May 12 12:10:16 2015 +0200
+
+    java dir for powepc64 and powepc64le can differ
+    
+    E.g., RHEL >= 7.1 uses ppc64le for reasons listed in
+    https://bugs.openjdk.java.net/browse/JDK-8073139 .
+    
+    This is a follow-up to commit 7a66dbe982623be620ad6ac426fe689a434e5f51.
+    
+    Change-Id: I685f76d51e9775788a7fb225c6a5e2309a45ceb7
+
+diff --git a/config_host/config_java.h.in b/config_host/config_java.h.in
+new file mode 100644
+index 0000000..8b23de9
+--- /dev/null
++++ b/config_host/config_java.h.in
+@@ -0,0 +1,6 @@
++#ifndef CONFIG_JAVA_H
++#define CONFIG_JAVA_H
++
++#undef JAVA_ARCH
++
++#endif
+diff --git a/configure.ac b/configure.ac
+index 55157a9..5414754 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7002,6 +7002,7 @@ then
+             ;;
+         powerpc64le)
+             AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64])
++            JAVA_ARCH=$my_java_arch
+             ;;
+         x86_64)
+             my_java_arch=amd64
+@@ -7011,6 +7012,7 @@ then
+             ;;
+         esac
+         JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
++        AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
+     fi
+     AC_MSG_RESULT([$JAWTLIB])
+ fi
+@@ -12988,6 +12990,7 @@ AC_CONFIG_HEADERS([config_host/config_folders.h])
+ AC_CONFIG_HEADERS([config_host/config_gcc.h])
+ AC_CONFIG_HEADERS([config_host/config_global.h])
+ AC_CONFIG_HEADERS([config_host/config_graphite.h])
++AC_CONFIG_HEADERS([config_host/config_java.h])
+ AC_CONFIG_HEADERS([config_host/config_lgpl.h])
+ AC_CONFIG_HEADERS([config_host/config_locales.h])
+ AC_CONFIG_HEADERS([config_host/config_mpl.h])
+diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
+index 2ecd01f..a01db56 100644
+--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
++++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+@@ -20,6 +20,8 @@
+ #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
+ #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
+ 
++#include "config_java.h"
++
+ #include "rtl/ustring.hxx"
+ #include "rtl/ref.hxx"
+ #include "osl/endian.h"
+@@ -31,7 +33,9 @@ namespace jfw_plugin
+ 
+ 
+ //Used by subclasses of VendorBase to build paths to Java runtime
+-#if defined(__sparcv9)
++#if defined(JAVA_ARCH)
++#define JFW_PLUGIN_ARCH JAVA_ARCH
++#elif defined(__sparcv9)
+ #define JFW_PLUGIN_ARCH "sparcv9"
+ #elif defined SPARC
+ #define JFW_PLUGIN_ARCH "sparc"
+commit caacdc4b39460fcd9ba34652da7c25740f077160
+Author: Caolán McNamara <caolanm@redhat.com>
+Date:   Wed Jul 1 08:34:58 2015 +0100
+
+    f22 openjdk for ppc64le has both these dirs, but jawt is only on one
+    
+    Change-Id: Ie770ecceb8c8f5a6fa882a9f5d5a26806b029589
+
+diff --git a/configure.ac b/configure.ac
+index aecbe8f..8964c96 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7058,7 +7058,7 @@ then
+             my_java_arch=ppc64
+             ;;
+         powerpc64le)
+-            AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64])
++            AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le/libjawt.so"], [my_java_arch=ppc64le], [my_java_arch=ppc64])
+             JAVA_ARCH=$my_java_arch
+             ;;
+         x86_64)
+commit e1d8fb13b2f033d89dd4d1bf9a6fbf0c7a686b53
+Author: Caolán McNamara <caolanm@redhat.com>
+Date:   Wed Jul 1 10:52:34 2015 +0100
+
+    d->e
+    
+    Change-Id: I76ced60151bcc160eb4a4c12cc86f01edec076fc
+
+diff --git a/configure.ac b/configure.ac
+index 8964c96..70ab9c8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7058,7 +7058,7 @@ then
+             my_java_arch=ppc64
+             ;;
+         powerpc64le)
+-            AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le/libjawt.so"], [my_java_arch=ppc64le], [my_java_arch=ppc64])
++            AS_IF([test -e "$JAVA_HOME/jre/lib/ppc64le/libjawt.so"], [my_java_arch=ppc64le], [my_java_arch=ppc64])
+             JAVA_ARCH=$my_java_arch
+             ;;
+         x86_64)
diff --git a/patches/series b/patches/series
index 2a5c78b..d90b00c 100644
--- a/patches/series
+++ b/patches/series
@@ -45,3 +45,4 @@ V-1lp8t84lh4.diff
 V-a7vjdei7l7.diff
 V-mgylorku1q.diff
 V-pxk0pgyk9d.diff
+ppc64el-jdk-paths.diff
diff --git a/rules b/rules
index 1d60b7e..662f540 100755
--- a/rules
+++ b/rules
@@ -2953,7 +2953,7 @@ $(STAMP_DIR)/install-indep: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-common
 	dh_testdir
 	dh_testroot
 
-ifeq "$(shell echo $(USE_GSTREAMER)$(USE_VLC) | grep -q y && echo 0)" "0"
+ifneq "$(shell echo $(USE_GSTREAMER)$(USE_VLC) | grep -q y && echo 0)" "0"
 	# sound doesn't work anyway, remove the .wav files to save space
 	rm -rf $(PKGDIR)-common/$(OODIR)/share/gallery/sounds
 	rm -f $(PKGDIR)-common/$(OODIR)/share/gallery/sg9.*

--- End Message ---
--- Begin Message --- 
Version: 8.5

Hi,

The fixes referred to by each of these bugs were included in today's 8.5
point release.

Regards,

Adam

--- End Message ---
Reply to: