| 1 |
suka 09/10/29 11:43:24 |
| 2 |
|
| 3 |
Modified: gentoo-3.1.1.diff |
| 4 |
Log: |
| 5 |
Accidentaly dropped db-4.8 fix, re-introduce |
| 6 |
(Portage version: 2.2_rc46/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 app-office/openoffice/files/gentoo-3.1.1.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: gentoo-3.1.1.diff |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- gentoo-3.1.1.diff 28 Oct 2009 11:53:25 -0000 1.5 |
| 22 |
+++ gentoo-3.1.1.diff 29 Oct 2009 11:43:23 -0000 1.6 |
| 23 |
@@ -22,4 +22,24 @@ |
| 24 |
|
| 25 |
kde_incdirs="/usr/include $x_includes" |
| 26 |
kde_libdirs="/usr/lib $x_libraries" |
| 27 |
+--- patches/dev300/system-db-check.diff |
| 28 |
++++ patches/dev300/system-db-check.diff |
| 29 |
+@@ -12,7 +12,7 @@ |
| 30 |
+ - [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ ) |
| 31 |
+ - ], [] |
| 32 |
+ - ) |
| 33 |
+-+ for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do |
| 34 |
+++ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do |
| 35 |
+ + AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ]) |
| 36 |
+ + done |
| 37 |
+ + if test "$DB_INCLUDES" = ""; then |
| 38 |
+@@ -32,7 +32,7 @@ |
| 39 |
+ - [AC_MSG_ERROR([db not installed or functional])], []) |
| 40 |
+ - SCPDEFS="$SCPDEFS -DSYSTEM_DB" |
| 41 |
+ + save_LIBS="$LIBS" |
| 42 |
+-+ for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do |
| 43 |
+++ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do |
| 44 |
+ + AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ]) |
| 45 |
+ + done |
| 46 |
+ + AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ]) |
Archives