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

andyrtr at archlinux.org andyrtr at archlinux.org
Sun Sep 27 19:22:07 UTC 2009


    Date: Sunday, September 27, 2009 @ 15:22:07
  Author: andyrtr
Revision: 53272

upgpkg: openoffice-base 3.1.1-2
    rebuild for db48

Added:
  openoffice-base/trunk/buildfix_system_db48.diff
Modified:
  openoffice-base/trunk/ChangeLog
  openoffice-base/trunk/PKGBUILD

---------------------------+
 ChangeLog                 |    5 +++++
 PKGBUILD                  |   16 +++++++++-------
 buildfix_system_db48.diff |   11 +++++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-09-27 18:26:32 UTC (rev 53271)
+++ ChangeLog	2009-09-27 19:22:07 UTC (rev 53272)
@@ -1,3 +1,8 @@
+2009-09-27 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.1.1-2 :
+	- rebuild for db4.8
+
 2009-08-25 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.1.1-1 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-27 18:26:32 UTC (rev 53271)
+++ PKGBUILD	2009-09-27 19:22:07 UTC (rev 53272)
@@ -4,14 +4,14 @@
 
 pkgname=openoffice-base
 pkgver=3.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
 _OO_milestone=OOO310_m19  # =RC2 = final
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
-depends=('curl>=7.19.6' 'hunspell>=1.2.8' 'python>=2.6.2-5' 'libwpd>=0.8.14' 'redland>=1.0.8-3' 'libxaw>=1.0.6' 'neon>=0.28.4'
+depends=('curl>=7.19.6' 'hunspell>=1.2.8' 'python>=2.6.2-6' 'libwpd>=0.8.14' 'redland>=1.0.9-4' 'libxaw>=1.0.6' 'neon>=0.28.6'
 	 'dbus-glib>=0.80' 'icu>=4.2.1' 'hsqldb-java' 'libxslt>=1.1.24-2' 'hicolor-icon-theme' 'desktop-file-utils')
 optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
@@ -19,8 +19,8 @@
             'nss:		adds support for signed files/macros'
             'pstoedit:		translates PostScript and PDF graphics into other vector formats')
 makedepends=('bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
-             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.1.2'
-             'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5.1')
+             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.1.3'
+             'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.6.1')
 backup=(usr/lib/openoffice/program/sofficerc)
 source=(ftp://ftp.archlinux.org/other/openoffice/${pkgname}-${_OO_milestone}.tar.bz2
 	startcenter.desktop
@@ -34,7 +34,8 @@
 	buildfix-sw-printf.diff
 	xulrunner-1.9.1.diff
 	nsplugin-path.diff
-	no-mozilla-plug-in-option.diff)
+	no-mozilla-plug-in-option.diff
+	buildfix_system_db48.diff)
 options=('!distcc' '!ccache' '!makeflags')
 md5sums=('23370db83cc40bfbf22cedc460fd6b85'
          '90897451b6cfed490e481f06d45408aa'
@@ -48,7 +49,8 @@
          '2461119a2b7f1580f997f504a76a1c98'
          '94b52cefc3656013f33ccedc0392848b'
          'b48650dbdcf72c09a15dc9dff54915f1'
-         '00d28e85d97a467c58f317a2d93d26ac')
+         '00d28e85d97a467c58f317a2d93d26ac'
+         '0cd6f3525939d3ef6e5a30ad30c25d27')
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
@@ -81,8 +83,8 @@
 	patch -Np0 -i ${srcdir}/buildfix-sw-printf.diff || return 1
 	patch -Np0 -i ${srcdir}/soltools-mkdepend-getline.diff || return 1
 	patch -Np0 -i ${srcdir}/xulrunner-1.9.1.diff || 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

Added: buildfix_system_db48.diff
===================================================================
--- buildfix_system_db48.diff	                        (rev 0)
+++ buildfix_system_db48.diff	2009-09-27 19:22:07 UTC (rev 53272)
@@ -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>
+ 




More information about the arch-commits mailing list