SOURCES: VirtualBox-configure.patch, VirtualBox-qt-paths.patch - updated fo...

hawk hawk at pld-linux.org
Thu Sep 18 12:01:07 CEST 2008


Author: hawk                         Date: Thu Sep 18 10:01:07 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.0.2

---- Files affected:
SOURCES:
   VirtualBox-configure.patch (1.12 -> 1.13) , VirtualBox-qt-paths.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/VirtualBox-configure.patch
diff -u SOURCES/VirtualBox-configure.patch:1.12 SOURCES/VirtualBox-configure.patch:1.13
--- SOURCES/VirtualBox-configure.patch:1.12	Thu Sep  4 22:26:39 2008
+++ SOURCES/VirtualBox-configure.patch	Thu Sep 18 12:01:01 2008
@@ -39,7 +39,7 @@
 -      $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD >> $LOG 2>&1
 -      if [ $? -eq 0 ]; then
 -        if test_execute; then
--          cnf_append "QTDIR" "`cd $q ; pwd`"
+-          cnf_append "PATH_SDK_QT3" "`cd $q ; pwd`"
 -          found_qt=1
 -          break
 -        fi

================================================================
Index: SOURCES/VirtualBox-qt-paths.patch
diff -u SOURCES/VirtualBox-qt-paths.patch:1.8 SOURCES/VirtualBox-qt-paths.patch:1.9
--- SOURCES/VirtualBox-qt-paths.patch:1.8	Thu Sep  4 22:26:17 2008
+++ SOURCES/VirtualBox-qt-paths.patch	Thu Sep 18 12:01:01 2008
@@ -25,16 +25,3 @@
  
  ifeq ($(KBUILD_TARGET),win)
   # drag in library configuration (we need QMAKE_PRL_DEFINES)
-@@ -2750,10 +2750,10 @@
- 
-  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
--	$(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib
-+	/usr/lib64 /usr/lib
-  else
-   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
--	$(VBOX_PATH_QT)/lib
-+	/usr/lib
-  endif
- 
-  ifeq ($(KBUILD_TARGET),linux)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/VirtualBox-configure.patch?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/VirtualBox-qt-paths.patch?r1=1.8&r2=1.9&f=u



More information about the pld-cvs-commit mailing list