[arch-commits] Commit in openoffice-base-devel/repos (3 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Jan 25 10:27:17 EST 2010


    Date: Monday, January 25, 2010 @ 10:27:17
  Author: andyrtr
Revision: 65234

Merged revisions 65232 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-base-devel/trunk

........
  r65232 | andyrtr | 2010-01-25 14:58:41 +0000 (Mo, 25 Jan 2010) | 2 lines
  
  upgpkg: openoffice-base-devel 3.3_dev300_m70-1
      new version DEV300_m70
........

Modified:
  openoffice-base-devel/repos/testing-x86_64/	(properties)
  openoffice-base-devel/repos/testing-x86_64/ChangeLog
  openoffice-base-devel/repos/testing-x86_64/PKGBUILD

-----------+
 ChangeLog |    6 ++++++
 PKGBUILD  |   23 +++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)


Property changes on: openoffice-base-devel/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-devel/trunk:1-64829
   + /openoffice-base-devel/trunk:1-65233

Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog	2010-01-25 14:59:29 UTC (rev 65233)
+++ testing-x86_64/ChangeLog	2010-01-25 15:27:17 UTC (rev 65234)
@@ -1,3 +1,9 @@
+2010-01-25 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.3_dev300_m70-1:
+	- new snapshot
+	- create tarball in its own function
+
 2010-01-22 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.3_dev300_m69-2:

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2010-01-25 14:59:29 UTC (rev 65233)
+++ testing-x86_64/PKGBUILD	2010-01-25 15:27:17 UTC (rev 65234)
@@ -4,9 +4,9 @@
 
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m69
+_OO_milestone=DEV300_m70
 pkgver=3.3_${_OO_milestone/DEV/dev}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.openoffice.org"
@@ -27,20 +27,21 @@
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc44.diff
 	buildfix_FormulaMissingHeader.diff
-	http://www.openoffice.org/nonav/issues/showattachment.cgi/67089/canvas.build-breaks-in-cairocanvas.patch
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
                                                                        
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
-build() {
-	# now mercurial http://wiki.services.openoffice.org/wiki/Mercurial_Pilot and http://wiki.services.openoffice.org/wiki/OOo_and_Mercurial
-#	mkdir -p ${srcdir}/${_OO_milestone}
-#	cd ${srcdir}
-#	hg -v clone -r ${_OO_milestone} http://hg.services.openoffice.org/hg/DEV300 ${srcdir}/${_OO_milestone}
-#	tar -cvzf ${SRCDEST}/${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
-#	return 1
+# source PKGBUILD && mksource
+mksource() {
+        mkdir /tmp/$pkgname-source
+        pushd /tmp/$pkgname-source
+	hg -v clone -r ${_OO_milestone} http://hg.services.openoffice.org/hg/DEV300 ${_OO_milestone}
+	tar -cvzf ${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
+        popd
+}
 
+build() {
 	cd ${srcdir}/${_OO_milestone}
 	# just to make sure that it will detect the desired JDK/JVM - we want openjdk6
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
@@ -60,8 +61,6 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
-	# http://www.openoffice.org/issues/show_bug.cgi?id=108160
-	patch -Np1 -i ${srcdir}/canvas.build-breaks-in-cairocanvas.patch || return 1
 	
 	# allows soffice to find the user's firefox profile so that it can read
 	# its digital certificates. Nss stores digital certificates in your mozilla firefox profile. 



More information about the arch-commits mailing list