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

[andyrtr at archlinux.org]

    Date: Saturday, October 30, 2010 @ 16:35:47
  Author: andyrtr
Revision: 97509

upgpkg: openoffice-base 3.2.1-3
rebuild against new db5.1

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

---------------------------+
 ChangeLog                 |    5 +++++
 PKGBUILD                  |   14 +++++++++-----
 buildfix_system_db48.diff |   11 -----------
 buildfix_system_db51.diff |   31 +++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 16 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-10-30 20:13:32 UTC (rev 97508)
+++ ChangeLog	2010-10-30 20:35:47 UTC (rev 97509)
@@ -1,3 +1,8 @@
+2010-10-30 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2.1-3 :
+	- db5.1 rebuild, add buildfix
+
 2010-10-04 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2.1-2 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-30 20:13:32 UTC (rev 97508)
+++ PKGBUILD	2010-10-30 20:35:47 UTC (rev 97509)
@@ -6,7 +6,7 @@
 pkgname=('openoffice-base' 'openoffice-sdk')
 _OO_milestone=OOO320_m19
 pkgver=3.2.1 # m18/m19=3.2.1 RC2 = final
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.openoffice.org"
@@ -29,7 +29,8 @@
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc44.diff
 	buildfix_FormulaMissingHeader.diff
-	buildfix_system_db48.diff
+	buildfix_system_db51.diff
+	http://www.openoffice.org/nonav/issues/showattachment.cgi/72052/configure.set-redland-cflags.patch
 	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
 	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/vcl-system-graphite-with-stlport.diff
 	http://cgit.freedesktop.org/libreoffice/build/plain/patches/dev300/fix-system-mythes-for-mythes-1.2.diff?h=ooo-build-3-2-1
@@ -44,7 +45,8 @@
          '1dc7480a04f572ad136d35923a2af66d'
          'c8e82b4d2324fe62ad8c6e29213e80b5'
          '863a3ab2c17a3d11b8fa3ec321986366'
-         '0cd6f3525939d3ef6e5a30ad30c25d27'
+         'e4516cc1caa176d77f3cc513cfcf99e1'
+         '283e7ac83bafd04eaeaffe9ad51e5f6e'
          'e666e8cea0ef557a8bce41c58dd16408'
          'c6abfe517a7002a18880e0e209145167'
          '4798e0d5329cd11f4c7c303ad5d0ff6f'
@@ -81,9 +83,11 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
-	patch -Np0 -i ${srcdir}/buildfix_system_db48.diff || return 1
+	patch -Np0 -i ${srcdir}/buildfix_system_db51.diff || return 1
 	patch -Np0 -i ${srcdir}/cppu-lbnames-enable-gcc-4.5.diff || return 1
-
+	# http://www.openoffice.org/issues/show_bug.cgi?id=114999
+	patch -Np1 -i ${srcdir}/configure.set-redland-cflags.patch
+	
 	# allow build with system mythes
 	patch -Np0 -i ${srcdir}/fix-system-mythes-for-mythes-1.2.diff?h=ooo-build-3-2-1 || return 1
 	# allow build with system redland and cppunit

Deleted: buildfix_system_db48.diff
===================================================================
--- buildfix_system_db48.diff	2010-10-30 20:13:32 UTC (rev 97508)
+++ buildfix_system_db48.diff	2010-10-30 20:35:47 UTC (rev 97509)
@@ -1,11 +0,0 @@
---- 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>
- 

Added: buildfix_system_db51.diff
===================================================================
--- buildfix_system_db51.diff	                        (rev 0)
+++ buildfix_system_db51.diff	2010-10-30 20:35:47 UTC (rev 97509)
@@ -0,0 +1,31 @@
+--- configure.in	2010-05-28 07:18:48.000000000 +0200
++++ configure.in.new	2010-10-30 16:11:58.213941014 +0200
+@@ -3864,25 +3864,14 @@
+         ], []
+     )
+     AC_MSG_CHECKING([whether db is at least 4.1])
+-    for v in `seq 1 7`; do
+-       AC_TRY_RUN([
++    AC_TRY_RUN([
+ #include <db.h>
+ 
+ int main(int argc, char **argv) {
+-       if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
++       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
+        else return 1;
+ }
+-       ], [DB_VERSION_MINOR=$v], [])
+-    done
+-    if test "$DB_VERSION_MINOR" -gt "1"; then
+-       AC_MSG_RESULT([OK])
+-       DB_VERSION=4.$DB_VERSION_MINOR
+-    else
+-       AC_MSG_ERROR([no. you need at least db 4.1])
+-    fi
+-    # does not work :/
+-    #AC_CHECK_LIB(db, db_create, [],
+-    #  [AC_MSG_ERROR([db library not installed or functional])], [])
++    ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
+     AC_HAVE_LIBRARY(db, [],
+       [AC_MSG_ERROR([db not installed or functional])], [])
+     SCPDEFS="$SCPDEFS -DSYSTEM_DB"