[arch-commits] Commit in (5 files)

[Jan Steffens]

    Date: Saturday, January 16, 2021 @ 22:43:29
  Author: heftig
Revision: 821187

extra2community: Moving caribou from extra to community

Added:
  caribou/
  caribou/repos/
  caribou/trunk/
  caribou/trunk/PKGBUILD
  caribou/trunk/unicode_to_keyval-symbol-check.patch

--------------------------------------+
 PKGBUILD                             |   58 +++++++++++++++++++++++++++++++++
 unicode_to_keyval-symbol-check.patch |   13 +++++++
 2 files changed, 71 insertions(+)

Added: caribou/trunk/PKGBUILD
===================================================================
--- caribou/trunk/PKGBUILD	                        (rev 0)
+++ caribou/trunk/PKGBUILD	2021-01-16 22:43:29 UTC (rev 821187)
@@ -0,0 +1,58 @@
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: Adam Hani Schakaki <krzd at krzd.net>
+
+pkgname=caribou
+pkgver=0.4.21+66+g14f5428
+pkgrel=2
+pkgdesc="A text entry and UI navigation application (on-screen keyboard)"
+arch=('x86_64')
+url="http://live.gnome.org/Caribou"
+license=(LGPL)
+depends=(at-spi2-atk python-atspi python-gobject gtk3 libxklavier libgee clutter dconf)
+makedepends=(intltool docbook-xsl gtk2 gobject-introspection vala git gnome-common)
+options=(!emptydirs)
+_commit=14f54287535ea3b5914638843710a8cef7b68e68  # master
+source=("git+https://gitlab.gnome.org/GNOME/caribou.git#commit=$_commit"
+        unicode_to_keyval-symbol-check.patch)
+sha256sums=('SKIP'
+            '7b8969c275df30613531728408d75af1af22199b4fe3835d5ef67355f747799e')
+
+pkgver() {
+  cd $pkgname
+  git describe --long | sed -e 's/-/+/g' -e 's/^CARIBOU_//' -e 's/_/./g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # https://gitlab.gnome.org/GNOME/caribou/-/issues/7
+  patch -Np1 -i ../unicode_to_keyval-symbol-check.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --libexecdir=/usr/lib/$pkgname \
+    --disable-static \
+    --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+check() {
+  cd $pkgname
+  make -k check
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Added: caribou/trunk/unicode_to_keyval-symbol-check.patch
===================================================================
--- caribou/trunk/unicode_to_keyval-symbol-check.patch	                        (rev 0)
+++ caribou/trunk/unicode_to_keyval-symbol-check.patch	2021-01-16 22:43:29 UTC (rev 821187)
@@ -0,0 +1,13 @@
+diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala
+index 89015bc..e88342e 100644
+--- a/libcaribou/key-model.vala
++++ b/libcaribou/key-model.vala
+@@ -101,7 +101,7 @@ namespace Caribou {
+                     unichar uc;
+                     while (text.get_next_char (ref index, out uc)) {
+                         uint keyval = Gdk.unicode_to_keyval (uc);
+-                        if (keyval != uc | 0x01000000)
++                        if (keyval != (uc | 0x01000000))
+                             _keyvals += keyval;
+                     }
+                 } else {