- blah, correct paths for Qt4 stuff

Changed files:
    VirtualBox-configure.patch -> 1.11
    VirtualBox-qt-paths.patch -> 1.6

diff --git a/VirtualBox-configure.patch b/VirtualBox-configure.patch
index 36b3cf39b95923da72c15ccc356c54849f476c98..7551478d28a58ba0dde51739d71ccd3c1fca21b8 100644 (file)
--- a/VirtualBox-configure.patch
+++ b/VirtualBox-configure.patch
@@ -95,12 +95,12 @@ diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure
 +      INCQT4="/usr/include/qt4 /usr/include/qt/QtCore"
 +      FLGQT4="-DQT_SHARED"
 +      I_INCQT4=`prefix_I "$INCQT4"`
-+      LIBQT4="-L/usr/lib/qt4 -lVBoxQtCore"
++      LIBQT4="-L/usr/lib -L/usr/lib64 -lVBoxQtCore"
 +      if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
 +        foundqt4=2
 +        break;
 +      fi
-+      LIBQT4="-L/usr/lib/qt4 -lQtCore"
++      LIBQT4="-L/usr/lib -L/usr/lib64 -lQtCore"
 +      if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
 +        foundqt4=1
 +        break;

diff --git a/VirtualBox-qt-paths.patch b/VirtualBox-qt-paths.patch
index 58cef82d23f96cb6d4d6716e6f7fe4a81beaed1a..b6ac3da1e06ecb3f7ced86153910a23e354b5d82 100644 (file)
--- a/VirtualBox-qt-paths.patch
+++ b/VirtualBox-qt-paths.patch
@@ -21,7 +21,7 @@ diff -urN VirtualBox-2.0.0.orig/Config.kmk VirtualBox-2.0.0/Config.kmk
  TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
  TEMPLATE_VBOXQTGUIEXE_INCS = \
 -      $(VBOX_PATH_QT)/include
-+      /usr/include/qt
++      /usr/include/qt4
  
  ifeq ($(KBUILD_TARGET),win)
   # drag in library configuration (we need QMAKE_PRL_DEFINES)