Add patch to allow compile with <gcc-4.1.2.

(Portage version: 2.1.6.7/cvs/Linux i686, RepoMan options: --force)

3 files changed, 61 insertions, 2 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index fb04fceb6c65..ce664f405f87 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.27 2009/04/12 06:47:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.28 2009/04/13 22:56:02 gengor Exp $
+
+  13 Apr 2009; Gordon Malm <gengor@gentoo.org>
+  +files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch,
+  systemsettings-4.2.1-r1.ebuild:
+  Add patch to enable compile with <gcc-4.1.2.
 
 *systemsettings-4.2.2 (11 Apr 2009)
 
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
new file mode 100644
index 000000000000..04c5707170c3
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch
@@ -0,0 +1,44 @@
+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
+ 
diff --git a/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild b/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild
index 6aadb20bf7c1..ce0b2de96640 100644
--- a/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild,v 1.3 2009/04/11 19:51:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild,v 1.4 2009/04/13 22:56:02 gengor Exp $
 
 EAPI="2"
 
@@ -59,6 +59,16 @@ src_prepare() {
 		systemsettings/CMakeLists.txt \
 		|| die "Failed to fix systemsettingsrc install location"
 
+	if ! version_is_at_least 4.1.2 "$(gcc-fullversion)" ; then
+		ewarn
+		ewarn "The kxkb module will be built without keyboard hot-plugging"
+		ewarn "support.  GCC version 4.1.2 or greater is required to build"
+		ewarn "kxkb's keyboard hot-plugging code."
+		ewarn
+		ebeep 5
+		epatch "$FILESDIR/${P}-kxkb-strip-hot_plugging-support.patch"
+	fi
+
 	kde4-meta_src_prepare
 }