Drop unneeded patches

(Portage version: -svn/cvs/Linux i686)

3 files changed, 6 insertions, 56 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index 964b9d2f804e..36727b7b19df 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.51 2009/11/09 00:22:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.52 2009/11/09 10:36:21 abcd Exp $
+
+  09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/10_xklavier_adaptor_fix.patch,
+  -files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch:
+  Drop unneeded patches
 
   08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -systemsettings-4.3.2.ebuild:
diff --git a/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch b/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch
deleted file mode 100644
index f52e4ab3bfd6..000000000000
--- a/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kcontrol/kxkb/xklavier_adaptor.cpp.old	2009-07-20 01:25:48.780492221 +0300
-+++ kcontrol/kxkb/xklavier_adaptor.cpp	2009-07-20 01:26:02.047358319 +0300
-@@ -222,7 +222,7 @@
-     kDebug() << "Xklavier initialized";
-     priv->config = xkl_config_registry_get_instance(priv->engine);
- 
--    xkl_config_registry_load(priv->config);
-+    xkl_config_registry_load(priv->config,false);
- 	
-     void *userData = priv;
- 
diff --git a/kde-base/systemsettings/files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch b/kde-base/systemsettings/files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch
deleted file mode 100644
index 04c5707170c3..000000000000
--- a/kde-base/systemsettings/files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Gordon Malm <gengor@gentoo.org>
-
-Strip keyboard hot-plugging support out of systemsettings' kxkb module.
-Systemsettings' keyboard hot-plugging code relies on override abilities
-found only in GCC 4.1.2 and later.
-
-See: http://bugs.gentoo.org/256827
-
---- a/kcontrol/kxkb/CMakeLists.txt
-+++ b/kcontrol/kxkb/CMakeLists.txt
-@@ -51,9 +51,6 @@ if(USE_XKLAVIER STREQUAL ON)
- endif(USE_XKLAVIER STREQUAL ON)
- macro_log_feature(X11_Xkbfile_FOUND "xkbfile" "X11 KXB library for keyboard handling software" "http://www.x.org" FALSE "" "xkbfile is required to build kxkb.")
- 
--macro_bool_to_01(X11_Xinput_FOUND HAVE_XINPUT)
--ADD_DEFINITIONS(-DHAVE_XINPUT=${HAVE_XINPUT})
--
- if(X11_Xkbfile_FOUND AND HAVE_XKLAVIER)
- 
- #MESSAGE("xkb support libs:: ${XKB_SUPPORT_LIB}")
---- a/kcontrol/kxkb/x11helper.cpp
-+++ b/kcontrol/kxkb/x11helper.cpp
-@@ -425,7 +425,7 @@ X11Helper::isNewDeviceEvent(XEvent* even
- int
- X11Helper::registerForNewDeviceEvent(Display* display)
- {
--    kWarn() << "Kxkb is compiled without XInput, xkb configuration will be reset when new keyboard device is plugged in!";
-+    kWarning() << "Kxkb is compiled without XInput, xkb configuration will be reset when new keyboard device is plugged in!";
-     return -1;
- }
- #endif
---- a/kcontrol/kxkb/x11helper.h
-+++ b/kcontrol/kxkb/x11helper.h
-@@ -64,9 +64,9 @@ public:
- 
- 	static QString getWindowClass(Window winId, Display* dpy);
- 
--#ifdef HAVE_XINPUT
-         static int registerForNewDeviceEvent(Display* dpy);
-         static int isNewDeviceEvent(XEvent* event);
-+#ifdef HAVE_XINPUT
-         static int m_xinputEventType;
- #endif
-