From 41ff14a680cdb9dc525b2f29373a76cee86f764b Mon Sep 17 00:00:00 2001 From: hawk Date: Thu, 4 Sep 2008 18:26:04 +0000 Subject: [PATCH] - updated for 2.0.0 Changed files: VirtualBox-configure-spaces.patch -> 1.3 VirtualBox-configure.patch -> 1.10 VirtualBox-disable-xclient-build.patch -> 1.5 VirtualBox-qt-paths.patch -> 1.5 VirtualBox-shared-libstdc++.patch -> 1.5 --- VirtualBox-configure-spaces.patch | 7 +- VirtualBox-configure.patch | 110 ++++++++++++++----------- VirtualBox-disable-xclient-build.patch | 9 +- VirtualBox-qt-paths.patch | 25 +++--- VirtualBox-shared-libstdc++.patch | 67 ++++++++------- 5 files changed, 117 insertions(+), 101 deletions(-) diff --git a/VirtualBox-configure-spaces.patch b/VirtualBox-configure-spaces.patch index 62f51bb..f123e16 100644 --- a/VirtualBox-configure-spaces.patch +++ b/VirtualBox-configure-spaces.patch @@ -1,6 +1,7 @@ ---- VirtualBox-1.5.6_OSE/configure~ 2008-02-27 18:34:55.000000000 +0200 -+++ VirtualBox-1.5.6_OSE/configure 2008-02-27 18:35:18.343812355 +0200 -@@ -1297,7 +1297,7 @@ +diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure +--- VirtualBox-2.0.0.orig/configure 2008-09-04 20:08:30.000000000 +0200 ++++ VirtualBox-2.0.0/configure 2008-09-04 20:10:55.000000000 +0200 +@@ -1738,7 +1738,7 @@ # # scan command line options diff --git a/VirtualBox-configure.patch b/VirtualBox-configure.patch index 328d063..36b3cf3 100644 --- a/VirtualBox-configure.patch +++ b/VirtualBox-configure.patch @@ -1,16 +1,19 @@ ---- configure.orig 2008-04-30 16:06:04.000000000 +0200 -+++ configure 2008-05-05 09:33:29.000000000 +0200 -@@ -66,9 +66,6 @@ - LIBZ="-lz" +diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure +--- VirtualBox-2.0.0.orig/configure 2008-09-03 16:59:10.000000000 +0200 ++++ VirtualBox-2.0.0/configure 2008-09-04 20:04:52.000000000 +0200 +@@ -69,11 +69,7 @@ INCPNG="" LIBPNG="-lpng" --QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt" --QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr" + PYTHONDIR="/usr /usr/local" +-QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3" +-QT3DIR="$QT3DIR /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt" +-QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr" + QT4DIR_PKGCONFIG=1 -QT4UIC3DIR="/usr/bin" KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild" DEVDIR="`cd \`dirname $0\`; pwd`/tools" if [ -d "/lib/modules/`uname -r`/build" ]; then -@@ -207,8 +204,8 @@ +@@ -215,8 +211,8 @@ echo "compiling the following source file:" >> $LOG cat .tmp_src.cc >> $LOG echo "using the following command line:" >> $LOG @@ -21,7 +24,7 @@ if [ $? -ne 0 ]; then if [ -z "$4" ]; then echo -@@ -1181,37 +1178,25 @@ +@@ -1236,37 +1232,25 @@ } EOF found_qt=0 @@ -70,15 +73,44 @@ if [ $? -ne 0 ]; then log_failure "not found" fail -@@ -1280,40 +1265,34 @@ - [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"` - if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLDQT4" qt4 qt4 nofatal; then - if test_execute; then --# cnf_append "SDK_VBOX_LIBQT4_INCS" "$INCQT4" --# cnf_append "SDK_VBOX_LIBQT4_LIBS" "`strip_l "$LIBQT4"`" - if [ "$OS" = "darwin" ]; then - cnf_append "VBOX_WITH_QT4GUI" "1" - else +@@ -1343,21 +1327,19 @@ + #endif + } + EOF +- for q in $QT4DIR; do +- INCQT4="$q/include $q/include/QtCore" +- FLGQT4="-DQT_SHARED" +- I_INCQT4=`prefix_I "$INCQT4"` +- LIBQT4="-L$q/lib -lVBoxQtCore" +- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then +- foundqt4=2 +- break; +- fi +- LIBQT4="-L$q/lib -lQtCore" +- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then +- foundqt4=1 +- break; +- fi +- done ++ INCQT4="/usr/include/qt4 /usr/include/qt/QtCore" ++ FLGQT4="-DQT_SHARED" ++ I_INCQT4=`prefix_I "$INCQT4"` ++ LIBQT4="-L/usr/lib/qt4 -lVBoxQtCore" ++ if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then ++ foundqt4=2 ++ break; ++ fi ++ LIBQT4="-L/usr/lib/qt4 -lQtCore" ++ if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then ++ foundqt4=1 ++ break; ++ fi + fi + fi + if [ -n "$foundqt4" ]; then +@@ -1393,21 +1375,19 @@ + cnf_append "VBOX_WITH_QT4_SUN" "1" + fi test_header "Qt4 devtools" - for q in $QT4DIR; do - if which_wrapper "$q/bin/moc" > /dev/null; then @@ -89,22 +121,10 @@ - else - log_success "found version $moc_ver" - cnf_append "VBOX_PATH_QT4" "$q" -- test_header "Qt4 uic3" -- for r in $q/bin $QT4UIC3DIR; do -- if which_wrapper "$r/uic3" > /dev/null; then -- uic3_ver=`$r/uic3 -version 2>&1|sed 's+^.*version \(.*\)+\1+'` -- if [ $? -ne 0 ]; then -- log_failure "not found" -- fail -- else -- log_success "found version $uic3_ver" -- cnf_append "VBOX_UIC3" "$r/uic3" -- return -- fi -- fi -- done -- log_failure "not found" -- fail +- cnf_append "PATH_SDK_QT4" "$q" +- cnf_append "PATH_TOOL_QT4" "$q" +- return +- fi + if which_wrapper "/usr/bin/moc-qt4" > /dev/null; then + moc_ver=`/usr/bin/moc-qt4 -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'` + if [ $? -ne 0 ]; then @@ -113,36 +133,25 @@ + else + log_success "found version $moc_ver" + cnf_append "VBOX_PATH_QT4" "$q" -+ test_header "Qt4 uic3" -+ if which_wrapper "/usr/bin/uic3" > /dev/null; then -+ uic3_ver=`/usr/bin/uic3 -version 2>&1|sed 's+^.*version \(.*\)+\1+'` -+ if [ $? -ne 0 ]; then -+ log_failure "not found" -+ fail -+ else -+ log_success "found version $uic3_ver" -+ cnf_append "VBOX_UIC3" "$r/uic3" -+ return -+ fi - fi -+ log_failure "not found" -+ fail ++ cnf_append "PATH_SDK_QT4" "$q" ++ cnf_append "PATH_TOOL_QT4" "$q" ++ return fi - done + fi fi fi else -@@ -1604,8 +1583,6 @@ +@@ -1765,8 +1745,6 @@ --with-iasl=PATH location of the iasl compiler [$IASL] --with-linux=DIR Linux kernel source directory [$LINUX] --with-mkisofs=PATH location of mkisofs [$MKISOFS] - --with-qt-dir=DIR directory for Qt3 headers/libraries [$QT3DIR] -- --with-qt4-dir=DIR directory for Qt4 headers/libraries [$QT4DIR] +- --with-qt4-dir=DIR directory for Qt4 headers/libraries [pkgconfig] Build type: -d, --build-debug build with debugging symbols and assertions -@@ -1645,12 +1622,6 @@ +@@ -1809,13 +1787,6 @@ exit 1 fi ;; @@ -151,6 +160,7 @@ - ;; - --with-qt4-dir=*) - QT4DIR=`echo $option | cut -d'=' -f2` +- QT4DIR_PKGCONFIG=0 - ;; --with-iasl=*) IASL=`echo $option | cut -d'=' -f2` diff --git a/VirtualBox-disable-xclient-build.patch b/VirtualBox-disable-xclient-build.patch index ea6c072..d21f397 100644 --- a/VirtualBox-disable-xclient-build.patch +++ b/VirtualBox-disable-xclient-build.patch @@ -1,9 +1,10 @@ ---- VirtualBox-1.6.2/src/VBox/Additions/x11/Makefile.kmk.orig 2008-05-13 11:57:37.000000000 +0200 -+++ VirtualBox-1.6.2/src/VBox/Additions/x11/Makefile.kmk 2008-06-08 21:22:56.000000000 +0200 -@@ -24,7 +24,6 @@ +diff -urN VirtualBox-2.0.0.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-2.0.0/src/VBox/Additions/x11/Makefile.kmk +--- VirtualBox-2.0.0.orig/src/VBox/Additions/x11/Makefile.kmk 2008-09-01 17:26:06.000000000 +0200 ++++ VirtualBox-2.0.0/src/VBox/Additions/x11/Makefile.kmk 2008-09-04 20:09:32.000000000 +0200 +@@ -28,7 +28,6 @@ # Include sub-makefiles. - if1of ($(KBUILD_TARGET), freebsd l4 linux solaris) + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) - include $(PATH_SUB_CURRENT)/xclient/Makefile.kmk include $(PATH_SUB_CURRENT)/xgraphics/Makefile.kmk include $(PATH_SUB_CURRENT)/xmouse/Makefile.kmk diff --git a/VirtualBox-qt-paths.patch b/VirtualBox-qt-paths.patch index 882cc7e..58cef82 100644 --- a/VirtualBox-qt-paths.patch +++ b/VirtualBox-qt-paths.patch @@ -1,6 +1,7 @@ ---- Config.kmk.orig 2007-01-16 11:39:32.000000000 +0100 -+++ Config.kmk 2007-01-18 14:32:24.000000000 +0100 -@@ -838,10 +838,10 @@ +diff -urN VirtualBox-2.0.0.orig/Config.kmk VirtualBox-2.0.0/Config.kmk +--- VirtualBox-2.0.0.orig/Config.kmk 2008-09-03 20:16:30.000000000 +0200 ++++ VirtualBox-2.0.0/Config.kmk 2008-09-04 20:06:51.000000000 +0200 +@@ -1694,10 +1694,10 @@ else VBOX_PATH_QT_HOST ?= $(QTDIR) endif @@ -13,20 +14,20 @@ +VBOX_LUPDATE ?= /usr/bin/lupdate$(HOSTSUFF_EXE) +VBOX_LRELEASE ?= /usr/bin/lrelease$(HOSTSUFF_EXE) - # - # The linux kernel headers(/sources). -@@ -1441,7 +1441,7 @@ + ifeq ($(KBUILD_TARGET),os2) + # search DLLs in the EXE directory first (unless VBOX_DLL_QT is set) +@@ -2686,7 +2686,7 @@ + TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS) TEMPLATE_VBOXQTGUIEXE_INCS = \ - $(VBOX_PATH_SDK)/include \ - $(VBOX_PATH_QT)/include + /usr/include/qt - ifeq ($(BUILD_TARGET),win) - TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_VCC_TOOL) -@@ -1843,10 +1843,10 @@ + ifeq ($(KBUILD_TARGET),win) + # drag in library configuration (we need QMAKE_PRL_DEFINES) +@@ -2750,10 +2750,10 @@ - ifeq ($(BUILD_TARGET_ARCH),amd64) + ifeq ($(KBUILD_TARGET_ARCH),amd64) TEMPLATE_VBOXQTGUIEXE_LIBPATH = \ - $(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib + /usr/lib64 /usr/lib @@ -36,4 +37,4 @@ + /usr/lib endif - ifeq ($(BUILD_TARGET),darwin) + ifeq ($(KBUILD_TARGET),linux) diff --git a/VirtualBox-shared-libstdc++.patch b/VirtualBox-shared-libstdc++.patch index 2eaf963..f4c838d 100644 --- a/VirtualBox-shared-libstdc++.patch +++ b/VirtualBox-shared-libstdc++.patch @@ -1,35 +1,10 @@ ---- VirtualBox-1.6.0_OSE/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-04-30 16:05:59.000000000 +0200 -+++ VirtualBox-1.6.0_OSE/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-05-05 09:42:04.000000000 +0200 -@@ -63,14 +63,14 @@ - # Link aginst libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/). - # (It would've been preferred to avoid features depending on libstdc++, of course...) - # --VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient --VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a --VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a --$(PATH_TARGET)/VBoxClient/libstdc++.a: -- $(call MSG_L1,Forcing static libstdc++) -- $(QUIET)$(MKDIR) -p $(@D) -- $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ \ -- || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ -+#VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient -+#VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a -+#VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a -+#$(PATH_TARGET)/VBoxClient/libstdc++.a: -+# $(call MSG_L1,Forcing static libstdc++) -+# $(QUIET)$(MKDIR) -p $(@D) -+# $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ \ -+# || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ - - - ifdef VBOX_X11_SEAMLESS_GUEST ---- VirtualBox-1.6.0_OSE/configure.orig 2008-05-12 10:07:04.000000000 +0200 -+++ VirtualBox-1.6.0_OSE/configure 2008-05-12 10:09:23.000000000 +0200 -@@ -1302,28 +1302,6 @@ - fi +diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure +--- VirtualBox-2.0.0.orig/configure 2008-09-04 20:06:22.000000000 +0200 ++++ VirtualBox-2.0.0/configure 2008-09-04 20:07:39.000000000 +0200 +@@ -1401,29 +1401,7 @@ } -- + -# -# Check whether static libstdc++ is installed -# @@ -51,10 +26,12 @@ - fi -} - - # + +-# # Check for Linux sources # -@@ -1816,7 +1794,6 @@ + check_linux() +@@ -1996,7 +1974,6 @@ # Linux-specific if [ "$OS" = "linux" ]; then @@ -62,3 +39,29 @@ if [ $WITH_KMODS -eq 1 ]; then check_linux else +diff -urN VirtualBox-2.0.0.orig/src/VBox/Additions/x11/xclient/Makefile.kmk VirtualBox-2.0.0/src/VBox/Additions/x11/xclient/Makefile.kmk +--- VirtualBox-2.0.0.orig/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-09-01 17:26:05.000000000 +0200 ++++ VirtualBox-2.0.0/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-09-04 20:07:39.000000000 +0200 +@@ -74,14 +74,14 @@ + # + # Actually, this is darn annoying and will *NOT* be tolerated for any new code! + # +-VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient +-VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a +-VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a +-$(PATH_TARGET)/VBoxClient/libstdc++.a: +- $(call MSG_L1,Forcing static libstdc++) +- $(QUIET)$(MKDIR) -p $(@D) +- $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ +- || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ ++#VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient ++#VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a ++#VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a ++#$(PATH_TARGET)/VBoxClient/libstdc++.a: ++# $(call MSG_L1,Forcing static libstdc++) ++# $(QUIET)$(MKDIR) -p $(@D) ++# $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ ++# || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ + + + ifdef VBOX_X11_SEAMLESS_GUEST -- 2.43.0