Initial Commit v0.1.4.3

3 files changed, 92 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..c8ce1957da28
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,16 @@
+pkgbase = python-xkbgroup
+	pkgdesc = Query and change XKB layout state
+	pkgver = 0.1.4.3
+	pkgrel = 1
+	url = https://github.com/hcpl/xkbgroup
+	arch = any
+	license = MIT
+	makedepends = python
+	depends = python
+	source = https://github.com/hcpl/xkbgroup/archive/v0.1.4.3.tar.gz
+	source = xkbgroup.patch
+	md5sums = 82ed59597add176fa8b69835de83f841
+	md5sums = fb81fd181f54b9dd743d12da03f4be47
+
+pkgname = python-xkbgroup
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..aa8f0a676dcc
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: arkhan <e@ibañez.org>
+
+pkgname=python-xkbgroup
+_name=xkbgroup
+pkgver=0.1.4.3
+pkgrel=1
+pkgdesc="Query and change XKB layout state"
+arch=("any")
+url="https://github.com/hcpl/xkbgroup"
+license=("MIT")
+depends=("python")
+makedepends=("python")
+source=("https://github.com/hcpl/${_name}/archive/v${pkgver}.tar.gz"
+        "$_name.patch")
+md5sums=('82ed59597add176fa8b69835de83f841'
+         'fb81fd181f54b9dd743d12da03f4be47')
+
+prepare() {
+  cd "$srcdir/$_name-$pkgver"
+
+  patch -p1 -i "$srcdir/$_name.patch"
+}
+
+build() {
+  cd "$srcdir/$_name-$pkgver"
+  python setup.py build
+}
+
+package() {
+  cd "$srcdir/$_name-$pkgver"
+  python setup.py install --prefix=/usr --root "${pkgdir}" || return 1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/xkbgroup.patch b/xkbgroup.patch
new file mode 100644
index 000000000000..c1aa3c7d207a
--- /dev/null
+++ b/xkbgroup.patch
@@ -0,0 +1,42 @@
+diff --git a/xkbgroup/core.py b/xkbgroup/core.py
+index ee72a52..c54f61f 100644
+--- a/xkbgroup/core.py
++++ b/xkbgroup/core.py
+@@ -124,7 +124,7 @@ class XKeyboard:
+ 
+     # Fields with default values
+ 
+-    non_symbols = {"pc", "inet", "group", "terminate"}
++    non_symbols = {"capslock", "pc", "inet", "group", "terminate"}
+ 
+ 
+     # Main methods
+@@ -451,7 +451,7 @@ class XKeyboard:
+ SymbolData = namedtuple("SymbolData", ["symbol", "variant", "index"])
+ SYMBOL_REGEX = re.compile(r"""
+     (?P<symbol>\w+)
+-    (?: \( (?P<variant>\w+) \) )?
++    (?: \( (?P<variant>\w+.*) \) )?
+     (?: : (?P<index>\d+) )?
+     """, re.VERBOSE)
+ 
+@@ -484,7 +484,7 @@ def _parse_symbols(symbols_str, non_symbols, default_index=0):
+                 match.group('variant'),
+                 int(index) - 1 if index else default_index)
+         else:
+-            raise X11Error("Malformed symbol string: \"{}\"".format(symstr))
++            raise X11Error("Malformed symbol string: {!r}".format(symstr))
+ 
+     symboldata_list = []
+     for symstr in symbols_str.split('+'):
+@@ -493,8 +493,8 @@ def _parse_symbols(symbols_str, non_symbols, default_index=0):
+             symboldata_list.append(symboldata)
+ 
+     indices = [symdata.index for symdata in symboldata_list]
+-    assert len(indices) == len(set(indices))    # No doubles
+-
++    assert len(indices) == len(set(indices)), ("Duplicate index in %r" %
++                                               symboldata_list)
+     return symboldata_list
+ 
+