summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-11-20 00:28:56 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-11-20 00:28:56 +0000
commitf62102d466a1b76bd13dc451fdf40362ae7f498e (patch)
tree913c6e0725f22009d6fdb8128a98d8c2f7cca507 /kde-base/kdebase/files/kxkb-3.5.0_rc1-modularx.patch
parentversion bump as per bug #112850 (diff)
downloadgentoo-2-f62102d466a1b76bd13dc451fdf40362ae7f498e.tar.gz
gentoo-2-f62102d466a1b76bd13dc451fdf40362ae7f498e.tar.bz2
gentoo-2-f62102d466a1b76bd13dc451fdf40362ae7f498e.zip
Added backport of revision 481658 to let kxkb find the data while using modular X.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'kde-base/kdebase/files/kxkb-3.5.0_rc1-modularx.patch')
-rw-r--r--kde-base/kdebase/files/kxkb-3.5.0_rc1-modularx.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/kde-base/kdebase/files/kxkb-3.5.0_rc1-modularx.patch b/kde-base/kdebase/files/kxkb-3.5.0_rc1-modularx.patch
new file mode 100644
index 000000000000..82d7cb0c9739
--- /dev/null
+++ b/kde-base/kdebase/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;