2a2abf5bcf
IMPORTANT: You need to link libreoffice-icon-themes and libreoffice-l10n packages to this one. I have moved the corresponding spec files. As discussed with the autobuild team, it should make the life easier. I need to keep the version in sync and update the spec files at the same time. - updated to libreoffice-3.5.3.2 (3.5.3-rc2) OBS-URL: https://build.opensuse.org/request/show/116218 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=32
64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
Index: solenv/gbuild/Jar.mk
|
|
===================================================================
|
|
--- solenv/gbuild/Jar.mk.orig
|
|
+++ solenv/gbuild/Jar.mk
|
|
@@ -145,6 +145,11 @@ define gb_Jar_add_system_jar
|
|
$(call gb_JavaClassSet_add_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
|
|
endef
|
|
|
|
+# specify Xbootclasspath/p
|
|
+define gb_Jar_prepend_xboot_jars
|
|
+$(call gb_JavaClassSet_prepend_xboot_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
|
|
+endef
|
|
+
|
|
# specify jars with imported modules
|
|
define gb_Jar_add_jars
|
|
$(call gb_JavaClassSet_add_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
|
|
Index: solenv/gbuild/JavaClassSet.mk
|
|
===================================================================
|
|
--- solenv/gbuild/JavaClassSet.mk.orig
|
|
+++ solenv/gbuild/JavaClassSet.mk
|
|
@@ -41,6 +41,8 @@ $(call gb_Helper_abbreviate_dirs_native,
|
|
$(filter-out $(JARDEPS),$(4)))) && \
|
|
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
|
|
$(gb_JavaClassSet_JAVACDEBUG) \
|
|
+ $(gb_JavaClassSet_XBOOTCLASSPATH) \
|
|
+ -Xbootclasspath/p:$(XBOOT_CP_P) \
|
|
-cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
|
|
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
|
|
@$$RESPONSEFILE &&) \
|
|
@@ -83,6 +85,18 @@ $(eval $(call gb_JavaClassSet_get_target
|
|
|
|
endef
|
|
|
|
+
|
|
+# Xbootclasspath
|
|
+define gb_JavaClassSet_prepend_xboot_jar
|
|
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
|
|
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : XBOOT_CP_P := $$(XBOOT_CP_P)$(gb_CLASSPATHSEP)$(strip $(2)))
|
|
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
|
|
+endef
|
|
+
|
|
+define gb_JavaClassSet_prepend_xboot_jars
|
|
+$(foreach jar,$(2),$(call gb_JavaClassSet_prepend_xboot_jar,$(1),$(jar)))
|
|
+endef
|
|
+
|
|
# problem: currently we can't get these dependencies to work
|
|
# build order dependency is a hack to get these prerequisites out of the way in the build command
|
|
define gb_JavaClassSet_add_jar
|
|
Index: scripting/Jar_ScriptProviderForJavaScript.mk
|
|
===================================================================
|
|
--- scripting/Jar_ScriptProviderForJavaScript.mk.orig
|
|
+++ scripting/Jar_ScriptProviderForJavaScript.mk
|
|
@@ -37,6 +37,10 @@ $(eval $(call gb_Jar_add_jars,ScriptProv
|
|
$(OUTDIR)/bin/js.jar \
|
|
))
|
|
|
|
+$(eval $(call gb_Jar_prepend_xboot_jars,ScriptProviderForJavaScript,\
|
|
+ $(OUTDIR)/bin/js.jar \
|
|
+))
|
|
+
|
|
$(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF))
|
|
|
|
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \
|