Attachment 46611 Details for Bug 35139 – patch to fix

[patch] patch to fix

35139.diff (text/plain), 1.12 KB, created by Noel Power on 2011-05-11 10:38:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noel Power

Created: 2011-05-11 10:38:11 UTC

Size: 1.12 KB

patch

obsolete

>diff --git scripting/util/provider/beanshell/makefile.mk scripting/util/provider/beanshell/makefile.mk
>index cbb0c40..23d1fa3 100755
>--- scripting/util/provider/beanshell/makefile.mk
>+++ scripting/util/provider/beanshell/makefile.mk
>@@ -36,6 +36,7 @@ EXTENSIONNAME:=ScriptProviderForBeanShell
> EXTENSION_ZIPNAME:=script-provider-for-beanshell
> 
> COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
>+EXTENSION_PACKDEPS=$(SOLARBINDIR)$/js.jar
> 
> .IF "$(ENABLE_SCRIPTING_BEANSHELL)" != "YES"
> @all:
>diff --git scripting/util/provider/javascript/manifest.xml scripting/util/provider/javascript/manifest.xml
>index 4c61747..d052ad8 100755
>--- scripting/util/provider/javascript/manifest.xml
>+++ scripting/util/provider/javascript/manifest.xml
>@@ -3,8 +3,5 @@
> <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
>   <manifest:file-entry
>     manifest:media-type="application/vnd.sun.star.uno-component;type=java"
>-    manifest:full-path="js.jar"/>
>-  <manifest:file-entry
>-    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
>     manifest:full-path="ScriptProviderForJavaScript.jar"/>
> </manifest:manifest>

Actions: View | Splinter Review

Attachments on bug 35139: 46611

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.