Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package caribou for openSUSE:Factory checked in at 2021-07-05 22:23:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caribou (Old) and /work/SRC/openSUSE:Factory/.caribou.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caribou" Mon Jul 5 22:23:23 2021 rev:41 rq:904181 version:0.4.21 Changes: -------- --- /work/SRC/openSUSE:Factory/caribou/caribou.changes 2020-02-10 21:55:23.550256297 +0100 +++ /work/SRC/openSUSE:Factory/.caribou.new.2625/caribou.changes 2021-07-05 22:24:14.381137073 +0200 @@ -1,0 +2,17 @@ +Wed Jun 30 16:12:14 UTC 2021 - Michael Gorse <mgo...@suse.com> + +- Add caribou-stop-patching-gir.patch: stop patching the GIR. + Taken from upstream; the build now fails without this. Also add + libtool to BuildRequires. +- Add caribou-css-fix.patch: fix failure to start in GNOME + flashback (boo#1187112). + +------------------------------------------------------------------- +Wed Jun 2 20:55:04 UTC 2021 - Michael Gorse <mgo...@suse.com> + +- Add caribou-vala-build-fix.patch: fix build with newer valac + versions (boo#1186617). +- Add caribou-CVE-2021-3567.patch: fix segfault when attempting to + use shifted characters (boo#1186617 CVE-2021-3567). + +------------------------------------------------------------------- New: ---- caribou-CVE-2021-3567.patch caribou-css-fix.patch caribou-stop-patching-gir.patch caribou-vala-build-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caribou.spec ++++++ --- /var/tmp/diff_new_pack.4vVsv5/_old 2021-07-05 22:24:14.797133854 +0200 +++ /var/tmp/diff_new_pack.4vVsv5/_new 2021-07-05 22:24:14.801133823 +0200 @@ -1,7 +1,7 @@ # # spec file for package caribou # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,16 @@ Group: System/GUI/GNOME URL: http://live.gnome.org/Caribou Source0: http://download.gnome.org/sources/caribou/0.4/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM caribou-vala-build-fix.patch boo#1186617 mgo...@suse.com -- fix the build with newer valac versions. +Patch0: caribou-vala-build-fix.patch +# PATCH-FIX-UPSTREAM caribou-CVE-2021-3567.patch boo#1186617 mgo...@suse.com -- fix segfault when attempting to use shifted characters. +Patch1: caribou-CVE-2021-3567.patch +# PATCH-FIX-UPSTREAM caribou-stop-patching-gir.patch mgo...@suse.com -- stop patching the GIR. +Patch2: caribou-stop-patching-gir.patch +# PATCH-FIX-UPSTREAM caribou-css-fix.patch boo#1187112 mgo...@suse.com -- fix failure to start in GNOME flashback. +Patch3: caribou-css-fix.patch +# Needed for Patch2 +BuildRequires: libtool # For directory ownership BuildRequires: dbus-1 BuildRequires: fdupes @@ -148,9 +158,11 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build +# Needed for patch2 +autoreconf -fi %configure \ --disable-static \ --enable-gtk3-module \ ++++++ caribou-CVE-2021-3567.patch ++++++ >From d41c8e44b12222a290eaca16703406b113a630c6 Mon Sep 17 00:00:00 2001 From: Michael Webster <miketwebs...@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 (); -- 2.31.1 ++++++ caribou-css-fix.patch ++++++ >From 13df8b92ae89c796238e669ee6ef4447a42d6355 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <jbi...@ubuntu.com> Date: Fri, 1 Dec 2017 12:11:35 -0500 Subject: [PATCH] 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, -- 2.32.0 ++++++ caribou-stop-patching-gir.patch ++++++ >From c52ce71c49dc8d6109a58d16cc8d491d7bd1d781 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz <ric...@ubuntu.com> Date: Wed, 20 Jan 2021 22:59:49 +0100 Subject: [PATCH] Stop patching the generated GIR --- libcaribou/Makefile.am | 8 ++----- tools/Makefile.am | 1 - tools/fix_gir.py | 53 ------------------------------------------ 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100755 tools/fix_gir.py diff --git a/libcaribou/Makefile.am b/libcaribou/Makefile.am index 05f2774..0634374 100644 --- a/libcaribou/Makefile.am +++ b/libcaribou/Makefile.am @@ -7,7 +7,7 @@ libcaribou_la_VALAFLAGS = \ --pkg xtst --pkg gee-0.8 --pkg gdk-x11-3.0 --pkg libxml-2.0 \ --pkg libxklavier --pkg external-libs \ --internal-vapi caribou-internals-1.0.vapi \ - --library caribou-1.0 --gir _Caribou-1.0.gir \ + --library caribou-1.0 --gir Caribou-1.0.gir \ --symbols libcaribou.symbols \ $(VALAFLAGS) @@ -63,9 +63,6 @@ gir_DATA = Caribou-1.0.gir typelibdir = $(libdir)/girepository-1.0 typelib_DATA = Caribou-1.0.typelib -Caribou-1.0.gir: _Caribou-1.0.gir - $(AM_V_GEN)$(PYTHON) -B $(top_srcdir)/tools/fix_gir.py $< > $@ - Caribou-1.0.typelib: Caribou-1.0.gir @INTROSPECTION_COMPILER@ --shared-library=libcaribou.so.0 -o $@ $^ @@ -81,8 +78,7 @@ CLEANFILES = \ caribou-1.0.vapi \ caribou-internals-1.0.vapi \ Caribou-1.0.typelib \ - Caribou-1.0.gir \ - _Caribou-1.0.gir + Caribou-1.0.gir DISTCLEANFILES = \ caribou-1.0.pc diff --git a/tools/Makefile.am b/tools/Makefile.am index 3a9bcdb..89f753d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,5 +1,4 @@ EXTRA_DIST = \ - fix_gir.py \ make_schema.py \ convert_cldr.py \ basic.xsl diff --git a/tools/fix_gir.py b/tools/fix_gir.py deleted file mode 100755 index 182d108..0000000 --- a/tools/fix_gir.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/python - -from xml.dom import minidom - -def purge_white_space_and_fix_namespace(node, indent=0): - if getattr(node, "tagName", None) == "namespace": - name = node.getAttribute("name") - node.setAttribute("name", name.lstrip('_')) - for child in [c for c in node.childNodes]: - if child.nodeType == node.TEXT_NODE or \ - getattr(child, "tagName", None) == "annotation": - node.removeChild(child) - continue - purge_white_space_and_fix_namespace(child, indent+1) - -def find_ancestor(node, name): - if getattr(node, "tagName", None) == name: - return node - parent = getattr(node, "parentNode", None) - if not parent: - return None - return find_ancestor(parent, name) - -def fix_vfuncs(dom): - for f in dom.getElementsByTagName("field"): - callbacks = f.getElementsByTagName("callback") - - record = find_ancestor(f, "record") - if not record: - continue - - name = record.getAttribute("name") - cname = record.getAttribute("c:type") - - assert(name.endswith("Class") or name.endswith("Iface")) - assert(cname.endswith("Class") or name.endswith("Iface")) - - if len(callbacks) == 2: - callbacks[-1].parentNode.removeChild(callbacks[-1]) - -if __name__ == "__main__": - import sys - - if len(sys.argv) != 2: - print("supply a gir file") - sys.exit(1) - - dom = minidom.parse(sys.argv[-1]) - - purge_white_space_and_fix_namespace(dom) - fix_vfuncs(dom) - - print(dom.toprettyxml(indent=" ", newl="\n")) -- 2.32.0 ++++++ caribou-vala-build-fix.patch ++++++ >From 76fbd11575f918fc898cb0f5defe07f67c11ec38 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz <ric...@ubuntu.com> Date: Wed, 20 Jan 2021 23:09:38 +0100 Subject: [PATCH] Fix build with newer valac versions Fixes https://gitlab.gnome.org/GNOME/caribou/issues/7 --- libcaribou/key-model.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -- 2.31.1
