SOURCES: VirtualBox-configure.patch, VirtualBox-qt-paths.patch - u...

[undefine]

Author: undefine                     Date: Tue Feb 27 00:14:05 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 1.3.6

---- Files affected:
SOURCES:
   VirtualBox-configure.patch (1.1 -> 1.2) , VirtualBox-qt-paths.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/VirtualBox-configure.patch
diff -u SOURCES/VirtualBox-configure.patch:1.1 SOURCES/VirtualBox-configure.patch:1.2
--- SOURCES/VirtualBox-configure.patch:1.1	Fri Jan 19 13:51:50 2007
+++ SOURCES/VirtualBox-configure.patch	Tue Feb 27 01:14:00 2007
@@ -4,7 +4,7 @@
  LIBZ="-lz"
  INCPNG=""
  LIBPNG="-lpng"
--QTDIR="/usr/qt/3 /usr/share/qt3"
+-QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/share/qt3"
  KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
  DEVDIR="`cd $(dirname $0); pwd`/tools"
  if [ -d /lib/modules/`uname -r`/build ]; then
@@ -19,7 +19,7 @@
    if (($?!=0)); then
      if [ -z "$4" ]; then
        echo -e "\n  $2 not found at $1 or $3 headers not found"
-@@ -804,29 +803,25 @@
+@@ -873,29 +873,25 @@
  }
  ' > .tmp_src.cc
    found_qt=0
@@ -27,7 +27,7 @@
 -    echo "compiling the following source file:" >> $LOG
 -    cat .tmp_src.cc >> $LOG
 -    echo "using the following command line:" >> $LOG
--    echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"-I$q/include -L$q/lib -lqt-mt\"" >> $LOG
+-    echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt" >> $LOG
 -    $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt >> $LOG 2>&1
 -    if (($?==0)); then
 -      if test_execute; then

================================================================
Index: SOURCES/VirtualBox-qt-paths.patch
diff -u SOURCES/VirtualBox-qt-paths.patch:1.1 SOURCES/VirtualBox-qt-paths.patch:1.2
--- SOURCES/VirtualBox-qt-paths.patch:1.1	Fri Jan 19 13:52:26 2007
+++ SOURCES/VirtualBox-qt-paths.patch	Tue Feb 27 01:14:00 2007
@@ -24,12 +24,12 @@
  
  ifeq ($(BUILD_TARGET),win)
   TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_VCC_TOOL)
-@@ -1498,7 +1498,7 @@
+@@ -1616,7 +1616,7 @@
   	$(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB)
  
   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
 - 	$(VBOX_PATH_QT)/lib \
 + 	/usr/lib \
-  	/usr/X11R6/lib
+ 	$(VBOX_LIBPATH_X11)
  
  endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/VirtualBox-configure.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/VirtualBox-qt-paths.patch?r1=1.1&r2=1.2&f=u