| 1 |
suka 09/10/28 11:53:25 |
| 2 |
|
| 3 |
Modified: gentoo-3.1.1.diff |
| 4 |
Log: |
| 5 |
Bump to ooo-build-3.1.1.4, also re-fix kde4/qt4-support |
| 6 |
(Portage version: 2.2_rc46/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 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.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.5&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.4&r2=1.5 |
| 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.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -u -r1.4 -r1.5 |
| 21 |
--- gentoo-3.1.1.diff 22 Sep 2009 13:01:27 -0000 1.4 |
| 22 |
+++ gentoo-3.1.1.diff 28 Oct 2009 11:53:25 -0000 1.5 |
| 23 |
@@ -11,34 +11,15 @@ |
| 24 |
|
| 25 |
[ LinuxOnly ] |
| 26 |
# fix that allows OOo to work with a standard (unpatched) libjpeg, |
| 27 |
---- patches/dev300/system-db-check.diff |
| 28 |
-+++ patches/dev300/system-db-check.diff |
| 29 |
-@@ -12,14 +12,16 @@ |
| 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 |
-+- AC_MSG_CHECKING([whether db is at least 4.1]) |
| 35 |
-+- for v in `seq 1 7`; do |
| 36 |
-++ 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 |
| 37 |
- + AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ]) |
| 38 |
- + done |
| 39 |
- + if test "$DB_INCLUDES" = ""; then |
| 40 |
- + AC_MSG_ERROR(no. install the db4-dev package) |
| 41 |
- + fi |
| 42 |
-- AC_MSG_CHECKING([whether db is at least 4.1]) |
| 43 |
-- for v in 1 2 3 4 5; do |
| 44 |
-++ AC_MSG_CHECKING([whether db is at least 4.1]) |
| 45 |
-++ for v in `seq 1 8`; do |
| 46 |
- AC_TRY_RUN([ |
| 47 |
- @@ -3302,12 +3300,13 @@ |
| 48 |
- else |
| 49 |
-@@ -32,7 +34,7 @@ |
| 50 |
- - [AC_MSG_ERROR([db not installed or functional])], []) |
| 51 |
- - SCPDEFS="$SCPDEFS -DSYSTEM_DB" |
| 52 |
- + save_LIBS="$LIBS" |
| 53 |
--+ 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 |
| 54 |
-++ 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 |
| 55 |
- + AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ]) |
| 56 |
- + done |
| 57 |
- + AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ]) |
| 58 |
+--- patches/dev300/kde4-configure2.diff |
| 59 |
++++ patches/dev300/kde4-configure2.diff |
| 60 |
+@@ -7,7 +7,7 @@ |
| 61 |
+ - qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes" |
| 62 |
+ - qt_libdirs="$QTLIB /usr/lib $x_libraries" |
| 63 |
+ + qt_incdirs="$QT4INC $QT4DIR $QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes" |
| 64 |
+-+ qt_libdirs="$QT4LIB $QTLIB /usr/lib $x_libraries" |
| 65 |
+++ qt_libdirs="$QT4LIB $QTLIB /usr/lib/qt4 /usr/lib $x_libraries" |
| 66 |
+ |
| 67 |
+ kde_incdirs="/usr/include $x_includes" |
| 68 |
+ kde_libdirs="/usr/lib $x_libraries" |
| 69 |
+ |
Archives