Trying to fix KDE4 build problems, once again, see bug #283618

(Portage version: 2.2_rc41/cvs/Linux i686)

5 files changed, 96 insertions, 45 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index f38441cee9b9..269e3b7bee27 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.483 2009/09/20 13:49:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.484 2009/09/22 13:01:26 suka Exp $
+
+  22 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
+  files/gentoo-3.1.1.diff, -files/dbfix.diff, +files/kde4-configure2.diff,
+  openoffice-3.1.1.ebuild:
+  Trying to fix KDE4 build problems, once again, see bug #283618
 
   20 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.1.1.ebuild, files/gentoo-3.1.1.diff, +files/dbfix.diff:
diff --git a/app-office/openoffice/files/dbfix.diff b/app-office/openoffice/files/dbfix.diff
deleted file mode 100644
index 776248c33f21..000000000000
--- a/app-office/openoffice/files/dbfix.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.in.orig 
-+++ configure.in 
-@@ -3932,23 +3932,6 @@
-     if test "$DB_INCLUDES" = ""; then
-        AC_MSG_ERROR(no. install the db4-dev package)
-     fi
--    AC_MSG_CHECKING([whether db is at least 4.1])
--    for v in `seq 1 7`; do
--       AC_TRY_RUN([
--#include <db.h>
--
--int main(int argc, char **argv) {
--       if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) 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
-     save_LIBS="$LIBS"
-     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
-        AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
-
diff --git a/app-office/openoffice/files/gentoo-3.1.1.diff b/app-office/openoffice/files/gentoo-3.1.1.diff
index 2319b5faa34c..35e273314dd1 100644
--- a/app-office/openoffice/files/gentoo-3.1.1.diff
+++ b/app-office/openoffice/files/gentoo-3.1.1.diff
@@ -11,29 +11,29 @@
  
  [ LinuxOnly ]
  # fix that allows OOo to work with a standard (unpatched) libjpeg,
---- patches/dev300/kde4-configure.diff 
-+++ patches/dev300/kde4-configure.diff 
-@@ -104,7 +104,7 @@
- +MOC4="moc"
- +if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
- +   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
--+   qt_libdirs="$QTLIB /usr/lib $x_libraries"
-++   qt_libdirs="$QTLIB /usr/lib /usr/lib/qt4 $x_libraries"
- +   
- +   kde_incdirs="/usr/include $x_includes"
- +   kde_libdirs="/usr/lib $x_libraries"
 --- patches/dev300/system-db-check.diff 
 +++ patches/dev300/system-db-check.diff 
-@@ -12,7 +12,7 @@
+@@ -12,14 +12,16 @@
  -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
  -        ], []
  -    )
 -+    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
++-    AC_MSG_CHECKING([whether db is at least 4.1])
++-    for v in `seq 1 7`; do
 ++    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
  +       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
  +    done
  +    if test "$DB_INCLUDES" = ""; then
-@@ -32,7 +32,7 @@
+ +       AC_MSG_ERROR(no. install the db4-dev package)
+ +    fi
+-     AC_MSG_CHECKING([whether db is at least 4.1])
+-     for v in 1 2 3 4 5; do
+++     AC_MSG_CHECKING([whether db is at least 4.1])
+++    for v in `seq 1 8`; do
+         AC_TRY_RUN([
+ @@ -3302,12 +3300,13 @@
+      else
+@@ -32,7 +34,7 @@
  -      [AC_MSG_ERROR([db not installed or functional])], [])
  -    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
  +    save_LIBS="$LIBS"
@@ -42,4 +42,3 @@
  +       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]) ])
-
diff --git a/app-office/openoffice/files/kde4-configure2.diff b/app-office/openoffice/files/kde4-configure2.diff
new file mode 100644
index 000000000000..69b367237811
--- /dev/null
+++ b/app-office/openoffice/files/kde4-configure2.diff
@@ -0,0 +1,74 @@
+--- configure.in.old	2009-08-26 12:25:16.000000000 +0200
++++ configure.in	2009-09-15 14:09:26.000000000 +0200
+@@ -6158,8 +6158,8 @@ KDE4_CFLAGS=""
+ KDE4_LIBS=""
+ MOC4="moc"
+ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
+-   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+-   qt_libdirs="$QTLIB /usr/lib $x_libraries"
++   qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes"
++   qt_libdirs="$QT4LIB /usr/lib $x_libraries"
+    
+    kde_incdirs="/usr/include $x_includes"
+    kde_libdirs="/usr/lib $x_libraries"
+@@ -6169,6 +6169,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE
+       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
+    fi
+ 
++   if test -n "$KDE4DIR" ; then
++      kde_incdirs="$KDE4DIR/include $kde_incdirs"
++      if test "$build_cpu" != "x86_64" ; then
++         kde_libdirs="$KDE4DIR/lib $kde_libdirs"
++      else
++         kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
++      fi
++   fi
++
+    qt_test_include="Qt/qobject.h"
+    qt_test_library="libQtCore.so"
+    kde_test_include="ksharedptr.h"
+@@ -6185,7 +6194,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE
+    
+    AC_MSG_RESULT([$qt_header_dir])
+    if test "x$qt_header_dir" = "xno" ; then
+-      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
++      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
+    fi
+    
+    AC_MSG_CHECKING([for Qt4 libraries])
+@@ -6200,14 +6209,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE
+    AC_MSG_RESULT([$qt_lib_dir])
+    
+    if test "x$qt_lib_dir" = "xno" ; then
+-      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
++      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
+    fi
+ 
+    dnl Check for Meta Object Compiler
+-   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] )
++   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
+    if test "$MOC4" = "no" ; then
+       AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+-the root of your Qt installation by exporting QTDIR before running "configure".])
++the root of your Qt installation by exporting QT4DIR before running "configure".])
+    fi
+ 
+    dnl Check for KDE4 headers
+@@ -6221,7 +6230,7 @@ the root of your Qt installation by expo
+    done
+    AC_MSG_RESULT([$kde_incdir])
+    if test "x$kde_incdir" = "xno" ; then
+-      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
++      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+    fi
+ 
+    dnl Check for KDE4 libraries
+@@ -6236,7 +6245,7 @@ the root of your Qt installation by expo
+    
+    AC_MSG_RESULT([$kde_libdir])
+    if test "x$kde_libdir" = "xno" ; then
+-      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
++      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+    fi
+ 
+    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild
index fd06beb90ac7..9eeeb6c19e5a 100644
--- a/app-office/openoffice/openoffice-3.1.1.ebuild
+++ b/app-office/openoffice/openoffice-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.6 2009/09/20 13:49:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.7 2009/09/22 13:01:26 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -243,7 +243,7 @@ src_prepare() {
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/xulrunner-1.9.1.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die
-	cp -f "${FILESDIR}/dbfix.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/kde4-configure2.diff" "${S}/patches/hotfixes" || die
 
 	#Use flag checks
 	if use java ; then
@@ -304,7 +304,7 @@ src_prepare() {
 
 src_configure() {
 
-	use kde && export KDEDIR="${KDEDIR}"
+	use kde && export KDE4DIR="${KDEDIR}"
 
 	# Use multiprocessing by default now, it gets tested by upstream
 	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")