[arch-commits] Commit in openoffice-base-devel/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Saturday, May 2, 2009 @ 07:20:37
  Author: andyrtr
Revision: 37492

small changes for new builds, it's still broken upstream

Modified:
  openoffice-base-devel/trunk/PKGBUILD
Deleted:
  openoffice-base-devel/trunk/DEV300m42-helpcontent2.diff

-----------------------------+
 DEV300m42-helpcontent2.diff |   13 -------------
 PKGBUILD                    |    8 +++-----
 2 files changed, 3 insertions(+), 18 deletions(-)

Deleted: DEV300m42-helpcontent2.diff
===================================================================
--- DEV300m42-helpcontent2.diff	2009-05-02 07:42:44 UTC (rev 37491)
+++ DEV300m42-helpcontent2.diff	2009-05-02 11:20:37 UTC (rev 37492)
@@ -1,13 +0,0 @@
-Index: makefile.pmk
-===================================================================
---- helpcontent2/makefile.pmk	(revision 268394)
-+++ helpcontent2/makefile.pmk	(working copy)
-@@ -44,7 +44,7 @@
- 
- $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
- .IF "$(WITH_LANG)"!=""
--	@$(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
-+	@$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
- .ELSE			# "$(WITH_LANG)"!=""
- .IF "$(USE_SHELL)"=="4nt"
- # it's getting real ugly...

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-02 07:42:44 UTC (rev 37491)
+++ PKGBUILD	2009-05-02 11:20:37 UTC (rev 37492)
@@ -2,11 +2,11 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-devel
-pkgver=3.2_dev300_m42
+pkgver=3.2_dev300_m47
 pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=('i686' 'x86_64')
-_OO_milestone=DEV300_m42
+_OO_milestone=DEV300_m47
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
@@ -17,7 +17,7 @@
             'gconf:		adds additional gnome support'
             'nss:		adds support for signed files/macros'
             'pstoedit:		translates PostScript and PDF graphics into other vector formats')
-makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
+makedepends=('bison' 'subversion' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
              'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.0.5"
              'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.3.1-2") # 'boost'
 provides=('openoffice-base')
@@ -31,7 +31,6 @@
 	shell.patch
 	system_hsqldb.diff
 	buildfix_FormulaMissingHeader.diff
-	DEV300m42-helpcontent2.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
 
@@ -63,7 +62,6 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
-	patch -Np0 -i ${srcdir}/DEV300m42-helpcontent2.diff || return 1
 
 	# allows soffice to find the user's firefox profile so that it can read
 	# his digital certificates. Nss stores digital certificates in your mozilla firefox profile.