- up to 1.5.4

Changed files:
    VirtualBox-configure.patch -> 1.6
    VirtualBox-shared-libstdc++.patch -> 1.2

diff --git a/VirtualBox-configure.patch b/VirtualBox-configure.patch
index c787f3e44f8d67d4aedbb6c0d239c411ce04695a..26bb741af94fec9b4410b3c55cbf1b1f18966e55 100644 (file)
--- a/VirtualBox-configure.patch
+++ b/VirtualBox-configure.patch
@@ -4,7 +4,7 @@
  LIBZ="-lz"
  INCPNG=""
  LIBPNG="-lpng"
--QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6"
+-QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
  KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
  DEVDIR="`cd \`dirname $0\`; pwd`/tools"
  if [ -d "/lib/modules/`uname -r`/build" ]; then

diff --git a/VirtualBox-shared-libstdc++.patch b/VirtualBox-shared-libstdc++.patch
index c74a88831a8da74c3f6d23d1677c6e4937b7524e..9e68bb9d1bda8369a87fcf759f5ec7f4d43ba2d3 100644 (file)
--- a/VirtualBox-shared-libstdc++.patch
+++ b/VirtualBox-shared-libstdc++.patch
@@ -1,18 +1,17 @@
-diff -urN VirtualBox-1.5.0_OSE.orig/src/VBox/Additions/linux/xclient/Makefile.kmk VirtualBox-1.5.0_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk
---- VirtualBox-1.5.0_OSE.orig/src/VBox/Additions/linux/xclient/Makefile.kmk    2007-08-30 17:16:27.000000000 +0200
-+++ VirtualBox-1.5.0_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk 2007-09-29 20:05:24.000000000 +0200
+--- VirtualBox-1.5.4_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk 2007-12-30 17:02:00.000000000 +0000
++++ VirtualBox-1.5.4_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk 2007-12-30 17:05:37.000000000 +0000
 @@ -32,10 +32,10 @@
  vboxadd-xclient_DEFS     = _GNU_SOURCE VBOX_HGCM
  
  # link agaginst libstdc++.a (http://www.trilithium.com/johan/2005/06/static-libstdc/)
 -$(PATH_TARGET)/vboxadd-xclient/vboxadd-xclient: $(PATH_TARGET)/vboxadd-xclient/libstdc++.a
-+# $(PATH_TARGET)/vboxadd-xclient/vboxadd-xclient: $(PATH_TARGET)/vboxadd-xclient/libstdc++.a
++#$(PATH_TARGET)/vboxadd-xclient/vboxadd-xclient: $(PATH_TARGET)/vboxadd-xclient/libstdc++.a
  
 -$(PATH_TARGET)/vboxadd-xclient/libstdc++.a:
 -      $(call MSG_L1,Forcing static libstdc++)
--      $(QUIET)ln -s `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
-+# $(PATH_TARGET)/vboxadd-xclient/libstdc++.a:
-+#     $(call MSG_L1,Forcing static libstdc++)
-+#     $(QUIET)ln -s `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
+-      $(QUIET)ln -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
++#$(PATH_TARGET)/vboxadd-xclient/libstdc++.a:
++#     $(call MSG_L1,Forcing static libstdc++)
++#     $(QUIET)ln -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
  
  include       $(PATH_KBUILD)/footer.kmk