[arch-commits] Commit in libreoffice/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Monday, May 23, 2011 @ 08:29:47
  Author: andyrtr
Revision: 124608

prepare 3.4 add buildfix for beanshell extension

Added:
  libreoffice/trunk/0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch
Modified:
  libreoffice/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch |   43 ++++++++++
 PKGBUILD                                                        |   13 +--
 2 files changed, 51 insertions(+), 5 deletions(-)

Added: 0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch
===================================================================
--- 0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch	                        (rev 0)
+++ 0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch	2011-05-23 12:29:47 UTC (rev 124608)
@@ -0,0 +1,43 @@
+From 846010092e0a10c5423a26f5e78ea135d73b0103 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 23 May 2011 11:32:44 +0200
+Subject: [PATCH] do not include bsh.jar when building with system bsh
+
+---
+ scripting/util/provider/beanshell/makefile.mk |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk
+index 1f70fcb..a7c74f5 100755
+--- a/scripting/util/provider/beanshell/makefile.mk
++++ b/scripting/util/provider/beanshell/makefile.mk
+@@ -36,7 +36,9 @@ EXTENSIONNAME:=ScriptProviderForBeanShell
+ EXTENSION_ZIPNAME:=script-provider-for-beanshell
+ 
+ COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
++.IF "$(SYSTEM_BSH)" != "YES"
+ EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar
++.ENDIF
+ 
+ .IF "$(ENABLE_SCRIPTING_BEANSHELL)" != "YES"
+ @all:
+@@ -47,12 +49,16 @@ EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar
+ .INCLUDE : target.mk
+ .INCLUDE : extension_post.mk
+ 
++.IF "$(SYSTEM_BSH)" != "YES"
++
+ ALLTAR : $(EXTENSIONDIR)$/bsh.jar
+ 
+ $(EXTENSIONDIR)$/bsh.jar : $(SOLARBINDIR)$/bsh.jar
+     @@-$(MKDIRHIER) $(@:d)
+     $(COMMAND_ECHO)$(COPY) $< $@
+ 
++.ENDIF
++
+ .ELSE
+ 
+ .INCLUDE : target.mk
+-- 
+1.7.5.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-23 10:50:04 UTC (rev 124607)
+++ PKGBUILD	2011-05-23 12:29:47 UTC (rev 124608)
@@ -17,7 +17,7 @@
 	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder'
-#	'libreoffice-extension-scripting-beanshell'
+	'libreoffice-extension-scripting-beanshell'
 	'libreoffice-extension-scripting-javascript'
 	'libreoffice-extension-scripting-python'
 	'libreoffice-extension-typo'
@@ -94,7 +94,8 @@
 	buildfix_boost.diff
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
-	buildfix_bison25.diff)
+	buildfix_bison25.diff
+	0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
@@ -195,7 +196,8 @@
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
-         '4fa96e04b41a6e86774e74a972024b3e')
+         '4fa96e04b41a6e86774e74a972024b3e'
+         'c48944009cbe00954c8bd86bf65abd96')
 
 build() {
 
@@ -217,13 +219,14 @@
 	done
 
 	cd ${srcdir}/build
-#return 1
+
 	# buildfixes & bugfixes
 	patch -Np1 -i ${srcdir}/buildfix_i116795.diff
 	patch -Np1 -i ${srcdir}/buildfix_boost.diff
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	patch -Np0 -i ${srcdir}/buildfix_bison25.diff
+	patch -Np1 -i ${srcdir}/0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -292,7 +295,7 @@
 		--enable-ext-presenter-console \
 		--enable-ext-presenter-minimizer \
 		--enable-ext-report-builder \
-		--disable-ext-scripting-beanshell \
+		--enable-ext-scripting-beanshell \
 		--enable-ext-scripting-javascript \
 		--enable-ext-scripting-python \
 		--enable-ext-typo \