diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/2.1.0/detect-db4.5.diff | 20 |
2 files changed, 25 insertions, 1 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 14f79d709cde..4814ec04a86c 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.304 2007/03/06 19:04:22 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.305 2007/03/07 06:14:33 suka Exp $ + + 07 Mar 2007; Andreas Proschofsky <suka@gentoo.org> + +files/2.1.0/detect-db4.5.diff: + Add missing patch, oops. 06 Mar 2007; Andreas Proschofsky <suka@gentoo.org> files/2.1.0/wrapper-readd.diff, files/2.1.0/gentoo-2.1.0.diff, diff --git a/app-office/openoffice/files/2.1.0/detect-db4.5.diff b/app-office/openoffice/files/2.1.0/detect-db4.5.diff new file mode 100644 index 000000000000..0a708e9c2ce8 --- /dev/null +++ b/app-office/openoffice/files/2.1.0/detect-db4.5.diff @@ -0,0 +1,20 @@ +--- patches/src680.orig/system-db-check.diff 2007-02-08 14:18:23.000000000 +0100 ++++ patches/src680/system-db-check.diff 2007-03-06 10:56:17.754647295 +0100 +@@ -12,7 +12,7 @@ + - [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ ) + - ], [] + - ) +-+ for dbver in -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do +++ for dbver in -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do + + AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ]) + + done + + if test "$DB_INCLUDES" = ""; then +@@ -31,7 +31,7 @@ + - AC_HAVE_LIBRARY(db, [], + - [AC_MSG_ERROR([db not installed or functional])], []) + + save_LIBS="$LIBS" +-+ for dbver in -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do +++ for dbver in -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do + + AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ]) + + done + + AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ]) |