caribou: restore package

Upstream patches allow build to succeed with new vala and
gobject-introspection. It seems libcaribou is still required by the lock
screen in Cinnamon, so the package must be restored.

This reverts commit 5b0c846dd8.

srcpkgs/caribou-devel

@@ -0,0 +1 @@
+caribou

srcpkgs/caribou/patches/autostart-set-nodisplay.patch

@@ -0,0 +1,21 @@
+From 286582f90fbbc9b3baa6b055bba1141cc30e6e94 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Thu, 12 Oct 2017 18:14:35 -0400
+Subject: autostart: Set NoDisplay=true
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788906
+https://launchpad.net/bugs/1723266
+---
+ data/caribou-autostart.desktop.in.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/caribou-autostart.desktop.in.in b/data/caribou-autostart.desktop.in.in
+index 4bd1c03..bf73a94 100644
+--- a/data/caribou-autostart.desktop.in.in
++++ b/data/caribou-autostart.desktop.in.in
+@@ -5,4 +5,5 @@ Exec=@libexecdir@/caribou
+ AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
+ X-GNOME-AutoRestart=true
+ #X-GNOME-Autostart-Phase=Initialization
++NoDisplay=true
+ OnlyShowIn=GNOME;Unity;

srcpkgs/caribou/patches/fix-crash.patch

@@ -0,0 +1,46 @@
+From d41c8e44b12222a290eaca16703406b113a630c6 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 12 Jan 2021 18:01:47 +0000
+Subject: [PATCH] xadapter.vala: Remove XkbKeyTypesMask and fields from
+ XKbChangeMap call.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This was originally a workaround for xFree86 4.3 - see:
+https://bugzilla.gnome.org/show_bug.cgi?id=673547
+​
+As of https://gitlab.freedesktop.org/xorg/xserver/-/commit/87c64fc5b0 this
+causes a BadLength error when attempting to use shifted characters.
+​
+Ref:
+https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Changing_Map_Components_in_the_Server
+---
+ libcaribou/xadapter.vala | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/libcaribou/xadapter.vala b/libcaribou/xadapter.vala
+index 22858b7..1da5a78 100644
+--- a/libcaribou/xadapter.vala
++++ b/libcaribou/xadapter.vala
+@@ -195,15 +195,10 @@ namespace Caribou {
+ 
+             Xkb.MapChanges changes = Xkb.MapChanges ();
+ 
+-            // We don't touch key types here but include the
+-            // information in XkbSetMap request to the server, because
+-            // some X servers need the information to check the sanity
+-            // of the keysyms change.
+-            changes.changed = (ushort) (Xkb.KeySymsMask | Xkb.KeyTypesMask);
++            changes.changed = (ushort) Xkb.KeySymsMask;
+             changes.first_key_sym = (char) this.reserved_keycode;
+             changes.num_key_syms = this.xkbdesc.map.key_sym_map[this.reserved_keycode].width;
+-            changes.first_type = 0;
+-            changes.num_types = this.xkbdesc.map.num_types;
++
+             Xkb.change_map (this.xdisplay, this.xkbdesc, changes);
+ 
+             this.xdisplay.flush ();
+-- 
+GitLab
+

srcpkgs/caribou/patches/fix-font-property-in-style.css.patch

@@ -0,0 +1,26 @@
+From 13df8b92ae89c796238e669ee6ef4447a42d6355 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Fri, 1 Dec 2017 12:11:35 -0500
+Subject: style.css: Fix failure to start in GNOME Flashback
+
+The order for 'font' properties matters
+https://developer.gnome.org/gtk3/stable/chap-css-properties.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=791001
+---
+ data/antler/style.css | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/antler/style.css b/data/antler/style.css
+index 5ab6f71..4d84904 100644
+--- a/data/antler/style.css
++++ b/data/antler/style.css
+@@ -13,7 +13,7 @@
+   border-width: 0px;
+   border-radius: 2px;
+   border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch;
+-  font: Sans 14px;
++  font: 14px Sans;
+   background-image: -gtk-gradient (linear,
+ 				     left top,
+ 				     left bottom,

srcpkgs/caribou/template

@@ -0,0 +1,51 @@
+# Template file for 'caribou'
+pkgname=caribou
+version=0.4.21
+revision=5
+build_style=gnu-configure
+build_helper="gir"
+configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module
+ PYTHON=/usr/bin/python3"
+hostmakedepends="pkg-config intltool python3-gobject-devel libxslt vala
+ automake libtool gettext-devel-tools glib-devel"
+makedepends="vala-devel libxklavier-devel libgee08-devel python3-gobject-devel
+ clutter-devel gtk+3-devel libXtst-devel gir-freedesktop"
+depends="python3-gobject python3-atspi python3-dbus gir-freedesktop at-spi2-atk
+ desktop-file-utils libcaribou>=${version}_${revision}"
+short_desc="Alternative to the Gnome On-screen Keyboard"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-only"
+homepage="https://wiki.gnome.org/Projects/Caribou"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c2064de55
+lib32disabled=yes
+
+pre_configure() {
+	autoreconf -f -i
+}
+
+libcaribou_package() {
+	lib32disabled=yes
+	short_desc+=" - library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove usr/share/caribou
+		vmove usr/lib/girepository-1.0
+		vmove "usr/lib/gtk*"
+		vmove "usr/lib/gnome-settings-daemon*"
+	}
+}
+
+caribou-devel_package() {
+	lib32disabled=yes
+	depends="libXtst-devel libgee08-devel libxklavier-devel gtk+3-devel
+	 libxml2-devel libcaribou>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/libcaribou

@@ -0,0 +1 @@
+caribou