[arch-commits] Commit in go-openoffice/repos (5 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Sun May 24 15:36:17 EDT 2009


    Date: Sunday, May 24, 2009 @ 15:36:17
  Author: andyrtr
Revision: 40020

Merged revisions 39909,40019 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/go-openoffice/trunk

........
  r39909 | andyrtr | 2009-05-22 22:26:06 +0200 (Fr, 22 Mai 2009) | 2 lines
  
  upgpkg: go-openoffice 3.1.0rc5-1
      new version 3.1.0rc5
........
  r40019 | andyrtr | 2009-05-24 21:35:36 +0200 (So, 24 Mai 2009) | 2 lines
  
  upgpkg: go-openoffice 3.1.0rc5-2
      new version 3.1.0rc5; added a buildfix
........

Added:
  go-openoffice/repos/extra-i686/ooo_getline.diff
    (from rev 40019, go-openoffice/trunk/ooo_getline.diff)
Modified:
  go-openoffice/repos/extra-i686/	(properties)
  go-openoffice/repos/extra-i686/ChangeLog
  go-openoffice/repos/extra-i686/PKGBUILD
  go-openoffice/repos/extra-i686/go-openoffice.install

-----------------------+
 ChangeLog             |   11 +++++++++++
 PKGBUILD              |   17 +++++++++++------
 go-openoffice.install |    2 +-
 ooo_getline.diff      |   43 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 7 deletions(-)


Property changes on: go-openoffice/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /go-openoffice/trunk:1-39772
   + /go-openoffice/trunk:1-40019

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-05-24 19:35:36 UTC (rev 40019)
+++ extra-i686/ChangeLog	2009-05-24 19:36:17 UTC (rev 40020)
@@ -1,3 +1,14 @@
+2009-05-22 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.1.0.4-1 :
+        new upstream release = go-oo 3.1.0 rc5
+
+2009-05-22 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.1.0.3-1 :
+        new upstream release = go-oo 3.1.0 rc4
+	*cancelled*
+
 2009-05-19 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.1.0.2-1 :

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-24 19:35:36 UTC (rev 40019)
+++ extra-i686/PKGBUILD	2009-05-24 19:36:17 UTC (rev 40020)
@@ -2,9 +2,9 @@
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 
 pkgname=go-openoffice
-pkgver=3.1.0rc3
-_GOver=3.1.0.2
-pkgrel=1
+pkgver=3.1.0rc5
+_GOver=3.1.0.4
+pkgrel=2
 pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
 arch=('i686' 'x86_64')
 _go_tree="OOO310"
@@ -43,12 +43,13 @@
 	http://download.go-oo.org//DEV300/scsolver.2008-10-30.tar.bz2
 	http://download.go-oo.org//libwpd/libwpd-0.8.14.tar.gz
 	http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz
-	http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz)
+	http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz
+	ooo_getline.diff)
 #options=('!distcc' '!ccache' '!makeflags')
 noextract=(ooo-cli-prebuilt-3.1.tar.bz2 cairo-1.4.10.tar.gz mdbtools-0.6pre1.tar.gz
 	${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
 	extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz libwpg-0.1.3.tar.gz)
-md5sums=('134cde4306ea9267ac45bf33803302f9'
+md5sums=('0fa15f4a4256c425b00252fce4a2647b'
          '83b5411a465797b3d8573ddacf7c7217'
          'b5b895b338e81191a6abacc644e3f705'
          '5598a5e500ad922e37b159dee72fc993'
@@ -78,7 +79,8 @@
          '04181e5ef82973eb349d3122a19d2274'
          '64d66018897d759358f454010b6e75d2'
          '799fc3b835a79adce8c88a3fee0150c1'
-         'db556b750bf3eac8481a4cc5e29e5af1')
+         'db556b750bf3eac8481a4cc5e29e5af1'
+         '7f9012680d0e329227445925710bafe6')
 
 build() {
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
@@ -90,6 +92,9 @@
 	# our ArchLinux distribution patch until we go upstream
 	patch -Np0 -i ${srcdir}/ArchLinux.patch || return 1
 
+	# hotfixes not yet upstream
+	cp ${srcdir}/*.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
+
 	export ARCH_FLAGS="${CXXFLAGS}"
 
 	if [ "$CARCH" = "x86_64" ]; then

Modified: extra-i686/go-openoffice.install
===================================================================
--- extra-i686/go-openoffice.install	2009-05-24 19:35:36 UTC (rev 40019)
+++ extra-i686/go-openoffice.install	2009-05-24 19:36:17 UTC (rev 40020)
@@ -3,7 +3,7 @@
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-desktop-database -q
 
-_GOver='3.1.0.2'
+_GOver='3.1.0.4'
 
 echo " see http://wiki.archlinux.org/index.php/Openoffice"
 echo " how to use extensions, e.g. for spell checking"

Copied: go-openoffice/repos/extra-i686/ooo_getline.diff (from rev 40019, go-openoffice/trunk/ooo_getline.diff)
===================================================================
--- extra-i686/ooo_getline.diff	                        (rev 0)
+++ extra-i686/ooo_getline.diff	2009-05-24 19:36:17 UTC (rev 40020)
@@ -0,0 +1,43 @@
+--- soltools/mkdepend/def.h.orig	2009-05-18 15:28:59.000000000 +0200
++++ soltools/mkdepend/def.h	2009-05-18 15:29:36.000000000 +0200
+@@ -154,7 +154,7 @@
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
++char			*ooo_getline();
+ char			*isdefined();
+ struct filepointer	*getfile();
+ struct inclist		*newinclude();
+--- soltools/mkdepend/main.c.orig	2009-05-18 15:29:08.000000000 +0200
++++ soltools/mkdepend/main.c	2009-05-18 15:30:23.000000000 +0200
+@@ -548,7 +548,7 @@
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *ooo_getline(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
+--- soltools/mkdepend/parse.c.orig	2009-05-18 15:29:17.000000000 +0200
++++ soltools/mkdepend/parse.c	2009-05-18 15:30:43.000000000 +0200
+@@ -45,7 +45,7 @@
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while ((line = getline(filep))) {
++	while ((line = ooo_getline(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
+ 		case IF:
+ 		doif:
+@@ -168,7 +168,7 @@
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while ((line = getline(filep))) {
++	while ((line = ooo_getline(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
+ 		case IF:
+ 		case IFFALSE:
+



More information about the arch-commits mailing list