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

[andyrtr at archlinux.org]

    Date: Wednesday, May 25, 2011 @ 12:17:20
  Author: andyrtr
Revision: 124994

prepare 3.4; update to 3.4rc2

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

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

Deleted: 0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch
===================================================================
--- 0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch	2011-05-25 16:14:34 UTC (rev 124993)
+++ 0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch	2011-05-25 16:17:20 UTC (rev 124994)
@@ -1,43 +0,0 @@
-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-25 16:14:34 UTC (rev 124993)
+++ PKGBUILD	2011-05-25 16:17:20 UTC (rev 124994)
@@ -24,8 +24,8 @@
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.0.1
-pkgver=3.4rc1
+_LOver=3.4.0.2
+pkgver=3.4rc2
 pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
@@ -94,8 +94,7 @@
 	buildfix_boost.diff
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
-	buildfix_bison25.diff
-	0001-do-not-include-bsh.jar-when-building-with-system-bsh.patch)
+	buildfix_bison25.diff)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
@@ -134,25 +133,25 @@
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
-md5sums=('61af4cdd4406c03b0534bc683b747865'
-         '7b821f1d15ebe9ac588e3d69cfe2821e'
-         'bf3edfa43e97da54a0fd15ec9689c7d3'
-         '239addc6153a915691979748b804cae9'
-         'f23caf17dd85398972dd21761d719641'
-         'fe5aff88db2863324f590f34722387b4'
-         '76f41326f94bb1afb0f2e4a5060d57bb'
-         '9ac0f83afe70417a05b8e2915154ae33'
-         '4ad184879b836d26c009191b88f99c49'
-         '0ca0c2d8c204e1139d9f2cae3aa6b90a'
-         'b8efd2b00b872c6cb04bfc81afae3ba0'
-         'e71ac5ccde6611c0657d8aa1d87f6347'
-         'a59950dbedde977f48366965790607ec'
-         '18170643d2663c357e58fca05ff5f1b8'
-         '2fccd77f4ee706c2bf418eb712795051'
-         '5c2420845e7fc6918808eb388f98071a'
-         '486c4d8e2598330a4215620eebfbb6d0'
-         '22bfb0efc041523575fc9d296010971a'
-         'b5d436367fd7f57b9f22618c9e880ccf'
+md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa'
+         'a78a8e08731213da02c65060cedc5589'
+         '596da255e2728faccc8f2361171270ec'
+         '8ed9803a34d13da1764e7523d550d6b0'
+         '9be46d7c4bf3a60ee8dd0a5ef3638f82'
+         'b60db802866ab71c485de42e6382d1bb'
+         '09e374cf3bd8f07a043883393012d69b'
+         'af9f25aa04dc4ef7b797f7bcc743877c'
+         'ad29de786d76d67759f9d2dd574b29be'
+         'ff13a8ac0ea324122b75773fd80a9245'
+         '6eb8f53e01da7a945ee4cd42b7297732'
+         '90df27d4cbf490668ce4f03ff7dba521'
+         'c0ea197183564c49306a1c79ca571e51'
+         '91e69ed3c0be542fa7f69ca3da2d7808'
+         'a81c787b2e5469c2acc9f335b2c9e52f'
+         'ee1c78af6553657614b1a43adf4750ac'
+         'c970d6212618fc9b34526907eb030ce6'
+         '6d25488c81af09d87015bf487243042f'
+         '9a39234a49516b7035309e28dd4f0784'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -196,8 +195,7 @@
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
-         '4fa96e04b41a6e86774e74a972024b3e'
-         'c48944009cbe00954c8bd86bf65abd96')
+         '4fa96e04b41a6e86774e74a972024b3e')
 
 build() {
 
@@ -226,7 +224,6 @@
 	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