pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 622316 from LibreOffice:Factory

Browse Source 
Fix jdk11 build

OBS-URL: https://build.opensuse.org/request/show/622316
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=159
This commit is contained in:
Dominique Leuenberger 2018-07-14 18:14:58 +00:00 committed by Git OBS Bridge
commit 335b7e05db
15 changed files with 121 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
0001-call-System.runFinalizersOnExit-by-reflection-since-.patch Normal file
View File

@ -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

3
libreoffice-6.1.0.0.beta2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7525816c914d3e6980e14f5a40e111f23f6d9b99d316cc84b10a5dc6efe64626
size 210255864

17
libreoffice-6.1.0.0.beta2.tar.xz.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJbIqwbAAoJEPQ0oe+v7q6jud8P/AgPhv82dhwmwb9IuJ6k2+Yg
3qy9K26aGAnN4P4AGF3HraQOREpoacowdr0CcwPkFqBRV/e2eyl2OLcevsvuZJ8T
s+2YHoHebfvgo71DR5Od6hL3ZCwAmnk6F1cVb+bk675zMru/DUmSx/KsszR+QfAf
KQNGEFnzjcRbJ1jRQ+FzfT106d1fqFA1jtqSsYLeANucCSJm+m0fDIlFExLGQvTz
QhP5u58cZruy3mue2957xE8MMfsvLgQ2XAPHMzHM40AVDXzX/OJ//1Pb3KV1nCyk
lJdyuof8BcOYxz7NFW7szRZ4GnYOSvcL6cOROHQqUTWxqgNANKDD5eS+6OS7rUaE
DwWX7wydrvaUgu5T6tksEhwttoRfp7vizROLxgdkJDBx8/i+R4qdqiOUWhKKVeQi
0cG58/CrJW2G4LB+Mzrs3BMhakgTLzU0iIfgr9Hwapes8AR+IeqUB2FVqFeO95ZW
5zLz0i3cTreCNmCIfHQjN5DuCCVdzHD/LxsV0Ia/zV4fmClNsPF9v2beqDbpUG/t
rPFjuF4Wn+dpsfZTbjj3ewVaEfjAs+mWjsEpbNwMbRixPg5OirgX28CqkXFwe4/d
3q06lXCfLAK5B7hVyR6d7JIeogBQg8Hd9dkj5nPwn8ikPzLqwki1vUiVrAabnFR+
Mdp8r1EQxTtHBQGwF4D7
=Z6o/
-----END PGP SIGNATURE-----

3
libreoffice-6.1.0.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2eb6078329bb81d9d8df7a8c109bffd0a49c7c848980ce77db423cc3efc79006
size 206012648

16
libreoffice-6.1.0.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbPUVQAAoJEPQ0oe+v7q6j5tQP/jgW5vxyU2PBnzCGn0S3CNFs
zrwoDGE6gyLi9u46LdljcP9R3I0aHfRsUvCbSKRbcr/CN83F2lGk9cztpc3qn9DW
n5T1ChkTzFw2h8Hx9R5jJjarykHR+KnOE+0v14QLPbtDXVLHZEyGmf7sVpac5x+p
Rqiiz718gsBsdLvZaIw2dU+4BBY5BUsQ09ast1ezTnqAhkSv7PhiOjKsIz/v/ZCB
Ox1I8sX1hadpnPsXxToLBnCZEqkSv8W+fa6x8xGjNvd2bJzIjF3cTaBF/uDZgY2R
yqBm6ApuDe4wba86bt/x5+UNRi4ij/lO46f3rekXIzddPvefaK6kRFhedIsP9Jru
PW+pLKS6nou6xxXB8cIz2v2tITPW5RybhiCnupdexMnxNv1zRc+ZXQEIwSKgAZ3v
Cy9Stdj0xYvewHCcsALJ6WECe7oqmsHnx9bAGFTT8vyFoe+/lus5RXTxdTobpFgW
BjmSjqhiHx4LBTXkUnQBakMJgOtj8+WvtbwSG5zRGLcHm1IPSBgb5JTvYbVE0JdR
LaToWuGFkGg4TpabMsH9NKEuJZxx+97A0zkFRBOvWm0kTW5wN4hQksU8CU/GHW1L
7AZzAP+bz4ng0kC/wmiyHjaNlxF7ozCEeOvWaLdN+QHobtgBT30OiStFPcdVy3lf
XnuHVGJTxptDGfpY2nAx
=cUlj
-----END PGP SIGNATURE-----

3
libreoffice-help-6.1.0.0.beta2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e4f403dd16dbc50908df5d10f237c4cbfd07dc6696014d8f3c6084dc688acd6
size 15725580

17
libreoffice-help-6.1.0.0.beta2.tar.xz.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJbIqwtAAoJEPQ0oe+v7q6jQVoP/jxW7Btr/WM7iLE/KPrNzB1s
l0dvmnh0nRoSbe8kr7+d28cJv4SWHRzl6zLjq9P4B68PIPAqmJt4RmjNLsyh8PdE
Lh0IzKWHMZmzVA5p6EKJ/NdZXVGaE69pPgJj/B1TBxPVDbenaFUhAW5DZB/m40TL
QzFrbGvtFTUf5kXZ+BkGx7PupCMCJ+BIJladjUVqgueQOodnC3SuRVwFuRb/sWDo
w2dsDrSCbLpxeekWY1dUl+r6iYWsruAzKhTmvkG9AfnFtN03e10kaF2RZcJadTlN
FrZmjYeT7CPF9ul//xZN3OGfPH/A1Wl0ndUAtdNJ+mCS8dcNuIdgi3Y95Ivo3Ckn
GE6dSrI8xdPqhkyQYPPQ0hqYGuYBBjpykBzFwkcvBEFtR2J9+Jmo18QTMtyf33QY
b/xRTsdJrGilD9OV8aDasBgBh747yR7qsE8zqLZ3dQa0MkrBmjyaaFJq1kZgWaj3
6NrizbOMIS6HbVx65pdrohjQLT/bEIq09JJToLbI2VvX8aOQAbHwY7G8epfe17SJ
zy7D96cF5dikhjhCl1K7Cwa7BCjmK01p87DbpSrBW/P4Y57Hd96j7BSDZrEjw8oF
rJcxAiC/W7hLzxZD0En3fj8Fa9SfDbbMm/npXW7m2Rndms3TpuOlDE17EWRdIwcB
tKtDJK7G6BttfTng8rbp
=5L9n
-----END PGP SIGNATURE-----

3
libreoffice-help-6.1.0.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:17d68cc9a8ebc1ab4ca3b3e2309770c33c6c611bb9842664f43c202d202e1ed2
size 15741644

16
libreoffice-help-6.1.0.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbPUVsAAoJEPQ0oe+v7q6juksQANOxapFkG1sfPr4umxK0B+jh
BTYuaHIfRdAdn01EVmZvo0MLPaQGPBLrbKx3WZrFJNYZfHuPaAI0yPSua4sBbG6k
e1YfJEH6CCFC42k7O+KiqH7/VQnezvavl8mf/y1DBTnwZgzraS4fN/Yb8dZT3WTU
JGzrnNH43/YzSPiL9BbrxZXZs5kYXqAdw/ShJfyStDh0KskJuH8vvMclivPnH89o
P8a4X4DdPvJ4o9/kxjbhd5Pfdn+J9ItIcymWotPAiNMB7ChGBMa6DnU0K+CUvkqZ
b7Mkxr2iBL8yhx7pi8BMIKflA5Mo2S+Z7+PPsEJjnT9U412uycZEFP/wHG/RHjC7
Qidvo01o4RRpW+C1cZpYjFI+KFHkQJf493qw2pRpvONedYyZCp7qt9auJU9QEbsN
IQ4ojlFiF4aOs1R4BndXS1NtQKuR3CsG8fkI1UmoHxXMQiXN5+h8lph4D0StpygU
csOA7XOUyl4U7lr3hMpiAQtcchIbKszWMlXDl9ywcke1pIJaZ4xaM82FyCvv6z4J
FkOKyY0EbqZPPktEoDhu2PNOi9eYRwkMBPHevN3n76XWFVcBY7jRRqkT8RnJJ8pg
z4iXKfrA8Dv+j2DyDBenRx5cg7P0f6PZd3csFVZF4kFz7j9rlTtJYfBQ3++W/F3W
Dpbw8mIm8M4Vt5IAsJVp
=WphS
-----END PGP SIGNATURE-----

3
libreoffice-translations-6.1.0.0.beta2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8393a272a83f1a417aa1e378135f68b60358b9501c4fbd716dc0daf72ffc768
size 140271268

17
libreoffice-translations-6.1.0.0.beta2.tar.xz.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJbIqwtAAoJEPQ0oe+v7q6j75wP/RwxxF5YlzmyEQtpCnnGrgPv
iQ29aewAnxtFTgnn+nlqEKgc0K0Br9TyTtP35Ss0qmBmyeF2Z0d3YRVDSQdV2S8G
X7L48nZxRS0IHABEMeK5ziSdq3XkYEwp3YEbXKH8RamMTsMQo9CsetWQnSpQQ9uO
+JQBGmzDZzCuf/NlDpjUDNaBuQinUTX141U+Ev4UdtLQJSuQL5RffzjJpJLY8V0T
TmDqwy1pMfP0ih4NmTPOwzYsWJJ65xMFrbEVKTNZwmgpKVENebs4Ah9H8/bRcNvC
LL2HK90I9+Ihepra1LXJOPUXppMlvAwKOBG5NvwMz0fq1Hf67rw6vM28DjIlx+qK
PHdfvU5iny1fKOt+s6fziVY7aIvnvmxftFRvtgp2J7umT9ZIVlcQ+KgkO1LXMtCM
UG6+RUG9lN+sV5d3tsP/AB5cI81bD+nChHknQVwMjxyEXfZzZPFYCu8NhJqXYiur
GM0WpsohlMfiuHp4jHaOWrJxBvDPmR9uUqAOCWf4Yad0/z3dRcWkt8IsUEccLMpR
zKPBeiIoZwkew8wg9KHp5uqFrHCKHzzBVrrUdZA4xn36l+rDqIBqV2V+IxvWg/ql
Xde5z63jFUS80H+lHt2VdvmYgHxq1458F+YgQ+Z1jcospVML7/TBEScdNL7BHyAL
p85Y4gLwkmwYoOttJZaS
=aoFD
-----END PGP SIGNATURE-----

3
libreoffice-translations-6.1.0.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:467c0bad565986d41600732d233d1d3313c91b5fe272540393da8cde42d64944
size 140682140

16
libreoffice-translations-6.1.0.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbPUVvAAoJEPQ0oe+v7q6j6XwP/i7SNBTkqNSG7dNZ73ZGBfzq
66Gm/ELkWrVTgde4dRDJxFd2qUTw9dgDyh+9flTmJsesGZ1nXbkgfSdjl7MKDcVy
QkTkrZ1r/a7qcwkS0Q+fu3y1LlYWQdRfdRImYzNFCBCG4BUNYTi+I82htpMRKGTA
akXRbgjDVp5BncYaead7WocrWlusew+tSO5OPiDBsoTIzOz3+pJAn+dCuoMV0fYl
l2rVySormzNVkNPvhND9eLfov7uVDODOLDec6ayRssZAluimbTqW8ANa7jTfsxEN
2sJFNAoOWY8QSgsUPZR3D+ir5Q7pvKh8KlXtN+DFlN22Vh3XGYKXRC/Mlky2bz25
Ru0Ap9/PEX5lOb08IWfUt1/JeNX7ccS5ClNiw/RRvm0ozb5XPPGU5A5GZbaUf6XC
y9sXe1H7eioavyE0DG6u7E5UxF1oUSZFG9BuP8kplUQJoWmQlkJPv84C/DIku4we
b0ljt0cZ3J6zMwKDxWJSRJkVDuOxKyfBNj75MO4s76rERge1mWwpxHoDK0X09AGY
nikeozKwpLMHpDjaRy/RkMPBO9HLZQIq86lbD2oyLRf8HPhTITVLB/wFSFqzcgMc
drbaN02b3LmA6Z6OGI3gLAtdAxhLllZzq8WTSXdsHN0CiAcj6LMbV8iivpGDdU0W
0AgRqscoOYJl0iHuwXnY
=VFda
-----END PGP SIGNATURE-----

13
libreoffice.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- Version update to 6.1.0.1 release
-------------------------------------------------------------------
Mon Jul 2 11:19:26 UTC 2018 - tchvatal@suse.com

4
libreoffice.spec
View File

@ -52,7 +52,7 @@
%bcond_with gtk3
%endif
Name: libreoffice
Version: 6.1.0.0.beta2
Version: 6.1.0.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -103,6 +103,7 @@ Patch3: mediawiki-no-broken-help.diff
# math does not work
Patch4: libreoffice-java-sched.patch
Patch5: old-boost.patch
Patch6: 0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -948,6 +949,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%patch2
%patch3
%patch4 -p1
%patch6 -p1
%patch990 -p1
# Disable some of the failing tests (some are random)