ooo-build r12880 - trunk/patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Fri Jun 13 12:00:43 2008
New Revision: 12880
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12880&view=rev

Log:
Fix application


Modified:
   trunk/patches/dev300/kde4-configure.diff

Modified: trunk/patches/dev300/kde4-configure.diff
==============================================================================
--- trunk/patches/dev300/kde4-configure.diff	(original)
+++ trunk/patches/dev300/kde4-configure.diff	Fri Jun 13 12:00:43 2008
@@ -1,9 +1,9 @@
---- config_office/configure.in	2008-03-20 22:47:28.000000000 +0100
-+++ config_office/configure.in	2008-03-20 23:46:34.000000000 +0100
-@@ -5640,11 +5640,11 @@
- MOC="moc"
+--- config_office/configure.in.kde4~	2008-06-13 12:38:16.341775201 +0200
++++ config_office/configure.in	2008-06-13 13:56:00.377150979 +0200
+@@ -5552,11 +5552,11 @@ MOC="moc"
  if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
-         if test "$build_cpu" != "x86_64" ; then
+     dnl Search paths for Qt and KDE
+     if test "$build_cpu" != "x86_64" ; then
 -        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include $x_includes"
 -        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
 +        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt4/include /usr/lib/qt/include /usr/share/qt4/include $x_includes"
@@ -16,16 +16,7 @@
      fi
      if test -n "$QTDIR" ; then
          qt_incdirs="$QTDIR/include $qt_incdirs"
-@@ -5630,7 +5630,7 @@ your KDE installation by exporting KDEDI
- 
-     dnl Set the variables
-     KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
--    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
-+    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lQtCore -lQtGui"
- fi
- AC_SUBST(KDE_CFLAGS)
- AC_SUBST(KDE_LIBS)
-@@ -5656,11 +5656,11 @@
+@@ -5567,11 +5567,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_
          fi
      fi
      if test "$build_cpu" != "x86_64" ; then
@@ -37,11 +28,11 @@
 -        kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
 -        kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
 +        kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/lib/kde4/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde4/include /opt/kde/include $x_includes"
-+        kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde4 /usr/lib64/kde4/lib /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde4/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde4 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde4/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
++        kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde4 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde4/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
      fi
      if test -n "$KDEDIR" ; then
          kde_incdirs="$KDEDIR/include $kde_incdirs"
-@@ -5672,8 +5672,8 @@
+@@ -5583,8 +5583,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_
      fi
  
      dnl What to test
@@ -52,7 +43,16 @@
      kde_test_include="ksharedptr.h"
      kde_test_library="libkdeui.so"
  
-@@ -5789,12 +5789,13 @@
+@@ -5656,7 +5656,7 @@ your KDE installation by exporting KDEDI
+ 
+     dnl Set the variables
+     KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
+-    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
++    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lQtCore -lQtGui"
+ fi
+ AC_SUBST(KDE_CFLAGS)
+ AC_SUBST(KDE_LIBS)
+@@ -5700,12 +5700,13 @@ if test "$enable_kdeab" = "yes" && test 
     AC_LANG_PUSH([C++])
     save_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"