summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2006-02-03 17:39:42 +0000
committerCarsten Lohrke <carlo@gentoo.org>2006-02-03 17:39:42 +0000
commit8dbac8ce0634dbec757e7b505c58f1663116d3db (patch)
tree2b58c5e262ea93519d0aa54bb8d72f66fc401518 /kde-base/kxkb
parentStable on hppa. (diff)
downloadhistorical-8dbac8ce0634dbec757e7b505c58f1663116d3db.tar.gz
historical-8dbac8ce0634dbec757e7b505c58f1663116d3db.tar.bz2
historical-8dbac8ce0634dbec757e7b505c58f1663116d3db.zip
Load keyboard layouts with uppercase letters, #121444.
Package-Manager: portage-2.0.54
Diffstat (limited to 'kde-base/kxkb')
-rw-r--r--kde-base/kxkb/ChangeLog8
-rw-r--r--kde-base/kxkb/files/digest-kxkb-3.5.1-r11
-rw-r--r--kde-base/kxkb/files/kxkb3.5.1.xx_XX_layouts.patch22
-rw-r--r--kde-base/kxkb/kxkb-3.5.1-r1.ebuild20
4 files changed, 50 insertions, 1 deletions
diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index 17c9586ab23a..28940f1bb102 100644
--- a/kde-base/kxkb/ChangeLog
+++ b/kde-base/kxkb/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-base/kxkb
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.40 2006/01/22 22:53:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.41 2006/02/03 17:39:42 carlo Exp $
+
+*kxkb-3.5.1-r1 (03 Feb 2006)
+
+ 03 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
+ +files/kxkb3.5.1.xx_XX_layouts.patch, +kxkb-3.5.1-r1.ebuild:
+ Load keyboard layouts with uppercase letters, #121444.
*kxkb-3.5.1 (23 Jan 2006)
diff --git a/kde-base/kxkb/files/digest-kxkb-3.5.1-r1 b/kde-base/kxkb/files/digest-kxkb-3.5.1-r1
new file mode 100644
index 000000000000..a74001cfd2ff
--- /dev/null
+++ b/kde-base/kxkb/files/digest-kxkb-3.5.1-r1
@@ -0,0 +1 @@
+MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kxkb/files/kxkb3.5.1.xx_XX_layouts.patch b/kde-base/kxkb/files/kxkb3.5.1.xx_XX_layouts.patch
new file mode 100644
index 000000000000..741c0d348ffa
--- /dev/null
+++ b/kde-base/kxkb/files/kxkb3.5.1.xx_XX_layouts.patch
@@ -0,0 +1,22 @@
+Index: rules.cpp
+===================================================================
+--- kxkb/rules.cpp (revision 504758)
++++ kxkb/rules.cpp (working copy)
+@@ -300,7 +300,7 @@
+ */
+ const QString KeyRules::getLayout(const QString &layvar) const
+ {
+- static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
++ static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*";
+ QString varLine = layvar.stripWhiteSpace();
+ QRegExp rx(LAYOUT_PATTERN);
+ int pos = rx.search(varLine, 0);
+@@ -318,7 +318,7 @@
+ */
+ const QString KeyRules::getVariant(const QString &layvar) const
+ {
+- static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
++ static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
+ QString varLine = layvar.stripWhiteSpace();
+ QRegExp rx(VARIANT_PATTERN);
+ int pos = rx.search(varLine, 0);
diff --git a/kde-base/kxkb/kxkb-3.5.1-r1.ebuild b/kde-base/kxkb/kxkb-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..e98ca33a8631
--- /dev/null
+++ b/kde-base/kxkb/kxkb-3.5.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.1-r1.ebuild,v 1.1 2006/02/03 17:39:42 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="Kicker applet for management of X keymaps"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+ || ( (
+ x11-misc/xkbdata
+ x11-apps/setxkbmap
+ ) virtual/x11 )"
+
+PATCHES="${FILESDIR}/kxkb3.5.1.xx_XX_layouts.patch"