Fix build with jdk11
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=694
This commit is contained in:
parent
dea2b746f1
commit
1fc7795715
@ -0,0 +1,48 @@
|
|||||||
|
From 1d3f2ed0606cc971513dab5932ec7d1dd2a15f90 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||||
|
Date: Thu, 12 Jul 2018 11:57:07 +0200
|
||||||
|
Subject: [PATCH] call System.runFinalizersOnExit by reflection, since it was
|
||||||
|
removed in jdk11
|
||||||
|
|
||||||
|
Change-Id: I542c87bc1de21727a035cc6ac3b3e20c0ccfb5f7
|
||||||
|
---
|
||||||
|
external/hsqldb/UnpackedTarball_hsqldb.mk | 1 +
|
||||||
|
.../patches/hsqldb-runFinalizersOnExit.patch | 14 ++++++++++++++
|
||||||
|
2 files changed, 15 insertions(+)
|
||||||
|
create mode 100644 external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
|
||||||
|
|
||||||
|
diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk
|
||||||
|
index fc6c18f77c23..cbba770f19a0 100644
|
||||||
|
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
|
||||||
|
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
|
||||||
|
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
|
||||||
|
external/hsqldb/patches/i104901.patch \
|
||||||
|
external/hsqldb/patches/fdo36824.patch \
|
||||||
|
external/hsqldb/patches/limit_as_table_alias.patch \
|
||||||
|
+ external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \
|
||||||
|
$(if $(HSQLDB_USE_JDBC_4_1),\
|
||||||
|
external/hsqldb/patches/jdbc-4.1.patch \
|
||||||
|
external/hsqldb/patches/multipleResultSets.patch \
|
||||||
|
diff --git a/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000000..214dc2c2b2e1
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
|
||||||
|
@@ -0,0 +1,14 @@
|
||||||
|
+--- misc/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java 2008-03-16 23:51:35.000000000 +0100
|
||||||
|
++++ misc/build/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java 2018-07-12 11:46:57.997837180 +0200
|
||||||
|
+@@ -160,8 +160,9 @@
|
||||||
|
+ public static void runFinalizers() {
|
||||||
|
+
|
||||||
|
+ //#ifdef JAVA2FULL
|
||||||
|
+- System.runFinalizersOnExit(true);
|
||||||
|
+-
|
||||||
|
++ try {
|
||||||
|
++ System.class.getMethod("runFinalizersOnExit", boolean.class).invoke(null, true);
|
||||||
|
++ } catch (Exception e) {}
|
||||||
|
+ //#endif
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
--
|
||||||
|
2.18.0
|
||||||
|
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jul 12 14:08:29 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* 0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
|
||||||
|
+ Call the System.runFinalizersOnExit method by reflection,
|
||||||
|
since it is removed in jdk11
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 9 08:07:42 UTC 2018 - tchvatal@suse.com
|
Mon Jul 9 08:07:42 UTC 2018 - tchvatal@suse.com
|
||||||
|
|
||||||
|
@ -103,6 +103,7 @@ Patch3: mediawiki-no-broken-help.diff
|
|||||||
# math does not work
|
# math does not work
|
||||||
Patch4: libreoffice-java-sched.patch
|
Patch4: libreoffice-java-sched.patch
|
||||||
Patch5: old-boost.patch
|
Patch5: old-boost.patch
|
||||||
|
Patch6: 0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
|
||||||
# try to save space by using hardlinks
|
# try to save space by using hardlinks
|
||||||
Patch990: install-with-hardlinks.diff
|
Patch990: install-with-hardlinks.diff
|
||||||
BuildRequires: %{name}-share-linker
|
BuildRequires: %{name}-share-linker
|
||||||
@ -948,6 +949,7 @@ Provides additional %{langname} translations and resources for %{project}. \
|
|||||||
%patch2
|
%patch2
|
||||||
%patch3
|
%patch3
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch6 -p1
|
||||||
%patch990 -p1
|
%patch990 -p1
|
||||||
|
|
||||||
# Disable some of the failing tests (some are random)
|
# Disable some of the failing tests (some are random)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user