- 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
This commit is contained in:
Tomáš Chvátal 2019-01-24 13:30:52 +00:00 committed by Git OBS Bridge
parent d01904afd2
commit bf0fa5b5df
3 changed files with 21 additions and 0 deletions

13
java112.patch Normal file
View File

@ -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:" \

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 24 13:19:29 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to build with java-11.2:
* java112.patch
-------------------------------------------------------------------
Thu Jan 24 08:10:57 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

View File

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