From e6e526ff076c7f4d0de25946c9bf3fcc0d8fb7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 13 Jan 2021 11:45:12 -0300 Subject: [PATCH 1/3] caribou: add fix for crash observed in cinammon-screensaver. https://github.com/linuxmint/cinnamon-screensaver/issues/354 Also clean wrong and repeated entry from shlibs. --- common/shlibs | 1 - srcpkgs/caribou/patches/fix-crash.patch | 46 +++++++++++++++++++++++++ srcpkgs/caribou/patches/fix-vala.patch | 16 +++++++++ srcpkgs/caribou/template | 2 +- 4 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/caribou/patches/fix-crash.patch create mode 100644 srcpkgs/caribou/patches/fix-vala.patch diff --git a/common/shlibs b/common/shlibs index 5e6a8d0c6ec..2df625fd6a4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -896,7 +896,6 @@ liblcms2.so.2 lcms2-2.2_1 libcolord.so.2 libcolord-1.1.7_1 libcolordprivate.so.2 libcolord-1.1.7_1 libcolorhug.so.2 libcolord-1.1.7_1 -libcaribou.so.0 caribou-0.4.0_1 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1 libgrilo-0.3.so.0 grilo-0.3.2_1 libgrlnet-0.3.so.0 grilo-0.3.2_1 diff --git a/srcpkgs/caribou/patches/fix-crash.patch b/srcpkgs/caribou/patches/fix-crash.patch new file mode 100644 index 00000000000..a6fa3d7cd37 --- /dev/null +++ b/srcpkgs/caribou/patches/fix-crash.patch @@ -0,0 +1,46 @@ +From d41c8e44b12222a290eaca16703406b113a630c6 Mon Sep 17 00:00:00 2001 +From: Michael Webster +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 + diff --git a/srcpkgs/caribou/patches/fix-vala.patch b/srcpkgs/caribou/patches/fix-vala.patch new file mode 100644 index 00000000000..9fae15bc231 --- /dev/null +++ b/srcpkgs/caribou/patches/fix-vala.patch @@ -0,0 +1,16 @@ +Patch from +https://github.com/archlinux/svntogit-packages/blob/bf8285526628664f46c1b790238c6e3555e51499/trunk/unicode_to_keyval-symbol-check.patch + +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 { diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template index 6ac08ee5e22..0fac4244c03 100644 --- a/srcpkgs/caribou/template +++ b/srcpkgs/caribou/template @@ -1,7 +1,7 @@ # Template file for 'caribou' pkgname=caribou version=0.4.21 -revision=4 +revision=5 build_style=gnu-configure build_helper="gir" configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module From e70c5277b5b74a6234deb028fb792382741cd5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 13 Jan 2021 11:56:11 -0300 Subject: [PATCH 2/3] gnome-shell: remove caribou dependency. --- srcpkgs/gnome-shell/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 6753b6ac54e..65ac693a585 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,20 +1,20 @@ # Template file for 'gnome-shell' pkgname=gnome-shell version=3.38.1 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dsystemd=false" hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc asciidoc perl glib-devel mutter-devel gettext gjs-devel" -makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel +makedepends="at-spi2-atk evolution-data-server-devel folks-devel gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel libnma-devel polkit-devel pulseaudio-devel startup-notification-devel telepathy-logger-devel gnome-autoar-devel" -depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower" +depends="elogind glxinfo gnome-control-center gsettings-desktop-schemas upower" short_desc="GNOME core user interface" maintainer="Enno Boland " license="GPL-2.0-or-later" From ef38021994663a4b17f654832e45c5c0e9fda6cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 13 Jan 2021 11:56:47 -0300 Subject: [PATCH 3/3] gnome-core: remove caribou dependency. --- srcpkgs/gnome-core/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index 4aab60c6b74..075bd15cdd3 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,7 +1,7 @@ # Template file for 'gnome-core' pkgname=gnome-core version=3.38.0 -revision=2 +revision=3 build_style=meta short_desc="GNOME meta-package for Void Linux - core components" maintainer="q66 " @@ -13,7 +13,6 @@ depends=" at-spi2-core>=2.38.0 at-spi2-atk>=2.38.0 cantarell-fonts>=0.201 - caribou>=0.4.21 dconf>=0.36.0 evolution-data-server>=3.38.0 folks>=0.14.0