aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2006-02-03 19:04:36 +0800
committerlofi <lofi@FreeBSD.org>2006-02-03 19:04:36 +0800
commit050c3fd058373a338161643f99c176081533a779 (patch)
tree21c261d948721bbb1d21b1dc558c1604188623cc /x11
parent411a05c03aa17cad5e1017ba1f1330f079a37899 (diff)
downloadfreebsd-ports-gnome-050c3fd058373a338161643f99c176081533a779.tar.gz
freebsd-ports-gnome-050c3fd058373a338161643f99c176081533a779.tar.zst
freebsd-ports-gnome-050c3fd058373a338161643f99c176081533a779.zip
Fix support for keymaps with local variants (en_US, de_CH etc.) in kxkb.
Diffstat (limited to 'x11')
-rw-r--r--x11/kde4-baseapps/Makefile1
-rw-r--r--x11/kde4-baseapps/files/patch-kxkb-rules.cpp20
-rw-r--r--x11/kde4-runtime/Makefile1
-rw-r--r--x11/kde4-runtime/files/patch-kxkb-rules.cpp20
-rw-r--r--x11/kde4-workspace/Makefile1
-rw-r--r--x11/kde4-workspace/files/patch-kxkb-rules.cpp20
-rw-r--r--x11/kdebase3/Makefile1
-rw-r--r--x11/kdebase3/files/patch-kxkb-rules.cpp20
-rw-r--r--x11/kdebase4-runtime/Makefile1
-rw-r--r--x11/kdebase4-runtime/files/patch-kxkb-rules.cpp20
-rw-r--r--x11/kdebase4-workspace/Makefile1
-rw-r--r--x11/kdebase4-workspace/files/patch-kxkb-rules.cpp20
-rw-r--r--x11/kdebase4/Makefile1
-rw-r--r--x11/kdebase4/files/patch-kxkb-rules.cpp20
14 files changed, 147 insertions, 0 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 61a78c1eb313..9b0309095966 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4-baseapps/files/patch-kxkb-rules.cpp b/x11/kde4-baseapps/files/patch-kxkb-rules.cpp
new file mode 100644
index 000000000000..03baa696dcce
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-kxkb-rules.cpp
@@ -0,0 +1,20 @@
+--- 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/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 61a78c1eb313..9b0309095966 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4-runtime/files/patch-kxkb-rules.cpp b/x11/kde4-runtime/files/patch-kxkb-rules.cpp
new file mode 100644
index 000000000000..03baa696dcce
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-kxkb-rules.cpp
@@ -0,0 +1,20 @@
+--- 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/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 61a78c1eb313..9b0309095966 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4-workspace/files/patch-kxkb-rules.cpp b/x11/kde4-workspace/files/patch-kxkb-rules.cpp
new file mode 100644
index 000000000000..03baa696dcce
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-kxkb-rules.cpp
@@ -0,0 +1,20 @@
+--- 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/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 61a78c1eb313..9b0309095966 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase3/files/patch-kxkb-rules.cpp b/x11/kdebase3/files/patch-kxkb-rules.cpp
new file mode 100644
index 000000000000..03baa696dcce
--- /dev/null
+++ b/x11/kdebase3/files/patch-kxkb-rules.cpp
@@ -0,0 +1,20 @@
+--- 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/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 61a78c1eb313..9b0309095966 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4-runtime/files/patch-kxkb-rules.cpp b/x11/kdebase4-runtime/files/patch-kxkb-rules.cpp
new file mode 100644
index 000000000000..03baa696dcce
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-kxkb-rules.cpp
@@ -0,0 +1,20 @@
+--- 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/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 61a78c1eb313..9b0309095966 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4-workspace/files/patch-kxkb-rules.cpp b/x11/kdebase4-workspace/files/patch-kxkb-rules.cpp
new file mode 100644
index 000000000000..03baa696dcce
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-kxkb-rules.cpp
@@ -0,0 +1,20 @@
+--- 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/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 61a78c1eb313..9b0309095966 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4/files/patch-kxkb-rules.cpp b/x11/kdebase4/files/patch-kxkb-rules.cpp
new file mode 100644
index 000000000000..03baa696dcce
--- /dev/null
+++ b/x11/kdebase4/files/patch-kxkb-rules.cpp
@@ -0,0 +1,20 @@
+--- 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);
generated by cgit (git 2.34.1) at 2024-11-19 01:36:54 +0800