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

Package-Manager: portage-2.0.53_rc7

diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index b53f4d06171db11f02998d0222f93ec9b48bb20a..b83b71c0a5b13e21b1270a1b8e3cd09ae768dead 100644 (file)
--- 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/Manifest b/kde-base/kxkb/Manifest
index 63bd4a908bf9a6b957de5e3f429cc84f8f0dded1..2c67b5a49d064760f3c92cc3c6e31327b009ad4a 100644 (file)
--- a/kde-base/kxkb/Manifest
+++ b/kde-base/kxkb/Manifest
@@ -1,14 +1,25 @@
-MD5 9eafc7b5ebf629beeb328f591ae432ca ChangeLog 2961
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7916c8ec4644de4b9973c6947073380f ChangeLog 3166
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kxkb-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kxkb-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kxkb-3.4.3 68
 MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kxkb-3.5.0_beta2 216
 MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kxkb-3.5.0_rc1 299
 MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kxkb-3.5_beta1 69
+MD5 6dfdd0c3f860e595b1ba5ba09d4f32f7 files/kxkb-3.5.0_rc1-modularx.patch 672
 MD5 421bfb1b3a38ff0fa7428dca89981ff3 kxkb-3.4.1.ebuild 399
 MD5 fba2ac6062d3c7e87e6c3762ee19c245 kxkb-3.4.2.ebuild 412
 MD5 52fe951560ae65919fdf933f5383f135 kxkb-3.4.3.ebuild 414
 MD5 681771e7197b4ec5df0f660984442616 kxkb-3.5.0_beta2.ebuild 393
-MD5 fce705fd8ec89a5c68c57811b4460f63 kxkb-3.5.0_rc1.ebuild 392
+MD5 9b049a9fb60ebe37aa2681057e2a87f2 kxkb-3.5.0_rc1.ebuild 536
 MD5 502fb2bcf8ae48d72ec2e1fc034d98d3 kxkb-3.5_beta1.ebuild 391
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf7xaAiZjviIA2XgRAlyDAJ45/aiQfwtQ6gaXkhXJvYSwgoWQQgCfREjR
+bLIyZyEGNHrsIcpMZAfynHw=
+=xQeb
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..82d7cb0
--- /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 bc952735e6d2c2eaf9a169d0591f8ce642ce517e..73a83e0b044bf00fe03627e4947d707328fe36b0 100644 (file)
--- 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"