[libreoffice] 01/01: merge Java fixes into one patch; also add test fix from master
Rene Engelhard
rene at moszumanska.debian.org
Sat Nov 11 10:52:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 50cf74ebb5368db7cba26ba6bc0a199141084740
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Sat Nov 11 11:52:01 2017 +0100
merge Java fixes into one patch; also add test fix from master
---
changelog | 12 ++++++
patches/java9-jawt.diff | 31 ---------------
patches/java9-rhino.diff | 29 --------------
patches/java9.diff | 101 +++++++++++++++++++++++++++++++++++++++++++++++
patches/series | 3 +-
rules | 2 +-
6 files changed, 115 insertions(+), 63 deletions(-)
diff --git a/changelog b/changelog
index 583be2a..460fc0a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+libreoffice (1:5.4.3-2) UNRELEASED; urgency=medium
+
+ * debian/patches/java9-*: remove ...
+ * debian/patches/java9.diff: ... and merge into one patch again.
+ * debian/patches/java9.diff: backport also missing tests fix from master.
+ Also add -Dfile.encoding=UTF8 directly to JavaClassSet.mk
+
+ * debian/rules:
+ - remove setting JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 again
+
+ -- Rene Engelhard <rene at debian.org> Fri, 10 Nov 2017 23:21:50 +0100
+
libreoffice (1:5.4.3-1) unstable; urgency=medium
* New upstream release
diff --git a/patches/java9-jawt.diff b/patches/java9-jawt.diff
deleted file mode 100644
index 855416b..0000000
--- a/patches/java9-jawt.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 93543ddccf4e..6ee677e222a1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7126,7 +6907,12 @@ then
- my_java_arch=$host_cpu
- ;;
- esac
-- JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
-+ # This is where JDK9 puts the library
-+ if test -e "$JAVA_HOME/lib/libjawt.so"; then
-+ JAWTLIB="-L$JAVA_HOME/lib/ -ljawt"
-+ else
-+ JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
-+ fi
- AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
- fi
- AC_MSG_RESULT([$JAWTLIB])
-diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
-index 2813959f5dec..684c39edae91 100644
---- a/odk/settings/settings.mk
-+++ b/odk/settings/settings.mk
-@@ -376,7 +376,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
-
- EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive
- LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
--LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-+LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -L"$(OO_SDK_JAVA_HOME)/lib"
-
- URE_MISC=$(OFFICE_PROGRAM_PATH)
-
diff --git a/patches/java9-rhino.diff b/patches/java9-rhino.diff
deleted file mode 100644
index 4b0d6c2..0000000
--- a/patches/java9-rhino.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From 57adce8b88073b813aacb668629968f29b7d706a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba at bluewin.ch>
-Date: Mon, 4 Sep 2017 20:59:02 +0200
-Subject: This hunk breaks jdk9 build
-
-Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
-
-diff --git a/external/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch
-index e44872e..40fc6cc 100644
---- a/external/rhino/rhino1_5R5.patch
-+++ b/external/rhino/rhino1_5R5.patch
-@@ -185,14 +185,6 @@
- </target>
-
- <target name="compile" depends="properties,get-swing-ex">
--@@ -68,6 +54,7 @@
-- includes="org/**/*.java"
-- deprecation="on"
-- debug="${debug}">
--+ <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
-- </javac>
-- <copy todir="${nest}/${classes}">
-- <fileset dir="." includes="org/**/*.properties" />
- --- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2004-03-25 21:54:34.000000000 +0100
- +++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2009-01-17 20:44:22.000000000 +0100
- @@ -470,15 +470,21 @@
---
-cgit v0.10.2
-
diff --git a/patches/java9.diff b/patches/java9.diff
new file mode 100644
index 0000000..209d062
--- /dev/null
+++ b/patches/java9.diff
@@ -0,0 +1,101 @@
+diff --git a/configure.ac b/configure.ac
+index 93543ddccf4e..6ee677e222a1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7126,7 +6907,12 @@ then
+ my_java_arch=$host_cpu
+ ;;
+ esac
+- JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
++ # This is where JDK9 puts the library
++ if test -e "$JAVA_HOME/lib/libjawt.so"; then
++ JAWTLIB="-L$JAVA_HOME/lib/ -ljawt"
++ else
++ JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
++ fi
+ AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
+ fi
+ AC_MSG_RESULT([$JAWTLIB])
+diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
+index 2813959f5dec..684c39edae91 100644
+--- a/odk/settings/settings.mk
++++ b/odk/settings/settings.mk
+@@ -376,7 +376,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
+
+ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive
+ LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
+-LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
++LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -L"$(OO_SDK_JAVA_HOME)/lib"
+
+ URE_MISC=$(OFFICE_PROGRAM_PATH)
+
+From 57adce8b88073b813aacb668629968f29b7d706a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba at bluewin.ch>
+Date: Mon, 4 Sep 2017 20:59:02 +0200
+Subject: This hunk breaks jdk9 build
+
+Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
+
+diff --git a/external/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch
+index e44872e..40fc6cc 100644
+--- a/external/rhino/rhino1_5R5.patch
++++ b/external/rhino/rhino1_5R5.patch
+@@ -185,14 +185,6 @@
+ </target>
+
+ <target name="compile" depends="properties,get-swing-ex">
+-@@ -68,6 +54,7 @@
+- includes="org/**/*.java"
+- deprecation="on"
+- debug="${debug}">
+-+ <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
+- </javac>
+- <copy todir="${nest}/${classes}">
+- <fileset dir="." includes="org/**/*.properties" />
+ --- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2004-03-25 21:54:34.000000000 +0100
+ +++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2009-01-17 20:44:22.000000000 +0100
+ @@ -470,15 +470,21 @@
+--
+cgit v0.10.2
+
+From fafeedc865821b1b0dc25b66afd54757d6440b16 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Thu, 21 Sep 2017 13:49:26 +0200
+Subject: Fix creation of array clone
+
+The original code caused ClassCastException when the return value of toArray()
+was actually of type Object[] instead of Statement[].
+
+Change-Id: I6cd451404b7bd22a9a0c3490b6982cc38e79d1b2
+
+diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
+index 4c23235..9a0e7b8 100644
+--- a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
++++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
+@@ -1006,8 +1006,7 @@ public class DocumentMetadataAccess
+ i_Expected.length);
+ return false;
+ }
+- Statement[] expected = (Statement[])
+- java.util.Arrays.asList(i_Expected).toArray();
++ Statement[] expected = i_Expected.clone();
+ java.util.Arrays.sort(i_Result, new StmtComp());
+ java.util.Arrays.sort(expected, new StmtComp());
+ for (int i = 0; i < expected.length; ++i)
+--
+cgit v0.10.2
+
+diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
+index 58a16d95cf71..e7de44d6ccca 100644
+--- a/solenv/gbuild/JavaClassSet.mk
++++ b/solenv/gbuild/JavaClassSet.mk
+@@ -17,7 +17,8 @@
+ # the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
+
+-gb_JavaClassSet_JAVACCOMMAND := $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVAFLAGS) \
++gb_JavaClassSet_JAVACCOMMAND := JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 \
++ $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVAFLAGS) \
+ -source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) \
+ $(if $(JAVA_CLASSPATH_NOT_SET),-Xlint:-options)
+ gb_JavaClassSet_JAVACDEBUG :=
diff --git a/patches/series b/patches/series
index 98e622e..94f9acd 100644
--- a/patches/series
+++ b/patches/series
@@ -35,5 +35,4 @@ gb_SUPPRESS_TESTS.diff
stop-shipping-mimelnk-desktop-files.diff
icu-no-icu-config.diff
ww8export-HAVE_MORE_FONTS.diff
-java9-jawt.diff
-java9-rhino.diff
+java9.diff
diff --git a/rules b/rules
index 6e1adbb..246f426 100755
--- a/rules
+++ b/rules
@@ -2017,7 +2017,7 @@ endif
COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_INDEP)
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 $(MAKE) build-nocheck
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
ifeq "$(BUILD_TEST_PACKAGE)" "y"
ifeq "$(ENABLE_JUNIT4)" "y"
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) Jar_{OOoRunner,test,ConnectivityTools}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list