From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] caribou: add fix for crash observed in cinammon-screensaver.
Date: Sun, 17 Jan 2021 19:56:14 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27986@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 458 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages caribou2
https://github.com/void-linux/void-packages/pull/27986
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.
A patch file from https://github.com/void-linux/void-packages/pull/27986.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-caribou2-27986.patch --]
[-- Type: text/x-diff, Size: 5020 bytes --]
From a87a65782f518a3c3e000182aad2450311ebf10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 13 Jan 2021 11:45:12 -0300
Subject: [PATCH] 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 | 4 +--
4 files changed, 64 insertions(+), 3 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 468fe3a63fe..dd6459d35c6 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 <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
+
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..bf135b75f8b 100644
--- a/srcpkgs/caribou/template
+++ b/srcpkgs/caribou/template
@@ -1,12 +1,12 @@
# 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
PYTHON=/usr/bin/python3"
-hostmakedepends="pkg-config intltool python3-gobject-devel libxslt"
+hostmakedepends="pkg-config intltool python3-gobject-devel libxslt vala"
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
next reply other threads:[~2021-01-17 18:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-17 18:56 ericonr [this message]
2021-01-18 19:34 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27986@inbox.vuxu.org \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).