From 89a3e484153eb465b10c11258b777e5005feea0f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 27 Mar 2014 14:47:44 +0100 Subject: [PATCH] fix build with newer java --- ...dc-from-static-Package-to-dynamic-Ge.patch | 209 ++++++++++++++++++ 0001-Package-GeneratedPackage-fixup.patch | 26 +++ libreoffice.spec | 2 + 3 files changed, 237 insertions(+) create mode 100644 0001-Change-SDK-javaodc-from-static-Package-to-dynamic-Ge.patch create mode 100644 0001-Package-GeneratedPackage-fixup.patch diff --git a/0001-Change-SDK-javaodc-from-static-Package-to-dynamic-Ge.patch b/0001-Change-SDK-javaodc-from-static-Package-to-dynamic-Ge.patch new file mode 100644 index 0000000..2b34206 --- /dev/null +++ b/0001-Change-SDK-javaodc-from-static-Package-to-dynamic-Ge.patch @@ -0,0 +1,209 @@ +From a59e5ecd611ddd41cec6d9c78773f55887df67e6 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 25 Feb 2014 15:44:16 +0100 +Subject: [PATCH] Change SDK javaodc from static Package to dynamic + GeneratedPackage + +...as e.g. the list of resrouces/*.gif apparently varies per javadoc version. + +Change-Id: Idcf95229295c1c5cd16e565bcd168c1a0e7d4f0c +--- + odk/GeneratedPackage_odk_javadoc.mk | 16 ++++ + odk/Module_odk.mk | 2 +- + odk/Package_javadoc.mk | 146 ------------------------------------ + 3 files changed, 17 insertions(+), 147 deletions(-) + create mode 100644 odk/GeneratedPackage_odk_javadoc.mk + delete mode 100644 odk/Package_javadoc.mk + +diff --git a/odk/GeneratedPackage_odk_javadoc.mk b/odk/GeneratedPackage_odk_javadoc.mk +new file mode 100644 +index 0000000..569377b +--- /dev/null ++++ b/odk/GeneratedPackage_odk_javadoc.mk +@@ -0,0 +1,16 @@ ++# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- ++# ++# This file is part of the LibreOffice project. ++# ++# This Source Code Form is subject to the terms of the Mozilla Public ++# License, v. 2.0. If a copy of the MPL was not distributed with this ++# file, You can obtain one at http://mozilla.org/MPL/2.0/. ++# ++ ++$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_javadoc,$(call gb_CustomTarget_get_workdir,odk/docs/java/ref))) ++ ++$(eval $(call gb_GeneratedPackage_add_dir,odk_javadoc,$(INSTDIR)/$(SDKDIRNAME)/docs/java/ref,.)) ++ ++$(eval $(call gb_GeneratedPackage_use_customtarget,odk_javadoc,odk/docs/java/ref)) ++ ++# vim: set noet sw=4 ts=4: +diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk +index 9ddc400..32bdfc1 100644 +--- a/odk/Module_odk.mk ++++ b/odk/Module_odk.mk +@@ -44,9 +44,9 @@ $(eval $(call gb_Module_add_targets,odk,\ + $(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \ + CustomTarget_classes \ + CustomTarget_javadoc \ ++ GeneratedPackage_odk_javadoc \ + GeneratedPackage_uno_loader_classes \ + $(if $(filter WNT,$(OS)),Library_unowinreg) \ +- Package_javadoc \ + Package_unowinreg \ + )) + endif +diff --git a/odk/Package_javadoc.mk b/odk/Package_javadoc.mk +deleted file mode 100644 +index 5f0ea44..0000000 +--- a/odk/Package_javadoc.mk ++++ /dev/null +@@ -1,146 +0,0 @@ +-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +-# +-# This file is part of the LibreOffice project. +-# +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +-# +- +-$(eval $(call gb_Package_Package,odk_javadoc,$(call gb_CustomTarget_get_workdir,odk/docs/java/ref))) +- +-$(eval $(call gb_Package_set_outdir,odk_javadoc,$(INSTDIR))) +- +-$(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(SDKDIRNAME)/docs/java/ref,\ +- allclasses-frame.html \ +- allclasses-noframe.html \ +- com/sun/star/comp/helper/Bootstrap.html \ +- com/sun/star/comp/helper/BootstrapException.html \ +- com/sun/star/comp/helper/ComponentContext.html \ +- com/sun/star/comp/helper/ComponentContextEntry.html \ +- com/sun/star/comp/helper/SharedLibraryLoader.html \ +- com/sun/star/comp/helper/class-use/Bootstrap.html \ +- com/sun/star/comp/helper/class-use/BootstrapException.html \ +- com/sun/star/comp/helper/class-use/ComponentContext.html \ +- com/sun/star/comp/helper/class-use/ComponentContextEntry.html \ +- com/sun/star/comp/helper/class-use/SharedLibraryLoader.html \ +- com/sun/star/comp/helper/package-frame.html \ +- com/sun/star/comp/helper/package-summary.html \ +- com/sun/star/comp/helper/package-tree.html \ +- com/sun/star/comp/helper/package-use.html \ +- com/sun/star/lib/uno/helper/ComponentBase.html \ +- com/sun/star/lib/uno/helper/Factory.html \ +- com/sun/star/lib/uno/helper/InterfaceContainer.html \ +- com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.html \ +- com/sun/star/lib/uno/helper/PropertySet.html \ +- com/sun/star/lib/uno/helper/PropertySetMixin.BoundListeners.html \ +- com/sun/star/lib/uno/helper/PropertySetMixin.html \ +- com/sun/star/lib/uno/helper/UnoUrl.html \ +- com/sun/star/lib/uno/helper/WeakAdapter.html \ +- com/sun/star/lib/uno/helper/WeakBase.html \ +- com/sun/star/lib/uno/helper/class-use/ComponentBase.html \ +- com/sun/star/lib/uno/helper/class-use/Factory.html \ +- com/sun/star/lib/uno/helper/class-use/InterfaceContainer.html \ +- com/sun/star/lib/uno/helper/class-use/MultiTypeInterfaceContainer.html \ +- com/sun/star/lib/uno/helper/class-use/PropertySet.html \ +- com/sun/star/lib/uno/helper/class-use/PropertySetMixin.BoundListeners.html \ +- com/sun/star/lib/uno/helper/class-use/PropertySetMixin.html \ +- com/sun/star/lib/uno/helper/class-use/UnoUrl.html \ +- com/sun/star/lib/uno/helper/class-use/WeakAdapter.html \ +- com/sun/star/lib/uno/helper/class-use/WeakBase.html \ +- com/sun/star/lib/uno/helper/package-frame.html \ +- com/sun/star/lib/uno/helper/package-summary.html \ +- com/sun/star/lib/uno/helper/package-tree.html \ +- com/sun/star/lib/uno/helper/package-use.html \ +- com/sun/star/lib/unoloader/UnoClassLoader.html \ +- com/sun/star/lib/unoloader/UnoLoader.html \ +- com/sun/star/lib/unoloader/class-use/UnoClassLoader.html \ +- com/sun/star/lib/unoloader/class-use/UnoLoader.html \ +- com/sun/star/lib/unoloader/package-frame.html \ +- com/sun/star/lib/unoloader/package-summary.html \ +- com/sun/star/lib/unoloader/package-tree.html \ +- com/sun/star/lib/unoloader/package-use.html \ +- com/sun/star/lib/util/UrlToFileMapper.html \ +- com/sun/star/lib/util/class-use/UrlToFileMapper.html \ +- com/sun/star/lib/util/package-frame.html \ +- com/sun/star/lib/util/package-summary.html \ +- com/sun/star/lib/util/package-tree.html \ +- com/sun/star/lib/util/package-use.html \ +- com/sun/star/uno/Any.html \ +- com/sun/star/uno/AnyConverter.html \ +- com/sun/star/uno/Ascii.html \ +- com/sun/star/uno/AsciiString.html \ +- com/sun/star/uno/Enum.html \ +- com/sun/star/uno/IBridge.html \ +- com/sun/star/uno/IEnvironment.html \ +- com/sun/star/uno/IFieldDescription.html \ +- com/sun/star/uno/IMapping.html \ +- com/sun/star/uno/IMemberDescription.html \ +- com/sun/star/uno/IMethodDescription.html \ +- com/sun/star/uno/IQueryInterface.html \ +- com/sun/star/uno/ITypeDescription.html \ +- com/sun/star/uno/MappingException.html \ +- com/sun/star/uno/Type.html \ +- com/sun/star/uno/Union.html \ +- com/sun/star/uno/UnoRuntime.html \ +- com/sun/star/uno/WeakReference.html \ +- com/sun/star/uno/class-use/Any.html \ +- com/sun/star/uno/class-use/AnyConverter.html \ +- com/sun/star/uno/class-use/Ascii.html \ +- com/sun/star/uno/class-use/AsciiString.html \ +- com/sun/star/uno/class-use/Enum.html \ +- com/sun/star/uno/class-use/IBridge.html \ +- com/sun/star/uno/class-use/IEnvironment.html \ +- com/sun/star/uno/class-use/IFieldDescription.html \ +- com/sun/star/uno/class-use/IMapping.html \ +- com/sun/star/uno/class-use/IMemberDescription.html \ +- com/sun/star/uno/class-use/IMethodDescription.html \ +- com/sun/star/uno/class-use/IQueryInterface.html \ +- com/sun/star/uno/class-use/ITypeDescription.html \ +- com/sun/star/uno/class-use/MappingException.html \ +- com/sun/star/uno/class-use/Type.html \ +- com/sun/star/uno/class-use/Union.html \ +- com/sun/star/uno/class-use/UnoRuntime.html \ +- com/sun/star/uno/class-use/WeakReference.html \ +- com/sun/star/uno/package-frame.html \ +- com/sun/star/uno/package-summary.html \ +- com/sun/star/uno/package-tree.html \ +- com/sun/star/uno/package-use.html \ +- constant-values.html \ +- deprecated-list.html \ +- help-doc.html \ +- index-files/index-1.html \ +- index-files/index-10.html \ +- index-files/index-11.html \ +- index-files/index-12.html \ +- index-files/index-13.html \ +- index-files/index-14.html \ +- index-files/index-15.html \ +- index-files/index-16.html \ +- index-files/index-17.html \ +- index-files/index-18.html \ +- index-files/index-19.html \ +- index-files/index-2.html \ +- index-files/index-20.html \ +- index-files/index-21.html \ +- index-files/index-3.html \ +- index-files/index-4.html \ +- index-files/index-5.html \ +- index-files/index-6.html \ +- index-files/index-7.html \ +- index-files/index-8.html \ +- index-files/index-9.html \ +- index.html \ +- overview-frame.html \ +- overview-summary.html \ +- overview-tree.html \ +- package-list \ +- resources/background.gif \ +- resources/tab.gif \ +- resources/titlebar.gif \ +- resources/titlebar_end.gif \ +- serialized-form.html \ +- stylesheet.css \ +-)) +- +-# vim: set noet sw=4 ts=4: +-- +1.9.0 + diff --git a/0001-Package-GeneratedPackage-fixup.patch b/0001-Package-GeneratedPackage-fixup.patch new file mode 100644 index 0000000..db1ebba --- /dev/null +++ b/0001-Package-GeneratedPackage-fixup.patch @@ -0,0 +1,26 @@ +From c17e40a9b712142c268e0f57fe2e092350d2f2c0 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 25 Feb 2014 16:03:21 +0100 +Subject: [PATCH] Package -> GeneratedPackage fixup + +Change-Id: Ib6e7a456b2f39c47da44552184669005d18d4fa4 +--- + odk/CustomTarget_check.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk +index 88af63a..175d44d 100644 +--- a/odk/CustomTarget_check.mk ++++ b/odk/CustomTarget_check.mk +@@ -38,7 +38,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ + ) \ + $(call gb_Package_get_target,odk_docs) \ + $(call gb_Package_get_target,odk_html) \ +- $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_javadoc)) \ ++ $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ + $(call gb_Package_get_target,odk_lib) \ + $(call gb_Package_get_target,odk_settings) \ + $(call gb_Package_get_target,odk_settings_generated) \ +-- +1.9.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 7668954..7ab08be 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -284,6 +284,8 @@ Patch21: 0001-Wizards-should-look-for-templates-in-Template_intern.patch Patch22: 0001-actively-search-for-wizards-dir-in-all-internal-temp.patch Patch23: 0001-Related-rhbz-1076264-intermittent-a11y-crash-in-calc.patch Patch24: 0001-Resolves-rhbz-1077780-crash-on-loading-.docx.patch +Patch25: 0001-Change-SDK-javaodc-from-static-Package-to-dynamic-Ge.patch +Patch26: 0001-Package-GeneratedPackage-fixup.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice