Date: Monday, November 16, 2020 @ 09:34:26
Author: foutrelis
Revision: 401251
Fix build with current Vala version
Also change source to gitlab.gnome.org and bump to latest revision.
Added:
caribou/trunk/unicode_to_keyval-symbol-check.patch
Modified:
caribou/trunk/PKGBUILD
--------------------------------------+
PKGBUILD | 16 +++++++++++-----
unicode_to_keyval-symbol-check.patch | 13 +++++++++++++
2 files changed, 24 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-16 09:29:00 UTC (rev 401250)
+++ PKGBUILD 2020-11-16 09:34:26 UTC (rev 401251)
@@ -2,8 +2,8 @@
# Contributor: Adam Hani Schakaki <k...@krzd.net>
pkgname=caribou
-pkgver=0.4.21+60+gec9041b
-pkgrel=3
+pkgver=0.4.21+66+g14f5428
+pkgrel=1
pkgdesc="A text entry and UI navigation application (on-screen keyboard)"
arch=('x86_64')
url="http://live.gnome.org/Caribou";
@@ -11,9 +11,11 @@
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=ec9041baf3a42fee24e34318e04ae4f5349bd7ec # master
-source=("git+https://git.gnome.org/browse/caribou#commit=$_commit";)
-sha256sums=('SKIP')
+_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
@@ -22,6 +24,10 @@
prepare() {
cd $pkgname
+
+ # https://gitlab.gnome.org/GNOME/caribou/-/issues/7
+ patch -Np1 -i ../unicode_to_keyval-symbol-check.patch
+
NOCONFIGURE=1 ./autogen.sh
}
Added: unicode_to_keyval-symbol-check.patch
===================================================================
--- unicode_to_keyval-symbol-check.patch (rev 0)
+++ unicode_to_keyval-symbol-check.patch 2020-11-16 09:34:26 UTC (rev
401251)
@@ -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 {
