[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                |    1 
 patches/dev300/kde4-configure2.diff |   74 ++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)

New commits:
commit 711936076c760474e6b9ae995b40a39f64cb982d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Sep 16 16:35:12 2009 +0200

    non-conflicting conf. variables for KDE3 and KDE4 (i#105127, bnc#539035)
    
    * patches/dev300/kde4-configure2.diff:
    * patches/dev300/apply: rename KDE variables to QT4INC QT4DIR QT4LIB KDE4DIR,
      to avoid conflict with KDE3 setting; these variables point to a non-standard
      KDE4 installation dir

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e084583..4489b31 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2136,6 +2136,7 @@ SectionIssue => i#103283
 
 # KDE4 support by Eric Bischoff, Bernhard Rosenkraenzer and Roman Shtylman
 kde4-configure.diff, i#103288
+kde4-configure2.diff, i#105127, bnc#539035, pmladek
 kde4-buildfix-connectivity.diff
 
 kde4-shell-prj.diff, i#103286
diff --git a/patches/dev300/kde4-configure2.diff b/patches/dev300/kde4-configure2.diff
new file mode 100644
index 0000000..fde4098
--- /dev/null
+++ b/patches/dev300/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 $QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
++   qt_libdirs="$QT4LIB $QTLIB /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"