- obsoleted

Changed files:
    22-no-static-libstdcpp.patch -> 1.2
    VirtualBox-vboxnetflt-no-qdisc.patch -> 1.2

diff --git a/22-no-static-libstdcpp.patch b/22-no-static-libstdcpp.patch
deleted file mode 100644 (file)
index 7c66035..0000000
--- a/22-no-static-libstdcpp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Do not include statically linked libstdc++.
- Not a good idea if we don't need to be binary-compatible across exotic
- distribution. Doesn't work with trunk glibc heading towards 2.11 anyways.
- Static linking is not really supported anyways.
-Author: Lubomir Rintel <lkundrak@v3.sk>
-Origin: http://cvs.rpmfusion.org/viewvc/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-3.1.0-libcxx.patch?root=free&view=markup
-
-diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/Additions/x11/VBoxClient/Makefile.kmk virtualbox-ose-3.1.0-dfsg/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
---- virtualbox-ose-3.1.0-dfsg~/src/VBox/Additions/x11/VBoxClient/Makefile.kmk  2009-10-07 11:27:13.000000000 +0200
-+++ virtualbox-ose-3.1.0-dfsg/src/VBox/Additions/x11/VBoxClient/Makefile.kmk   2009-10-07 18:44:29.962989537 +0200
-@@ -69,20 +69,6 @@
- ifdef VBOX_WITH_GUEST_PROPS
-  VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
- endif
--#
--# Link against libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/).
--# (It would've been preferred to avoid features depending on libstdc++, of course...)
--#
--# Actually, this is darn annoying and will *NOT* be tolerated for any new code!
--#
--VBoxClient_LIBPATH  += $(VBoxClient_0_OUTDIR)
--VBoxClient_ORDERDEPS = $(VBoxClient_0_OUTDIR)/libstdc++.a
--VBoxClient_CLEAN     = $(VBoxClient_0_OUTDIR)/libstdc++.a
--$$(VBoxClient_0_OUTDIR)/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
-  if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)

diff --git a/VirtualBox-vboxnetflt-no-qdisc.patch b/VirtualBox-vboxnetflt-no-qdisc.patch
deleted file mode 100644 (file)
index 5731625..0000000
--- a/VirtualBox-vboxnetflt-no-qdisc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VirtualBox-4.0.0_OSE/PLD-MODULE-BUILD/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c~     2010-12-29 16:48:42.000000000 +0100
-+++ VirtualBox-4.0.0_OSE/PLD-MODULE-BUILD/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c      2010-12-29 16:50:09.328529008 +0100
-@@ -51,7 +51,7 @@
- #include "../VBoxNetFltInternal.h"
- 
- #ifdef CONFIG_NET_SCHED
--# define VBOXNETFLT_WITH_QDISC /* Comment this out to disable qdisc support */
-+//# define VBOXNETFLT_WITH_QDISC /* Comment this out to disable qdisc support */
- # ifdef VBOXNETFLT_WITH_QDISC
- # include <net/pkt_sched.h>
- # endif /* VBOXNETFLT_WITH_QDISC */