Added backport of revision 481658 to let kxkb find the data while using modular X.

(Portage version: 2.0.53_rc7)

3 files changed, 31 insertions, 2 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 3fcd5371bb18..149687d460dd 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.227 2005/11/16 09:50:32 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.228 2005/11/20 00:28:56 flameeyes Exp $
+
+  20 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kxkb-3.5.0_rc1-modularx.patch, kdebase-3.5.0_rc1.ebuild:
+  Added backport of revision 481658 to let kxkb find the data while using
+  modular X.
 
 *kdebase-3.5.0_rc1 (16 Nov 2005)
 
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;
diff --git a/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild b/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild
index 375504a0d220..89e9429d4505 100644
--- a/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild
+++ b/kde-base/kdebase/kdebase-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/kdebase/kdebase-3.5.0_rc1.ebuild,v 1.1 2005/11/16 09:50:32 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild,v 1.2 2005/11/20 00:28:56 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -43,6 +43,10 @@ src_unpack() {
 	# Avoid using imake (kde bug 114466).
 	epatch "${FILESDIR}/kdebase-3.5.0_beta2-noimake.patch"
 
+	# Let kxkb search in Xorg 7.0 default path (kde rev 481658, applied for
+	# final).
+	epatch "${FILESDIR}/kxkb-${PV}-modularx.patch"
+
 	# For the noimake patch.
 	make -f admin/Makefile.common || die
 }