diff options
| -rw-r--r-- | kde-base/kxkb/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kxkb/files/kxkb-3.5.0_rc1-modularx.patch | 20 | ||||
| -rw-r--r-- | kde-base/kxkb/kxkb-3.5.0_rc1.ebuild | 6 |
3 files changed, 30 insertions, 3 deletions
diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog index b53f4d06171d..b83b71c0a5b1 100644 --- a/kde-base/kxkb/ChangeLog +++ b/kde-base/kxkb/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kxkb # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.22 2005/11/12 15:49:35 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.23 2005/11/19 23:58:55 flameeyes Exp $ + + 19 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/kxkb-3.5.0_rc1-modularx.patch, kxkb-3.5.0_rc1.ebuild: + Added backport of revision 481658 to let kxkb find the data while using + modular X. *kxkb-3.5.0_rc1 (12 Nov 2005) diff --git a/kde-base/kxkb/files/kxkb-3.5.0_rc1-modularx.patch b/kde-base/kxkb/files/kxkb-3.5.0_rc1-modularx.patch new file mode 100644 index 000000000000..82d7cb0c9739 --- /dev/null +++ b/kde-base/kxkb/files/kxkb-3.5.0_rc1-modularx.patch @@ -0,0 +1,20 @@ +Index: kdebase/kxkb/rules.cpp +=================================================================== +--- kdebase/kxkb/rules.cpp (revision 481653) ++++ kdebase/kxkb/rules.cpp (working copy) +@@ -17,13 +17,13 @@ + + #include "rules.h" + +-const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; ++const char* X11DirList[3] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/", "/usr/share/X11/"}; + const char* rulesFileList[2] = {"xkb/rules/xorg", "xkb/rules/xfree86"}; + + KeyRules::KeyRules(): + m_layouts(90) + { +- for(int ii=0; ii<2; ii++) ++ for(int ii=0; ii<3; ii++) + if( QDir(X11DirList[ii]).exists() ) { + X11_DIR = X11DirList[ii]; + break; diff --git a/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild b/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild index bc952735e6d2..73a83e0b044b 100644 --- a/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild +++ b/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild,v 1.2 2005/11/19 23:58:55 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV @@ -11,4 +11,6 @@ DESCRIPTION="Kicker applet for management of X keymaps" KEYWORDS="~amd64 ~x86" IUSE="" - +# Make sure that modularx share dir is checked while using kxkb. Already +# committed for 3.5.0 final. +PATCHES="${FILESDIR}/${P}-modularx.patch" |