diff --git a/libreoffice/4.3.3/jessie/debian.diff b/libreoffice/4.3.3/jessie/debian.diff index 2d4d026..e574b6e 100644 --- a/libreoffice/4.3.3/jessie/debian.diff +++ b/libreoffice/4.3.3/jessie/debian.diff @@ -1,12 +1,13 @@ diff -ruN a/debian/changelog b/debian/changelog --- a/debian/changelog 2015-08-28 15:18:09.000000000 +0000 +++ b/debian/changelog 2015-11-14 17:25:07.096000000 +0000 -@@ -1,3 +1,9 @@ -+libreoffice (1:4.3.3-2+tde1+deb8u3) jessie; urgency=high +@@ -1,3 +1,10 @@ ++libreoffice (1:4.3.3-2+tde1+deb8u3a) jessie; urgency=high + + * Enable TDE module ++ * Fix FTBFS on ppc64el + -+ -- Slávek Banko Wed, 24 Feb 2016 18:35:40 +0100 ++ -- Slávek Banko Sun, 28 Feb 2016 15:33:45 +0100 + libreoffice (1:4.3.3-2+deb8u3) jessie-security; urgency=high @@ -147,6 +148,182 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in + * konqueror / kmail + * libreoffice-tdeab-trinity: TDE Addressbook support + +diff -ruN a/debian/patches/bp000-ppc64el-7a66dbe9.diff b/debian/patches/bp000-ppc64el-7a66dbe9.diff +--- a/debian/patches/bp000-ppc64el-7a66dbe9.diff 1970-01-01 00:00:00.000000000 +0000 ++++ b/debian/patches/bp000-ppc64el-7a66dbe9.diff 2016-02-28 13:36:04.000000000 +0000 +@@ -0,0 +1,29 @@ ++commit 7a66dbe982623be620ad6ac426fe689a434e5f51 ++Author: David Tardon ++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 ++ ;; +diff -ruN a/debian/patches/bp001-ppc64el-d8eee8e4.diff b/debian/patches/bp001-ppc64el-d8eee8e4.diff +--- a/debian/patches/bp001-ppc64el-d8eee8e4.diff 1970-01-01 00:00:00.000000000 +0000 ++++ b/debian/patches/bp001-ppc64el-d8eee8e4.diff 2016-02-28 14:31:41.308000000 +0000 +@@ -0,0 +1,77 @@ ++commit d8eee8e4d1a303044bf34b28c2e95bd6da23fd79 ++Author: David Tardon ++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" +diff -ruN a/debian/patches/bp002-ppc64el-caacdc4b.diff b/debian/patches/bp002-ppc64el-caacdc4b.diff +--- a/debian/patches/bp002-ppc64el-caacdc4b.diff 1970-01-01 00:00:00.000000000 +0000 ++++ b/debian/patches/bp002-ppc64el-caacdc4b.diff 2016-02-28 13:37:53.000000000 +0000 +@@ -0,0 +1,21 @@ ++commit caacdc4b39460fcd9ba34652da7c25740f077160 ++Author: Caolán McNamara ++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) +diff -ruN a/debian/patches/bp003-ppc64el-e1d8fb13.diff b/debian/patches/bp003-ppc64el-e1d8fb13.diff +--- a/debian/patches/bp003-ppc64el-e1d8fb13.diff 1970-01-01 00:00:00.000000000 +0000 ++++ b/debian/patches/bp003-ppc64el-e1d8fb13.diff 2016-02-28 13:38:26.000000000 +0000 +@@ -0,0 +1,21 @@ ++commit e1d8fb13b2f033d89dd4d1bf9a6fbf0c7a686b53 ++Author: Caolán McNamara ++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 -ruN a/debian/patches/series b/debian/patches/series +--- a/debian/patches/series 2016-02-05 20:00:07.000000000 +0000 ++++ b/debian/patches/series 2016-02-28 14:23:16.780000000 +0000 +@@ -45,3 +45,8 @@ + V-a7vjdei7l7.diff + V-mgylorku1q.diff + V-pxk0pgyk9d.diff ++ ++bp000-ppc64el-7a66dbe9.diff ++bp001-ppc64el-d8eee8e4.diff ++bp002-ppc64el-caacdc4b.diff ++bp003-ppc64el-e1d8fb13.diff diff -ruN a/debian/rules b/debian/rules --- a/debian/rules 2015-04-25 16:33:35.000000000 +0000 +++ b/debian/rules 2015-11-14 17:25:07.096000000 +0000