LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File scripting-prefer-internal-rhino.diff of Package libreoffice-icon-themes (Project LibreOffice:Stable)

diff -urN libreoffice-4.0.0.0.beta1.old/scripting/Jar_ScriptProviderForJavaScript.mk libreoffice-4.0.0.0.beta1/scripting/Jar_ScriptProviderForJavaScript.mk
--- libreoffice-4.0.0.0.beta1.old/scripting/Jar_ScriptProviderForJavaScript.mk	2012-12-17 12:47:10.021137898 +0100
+++ libreoffice-4.0.0.0.beta1/scripting/Jar_ScriptProviderForJavaScript.mk	2012-12-17 12:56:29.405086038 +0100
@@ -40,6 +40,10 @@
 	rhino \
 ))
 
+$(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_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO))
diff -urN libreoffice-4.0.0.0.beta1.old/solenv/gbuild/Jar.mk libreoffice-4.0.0.0.beta1/solenv/gbuild/Jar.mk
--- libreoffice-4.0.0.0.beta1.old/solenv/gbuild/Jar.mk	2012-12-17 12:47:09.394137956 +0100
+++ libreoffice-4.0.0.0.beta1/solenv/gbuild/Jar.mk	2012-12-17 12:56:29.404086038 +0100
@@ -214,6 +214,11 @@
  gb_Jar_add_jars: use gb_Jar_use_jars instead.)
 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_use_jars
 $(foreach jar,$(2),$(call gb_Jar_use_jar,$(1),$(jar)))
diff -urN libreoffice-4.0.0.0.beta1.old/solenv/gbuild/JavaClassSet.mk libreoffice-4.0.0.0.beta1/solenv/gbuild/JavaClassSet.mk
--- libreoffice-4.0.0.0.beta1.old/solenv/gbuild/JavaClassSet.mk	2012-12-17 12:47:09.393137956 +0100
+++ libreoffice-4.0.0.0.beta1/solenv/gbuild/JavaClassSet.mk	2012-12-17 12:58:28.659074982 +0100
@@ -47,6 +47,8 @@
 			$(filter-out $(JARDEPS),$(4))) && \
 		$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
 			$(gb_JavaClassSet_JAVACDEBUG) \
+			$(gb_JavaClassSet_XBOOTCLASSPATH) \
+			-Xbootclasspath/p:$(XBOOT_CP_P) \
 			-classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
 			-d $(call gb_JavaClassSet_get_classdir,$(2)) \
 			@$$RESPONSEFILE &&) \
@@ -118,6 +120,17 @@
  gb_JavaClassSet_add_jar: use gb_JavaClassSet_use_jar instead.)
 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
+
 define gb_JavaClassSet_use_jar
 ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2)))
 $$(eval $$(call gb_Output_info,currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL))