[arch-commits] Commit in openoffice-base-beta/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Sunday, October 11, 2009 @ 05:47:02
  Author: andyrtr
Revision: 54542

upgpkg: openoffice-base-beta 3.2.0_ooo320_m1-1
    new version 3.2.0_ooo320_m1

Added:
  openoffice-base-beta/trunk/buildfix_system_db48.diff
Modified:
  openoffice-base-beta/trunk/ChangeLog
  openoffice-base-beta/trunk/PKGBUILD	(contents, properties)

---------------------------+
 ChangeLog                 |    2 ++
 PKGBUILD                  |   38 ++++++++++++++++++++++++++------------
 buildfix_system_db48.diff |   11 +++++++++++
 3 files changed, 39 insertions(+), 12 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-10-11 09:45:34 UTC (rev 54541)
+++ ChangeLog	2009-10-11 09:47:02 UTC (rev 54542)
@@ -1,3 +1,5 @@
+	- TODO: fix extensions installation!
+
 2009-10-11 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2.0-OOO320_m1-1 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-11 09:45:34 UTC (rev 54541)
+++ PKGBUILD	2009-10-11 09:47:02 UTC (rev 54542)
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54513 2009-10-10 22:13:43Z andyrtr $
+# $Id$
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
 _OO_milestone=OOO320_m1
-pkgver=3.2.0_${_OO_milestone} # not yet beta state
+pkgver=3.2.0_${_OO_milestone/OOO/ooo} # not yet beta state
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -20,28 +20,42 @@
 	     'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'lucene')
 	     # boost
 	     # libmythes
-source=(#${pkgname}-${_OO_milestone}.tar.gz
+source=(${pkgname}-${_OO_milestone}.tar.gz
 	http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 	startcenter.desktop
 	default-no-startup-wizard.diff
 	default-system-fpicker.diff
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc44.diff
-	shell.patch
 	buildfix_FormulaMissingHeader.diff
 	http://www.openoffice.org/nonav/issues/showattachment.cgi/64767/openldap.patch
+	buildfix_system_db48.diff
 	openoffice-beta.profile)
 options=('!distcc' '!ccache' '!makeflags')
+md5sums=('8147597252646ceae70c1a886d9831a2'
+         'e3a0b76dcd876f3d721ee7183729153d'
+         '90897451b6cfed490e481f06d45408aa'
+         '71f136a31e296a04ab68932a31dd533e'
+         '6c596129fb48316226ce3adfd3a4c86d'
+         '1dc7480a04f572ad136d35923a2af66d'
+         'c8e82b4d2324fe62ad8c6e29213e80b5'
+         '863a3ab2c17a3d11b8fa3ec321986366'
+         'a130ad960f76b692e34f8566e5ca3f2b'
+	 '0cd6f3525939d3ef6e5a30ad30c25d27'
+         '8d68d44c941a687813ddd968383cdf27')
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
+## TODO: installation of extensions, see http://cvs.fedora.redhat.com/viewvc/rpms/openoffice.org/devel/openoffice.org.spec?revision=1.2021&view=markup
+
+
 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 -cvzf ../${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 -cvzf ../${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
+#	return 1
 
 	cd ${srcdir}/${_OO_milestone}
 
@@ -63,14 +77,14 @@
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
 	patch -Np0 -i ${srcdir}/openldap.patch || return 1
-
+	patch -Np0 -i ${srcdir}/buildfix_system_db48.diff || 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. 
 	patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1
 
 	# important bugfixes
-	# try to fix non-gtk integration 
-	patch -Np0 -i ${srcdir}/shell.patch || return 1
+	# ...nothing :)
 
 	# remove the startup wizard
 	patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1
@@ -188,7 +202,7 @@
             'pstoedit:		translates PostScript and PDF graphics into other vector formats'
             'poppler:		for shipped pdfimport extension'
 	    'kdelibs:		for kde integration')
- backup=(usr/lib/openoffice-dev/program/sofficerc )
+ backup=(usr/lib/openoffice-beta/program/sofficerc )
  provides=('openoffice-base' 'openoffice-en-US')
 
 


Property changes on: openoffice-base-beta/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id

Added: buildfix_system_db48.diff
===================================================================
--- buildfix_system_db48.diff	                        (rev 0)
+++ buildfix_system_db48.diff	2009-10-11 09:47:02 UTC (rev 54542)
@@ -0,0 +1,11 @@
+--- configure.in	2009-08-25 15:10:12.000000000 +0000
++++ configure.in.new	2009-09-27 17:43:11.207515081 +0000
+@@ -3626,7 +3626,7 @@
+         ], []
+     )
+     AC_MSG_CHECKING([whether db is at least 4.1])
+-    for v in `seq 1 7`; do
++    for v in `seq 1 8`; do
+        AC_TRY_RUN([
+ #include <db.h>
+