diff options
| author |   Alex Alexander <wired@gentoo.org> | 2009-07-19 22:52:53 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2009-07-19 22:52:53 +0000 |
| commit | e0f423b22f569c1d5d3167c2e94dad47b3d9dad5 (patch) | |
| tree | d795184a217da126427a95c1b7d21d7e22099f5c /kde-base | |
| parent | stable sparc, bug 274468 (diff) | |
| download | gentoo-2-e0f423b22f569c1d5d3167c2e94dad47b3d9dad5.tar.gz gentoo-2-e0f423b22f569c1d5d3167c2e94dad47b3d9dad5.tar.bz2 gentoo-2-e0f423b22f569c1d5d3167c2e94dad47b3d9dad5.zip | |
added patch for xklavier-4.0, b.k.o. #199740
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/systemsettings/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch | 11 | ||||
| -rw-r--r-- | kde-base/systemsettings/systemsettings-4.2.4.ebuild | 6 |
3 files changed, 21 insertions, 2 deletions
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog index 680930eb7b40..520b48157e99 100644 --- a/kde-base/systemsettings/ChangeLog +++ b/kde-base/systemsettings/ChangeLog @@ -1,6 +1,10 @@ # 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.37 2009/06/14 11:58:43 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.38 2009/07/19 22:52:53 wired Exp $ + + 19 Jul 2009; Alex Alexander <wired@gentoo.org> + +files/10_xklavier_adaptor_fix.patch, systemsettings-4.2.4.ebuild: + added patch for xklavier-4.0, b.k.o. #199740 14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> -systemsettings-4.2.3.ebuild: diff --git a/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch b/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch new file mode 100644 index 000000000000..f52e4ab3bfd6 --- /dev/null +++ b/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch @@ -0,0 +1,11 @@ +--- 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/systemsettings-4.2.4.ebuild b/kde-base/systemsettings/systemsettings-4.2.4.ebuild index bbd7806bdea4..0777bcb064ec 100644 --- a/kde-base/systemsettings/systemsettings-4.2.4.ebuild +++ b/kde-base/systemsettings/systemsettings-4.2.4.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.4.ebuild,v 1.1 2009/06/04 13:56:24 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.4.ebuild,v 1.2 2009/07/19 22:52:53 wired Exp $ EAPI="2" @@ -69,6 +69,10 @@ src_prepare() { systemsettings/CMakeLists.txt \ || die "Failed to fix systemsettingsrc install location" + if has_version ">=x11-libs/libxklavier-4.0"; then + epatch "${FILESDIR}"/10_xklavier_adaptor_fix.patch + fi + if ! version_is_at_least 4.1.2 "$(gcc-fullversion)" ; then ewarn ewarn "The kxkb module will be built without keyboard hot-plugging" |