From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LtV4O-0000Tj-Ak for garchives@archives.gentoo.org; Mon, 13 Apr 2009 22:56:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A684EE0503; Mon, 13 Apr 2009 22:56:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8618BE0503 for ; Mon, 13 Apr 2009 22:56:03 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 2DD0B64AF7 for ; Mon, 13 Apr 2009 22:56:03 +0000 (UTC) Received: from gengor by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LtV4M-0007Tx-R5 for gentoo-commits@lists.gentoo.org; Mon, 13 Apr 2009 22:56:02 +0000 From: "Gordon Malm (gengor)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, gengor@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in kde-base/systemsettings/files: systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch X-VCS-Directories: kde-base/systemsettings/files X-VCS-Committer: gengor X-VCS-Committer-Name: Gordon Malm Content-Type: text/plain; charset=utf8 Message-Id: Sender: Gordon Malm Date: Mon, 13 Apr 2009 22:56:02 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 00f40876-83b8-4c53-af78-0c62f26d1c2d X-Archives-Hash: 0e13118494e53703500a66f15a34928d gengor 09/04/13 22:56:02 Added: =20 systemsettings-4.2.1-kxkb-strip-hot_plugging-supp= ort.patch Log: Add patch to allow compile with 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 keybo= ard handling software" "http://www.x.org" FALSE "" "xkbfile is required t= o build kxkb.") =20 -macro_bool_to_01(X11_Xinput_FOUND HAVE_XINPUT) -ADD_DEFINITIONS(-DHAVE_XINPUT=3D${HAVE_XINPUT}) - if(X11_Xkbfile_FOUND AND HAVE_XKLAVIER) =20 #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 wi= ll 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: =20 static QString getWindowClass(Window winId, Display* dpy); =20 -#ifdef HAVE_XINPUT static int registerForNewDeviceEvent(Display* dpy); static int isNewDeviceEvent(XEvent* event); +#ifdef HAVE_XINPUT static int m_xinputEventType; #endif =20