From bf0fa5b5dfb3492c64e3db947f2e88d2aa07fdafe4f901aaf058aa220cad6641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 24 Jan 2019 13:30:52 +0000 Subject: [PATCH] - Add patch to build with java-11.2: * java112.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=747 --- java112.patch | 13 +++++++++++++ libreoffice.changes | 6 ++++++ libreoffice.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 java112.patch diff --git a/java112.patch b/java112.patch new file mode 100644 index 0000000..2defd64 --- /dev/null +++ b/java112.patch @@ -0,0 +1,13 @@ +Index: libreoffice-6.2.0.3/odk/CustomTarget_javadoc.mk +=================================================================== +--- libreoffice-6.2.0.3.orig/odk/CustomTarget_javadoc.mk ++++ libreoffice-6.2.0.3/odk/CustomTarget_javadoc.mk +@@ -32,7 +32,7 @@ $(call gb_CustomTarget_get_workdir,odk/d + $(call gb_Jar_get_target,ridl) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1) + $(call gb_Helper_abbreviate_dirs,\ +- $(JAVADOC) -J-Xmx120m -use -splitindex \ ++ $(JAVADOC) -source $(JAVA_SOURCE_VER) -J-Xmx120m -use -splitindex \ + -windowtitle "Java UNO Runtime Reference" \ + -header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\ + -tag attention:a:"Attention:" \ diff --git a/libreoffice.changes b/libreoffice.changes index 987dfec..ca2898a 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 24 13:19:29 UTC 2019 - Tomáš Chvátal + +- Add patch to build with java-11.2: + * java112.patch + ------------------------------------------------------------------- Thu Jan 24 08:10:57 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 891dcf2..9888907 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -99,6 +99,7 @@ Patch1: scp2-user-config-suse.diff # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff +Patch4: java112.patch Patch5: old-boost.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff @@ -960,6 +961,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif # Leap 42/SLE-12 %patch2 %patch3 +%patch4 -p1 %patch990 -p1 # Disable some of the failing tests (some are random)