[arch-commits] Commit in openoffice-base/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Tuesday, May 5, 2009 @ 17:13:56
  Author: andyrtr
Revision: 37957

upgpkg: openoffice-base 3.1.0-1
    new version 3.1.0

Modified:
  openoffice-base/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-05 20:41:51 UTC (rev 37956)
+++ PKGBUILD	2009-05-05 21:13:56 UTC (rev 37957)
@@ -20,7 +20,7 @@
 makedepends=('bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
              'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.0.4'
              'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.4') #'boost' 
-source=(${pkgname}-${_OO_milestone}.tar.bz2
+source=(ftp://ftp.archlinux.org/other/openoffice/${pkgname}-${_OO_milestone}.tar.bz2
 	template.desktop
 	default-no-startup-wizard.diff
 	default-system-fpicker.diff
@@ -29,16 +29,24 @@
 	shell.patch
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
+md5sums=('650d8f2b648b291688bed9821f9dda91'
+         '5e22f876c3c5d4754af394399e9bf375'
+         '71f136a31e296a04ab68932a31dd533e'
+         '6c596129fb48316226ce3adfd3a4c86d'
+         '1dc7480a04f572ad136d35923a2af66d'
+         'bf7119084a2d1e0566b5e34b57dce8eb'
+         'a51200f770c635355c430cc5052db8cf'
+         '8d68d44c941a687813ddd968383cdf27')
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
 build() {
 	cd ${srcdir}
 	# now svn: http://wiki.services.openoffice.org/wiki/OOo_and_Subversion
-	svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
-	find ${srcdir} -type d -depth -name ".svn" -exec rm -rf {} \;
-	tar -cvjf ../${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
-	return 1
+#	svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
+#	find ${srcdir} -type d -depth -name ".svn" -exec rm -rf {} \;
+#	tar -cvjf ../${pkgname}-${_OO_milestone}.tar.bz2 ${_OO_milestone}/*
+#	return 1
 
 	cd ${srcdir}/${_OO_milestone}
 	
@@ -65,9 +73,6 @@
 	# important bugfixes
 	# try to fix non-gtk integration 
 	patch -Np0 -i ${srcdir}/shell.patch || return 1
-	# fix high cpu load in fpicker, FS#11710
-	patch -Np1 -i ${srcdir}/workspace.fpicker8.patch || return 1
-	patch -Np1 -i ${srcdir}/run_fpicker_in_main.patch || return 1
 
 	# remove the startup wizard
 	patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1
@@ -229,12 +234,12 @@
 	install -D -m644 ${srcdir}/template.desktop ${pkgdir}/usr/share/applications/template.desktop || return 1
 
 	# install icons
-	cd ${srcdir}/sysui/desktop/icons
+	cd ${srcdir}/${_OO_milestone}/sysui/desktop/icons
 	cp -a -v hicolor/*x* ${pkgdir}/usr/share/icons/hicolor
 	cp -a -v locolor/*x* ${pkgdir}/usr/share/icons/locolor
 
 	# just in case icon calc is used by calculator :)
-	find ${pkgdir}/${_OO_milestone}/usr/share/icons -type d -name apps -exec mv {}/calc.png  {}/ooocalc.png \;
+	find ${pkgdir}/usr/share/icons -type d -name apps -exec mv {}/calc.png  {}/ooocalc.png \;
 	sed -i -e 's|Icon=calc|Icon=ooocalc|g' ${pkgdir}/usr/share/applications/calc.desktop # already done above
 
 	# fix ownership and permissions