SOURCES: VirtualBox-configure.patch, VirtualBox-qt-paths.patch - blah, corr...

[hawk]

Author: hawk                         Date: Thu Sep  4 18:28:10 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- blah, correct paths for Qt4 stuff

---- Files affected:
SOURCES:
   VirtualBox-configure.patch (1.10 -> 1.11) , VirtualBox-qt-paths.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/VirtualBox-configure.patch
diff -u SOURCES/VirtualBox-configure.patch:1.10 SOURCES/VirtualBox-configure.patch:1.11
--- SOURCES/VirtualBox-configure.patch:1.10	Thu Sep  4 20:26:02 2008
+++ SOURCES/VirtualBox-configure.patch	Thu Sep  4 20:28:04 2008
@@ -95,12 +95,12 @@
 +      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;

================================================================
Index: SOURCES/VirtualBox-qt-paths.patch
diff -u SOURCES/VirtualBox-qt-paths.patch:1.5 SOURCES/VirtualBox-qt-paths.patch:1.6
--- SOURCES/VirtualBox-qt-paths.patch:1.5	Thu Sep  4 20:26:04 2008
+++ SOURCES/VirtualBox-qt-paths.patch	Thu Sep  4 20:28:05 2008
@@ -21,7 +21,7 @@
  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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/VirtualBox-configure.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/VirtualBox-qt-paths.patch?r1=1.5&r2=1.6&f=u