Your message dated Sun, 28 Apr 2019 08:21:00 +0000
with message-id <[email protected]>
and subject line Re: Bug#928093: unblock (pre-approval): gnome-shell/3.30.2-9,
mutter/3.30.2-7
has caused the Debian Bug report #928094,
regarding unblock (pre-approval): mutter/3.30.2-7
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
928094: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928094
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
While preparing gnome-shell/3.30.2-9 (see separate unblock request) I
thought I should also look into updating the closely-related mutter
package from the upstream gnome-3-30 stable branch.
> mutter (3.30.2-7) UNRELEASED; urgency=medium
>
> [ Iain Lane ]
> * Update metadata for debian/buster branch
>
> [ Simon McVittie ]
> * Update to upstream gnome-3-30 branch at 3.30.2-10-gdb8a29b34
> - d/p/clutter-evdev-Fix-toggling-accessibility-features-from-ke.patch:
> Allow keyboard accessibility features to be switched on when using
> Wayland mode. Previously, this was wrongly controlled by the
> "togglekeys" setting, which is off by default and has no UI, meaning
> that in practice keyboard accessibility features were always off.
> - d/p/clutter-Fix-check-for-keyboard-a11y-features.patch:
> Fix the sense of the check for keyboard accessibility features.
> Previously, they were enabled when disabled in gnome-control-center
> and vice versa.
These are basically a single "transaction". The first patch makes
keyboard accessibility features (Universal Access -> Typing Assist
(AccessX) in gnome-control-center) work in Wayland mode at all; the
second makes them work *correctly*.
> * d/libmutter-3-0.symbols: Add meta_gpu_kms_get_current_time_ns,
> which was added in 3.30.2-2 by
> d/p/Sync-to-the-hardware-refresh-rate-not-just-60.00Hz.patch
>
> -- Simon McVittie <[email protected]> Sat, 27 Apr 2019 19:48:48 +0100
OK to upload?
Thanks,
Simon
debian/changelog | 22 +++++++
debian/control | 2 +-
debian/control.in | 2 +-
debian/gbp.conf | 4 +-
debian/libmutter-3-0.symbols | 1 +
...tter-Fix-check-for-keyboard-a11y-features.patch | 26 +++++++++
...x-toggling-accessibility-features-from-ke.patch | 67 ++++++++++++++++++++++
debian/patches/series | 2 +
8 files changed, 122 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2210383f9..1f4dbd83f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+mutter (3.30.2-7) UNRELEASED; urgency=medium
+
+ [ Iain Lane ]
+ * Update metadata for debian/buster branch
+
+ [ Simon McVittie ]
+ * Update to upstream gnome-3-30 branch at 3.30.2-10-gdb8a29b34
+ - d/p/clutter-evdev-Fix-toggling-accessibility-features-from-ke.patch:
+ Allow keyboard accessibility features to be switched on when using
+ Wayland mode. Previously, this was wrongly controlled by the
+ "togglekeys" setting, which is off by default and has no UI, meaning
+ that in practice keyboard accessibility features were always off.
+ - d/p/clutter-Fix-check-for-keyboard-a11y-features.patch:
+ Fix the sense of the check for keyboard accessibility features.
+ Previously, they were enabled when disabled in gnome-control-center
+ and vice versa.
+ * d/libmutter-3-0.symbols: Add meta_gpu_kms_get_current_time_ns,
+ which was added in 3.30.2-2 by
+ d/p/Sync-to-the-hardware-refresh-rate-not-just-60.00Hz.patch
+
+ -- Simon McVittie <[email protected]> Sat, 27 Apr 2019 19:48:48 +0100
+
mutter (3.30.2-6) unstable; urgency=medium
* Team upload
diff --git a/debian/control b/debian/control
index 49ed75497..4e81c169b 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,7 @@ Build-Depends: debhelper (>= 11),
zenity
Rules-Requires-Root: no
Standards-Version: 4.3.0
-Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git
+Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -b debian/buster
Vcs-Browser: https://salsa.debian.org/gnome-team/mutter
Package: mutter
diff --git a/debian/control.in b/debian/control.in
index bf0027521..459a7bad3 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 11),
zenity
Rules-Requires-Root: no
Standards-Version: 4.3.0
-Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git
+Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -b debian/buster
Vcs-Browser: https://salsa.debian.org/gnome-team/mutter
Package: mutter
diff --git a/debian/gbp.conf b/debian/gbp.conf
index b24011a15..b4c4ed510 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = debian/buster
+upstream-branch = upstream/3.30.x
upstream-vcs-tag = %(version)s
[buildpackage]
diff --git a/debian/libmutter-3-0.symbols b/debian/libmutter-3-0.symbols
index 7fe75199f..15d78c4e9 100644
--- a/debian/libmutter-3-0.symbols
+++ b/debian/libmutter-3-0.symbols
@@ -699,6 +699,7 @@ libmutter-3.so.0 libmutter-3-0 #MINVER#
(arch=linux-any)meta_gpu_kms_can_have_outputs@Base 3.29.92
(arch=linux-any)meta_gpu_kms_flip_closure_container_free@Base 3.29.4
(arch=linux-any)meta_gpu_kms_flip_crtc@Base 3.28.2
+ (arch=linux-any)meta_gpu_kms_get_current_time_ns@Base 3.30.2-2~
(arch=linux-any)meta_gpu_kms_get_fd@Base 3.28.2
(arch=linux-any)meta_gpu_kms_get_file_path@Base 3.28.2
(arch=linux-any)meta_gpu_kms_get_max_buffer_size@Base 3.28.2
diff --git a/debian/patches/clutter-Fix-check-for-keyboard-a11y-features.patch b/debian/patches/clutter-Fix-check-for-keyboard-a11y-features.patch
new file mode 100644
index 000000000..d4a666844
--- /dev/null
+++ b/debian/patches/clutter-Fix-check-for-keyboard-a11y-features.patch
@@ -0,0 +1,26 @@
+From: Carlos Garnacho <[email protected]>
+Date: Thu, 28 Mar 2019 11:58:35 +0100
+Subject: clutter: Fix check for keyboard a11y features
+
+The typo was actually toggling the feature on for those who had it
+disabled.
+
+Bug: https://gitlab.gnome.org/GNOME/mutter/issues/529
+Origin: upstream, 3.30.3, commit:db8a29b34821130e3cd530da392de7af403db848
+---
+ clutter/clutter/evdev/clutter-input-device-evdev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/clutter/evdev/clutter-input-device-evdev.c b/clutter/clutter/evdev/clutter-input-device-evdev.c
+index b4e1445..a904d5a 100644
+--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
++++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
+@@ -1133,7 +1133,7 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent *e
+ if (event->key.flags & CLUTTER_EVENT_FLAG_INPUT_METHOD)
+ goto emit_event;
+
+- if (!device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED)
++ if (!(device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED))
+ goto emit_event;
+
+ if (event->type == CLUTTER_KEY_PRESS)
diff --git a/debian/patches/clutter-evdev-Fix-toggling-accessibility-features-from-ke.patch b/debian/patches/clutter-evdev-Fix-toggling-accessibility-features-from-ke.patch
new file mode 100644
index 000000000..df5e6b92c
--- /dev/null
+++ b/debian/patches/clutter-evdev-Fix-toggling-accessibility-features-from-ke.patch
@@ -0,0 +1,67 @@
+From: Olivier Fourdan <[email protected]>
+Date: Wed, 20 Mar 2019 18:32:28 +0100
+Subject: clutter/evdev: Fix toggling accessibility features from keyboard
+
+Enabling keyboard accessibility features on Wayland from the keyboard
+was wrongly assumed to be controlled by the "togglekeys" setting,
+whereas it should be simply controlled by the "enable" setting.
+
+As "togglekeys" is off by default and doesn't have a UI option to
+enable, that would prevent turning on or off the keyboard accessibility
+features using the keyboard.
+
+Bug: https://gitlab.gnome.org/GNOME/mutter/merge_requests/501
+Origin: upstream, 3.30.3, commit:6be39612991d973f69b5dc652076acbe94f49f99
+---
+ clutter/clutter/evdev/clutter-input-device-evdev.c | 17 +++++++----------
+ 1 file changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/clutter/clutter/evdev/clutter-input-device-evdev.c b/clutter/clutter/evdev/clutter-input-device-evdev.c
+index 1f45afd..b4e1445 100644
+--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
++++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
+@@ -677,7 +677,7 @@ stop_toggle_slowkeys (ClutterInputDeviceEvdev *device)
+ }
+
+ static void
+-handle_togglekeys_press (ClutterEvent *event,
++handle_enablekeys_press (ClutterEvent *event,
+ ClutterInputDeviceEvdev *device)
+ {
+ if (event->key.keyval == XKB_KEY_Shift_L || event->key.keyval == XKB_KEY_Shift_R)
+@@ -699,7 +699,7 @@ handle_togglekeys_press (ClutterEvent *event,
+ }
+
+ static void
+-handle_togglekeys_release (ClutterEvent *event,
++handle_enablekeys_release (ClutterEvent *event,
+ ClutterInputDeviceEvdev *device)
+ {
+ if (event->key.keyval == XKB_KEY_Shift_L || event->key.keyval == XKB_KEY_Shift_R)
+@@ -1136,6 +1136,11 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent *e
+ if (!device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED)
+ goto emit_event;
+
++ if (event->type == CLUTTER_KEY_PRESS)
++ handle_enablekeys_press (event, device_evdev);
++ else
++ handle_enablekeys_release (event, device_evdev);
++
+ if (device_evdev->a11y_flags & CLUTTER_A11Y_MOUSE_KEYS_ENABLED)
+ {
+ if (event->type == CLUTTER_KEY_PRESS &&
+@@ -1146,14 +1151,6 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent *e
+ return; /* swallow event */
+ }
+
+- if (device_evdev->a11y_flags & CLUTTER_A11Y_TOGGLE_KEYS_ENABLED)
+- {
+- if (event->type == CLUTTER_KEY_PRESS)
+- handle_togglekeys_press (event, device_evdev);
+- else
+- handle_togglekeys_release (event, device_evdev);
+- }
+-
+ if ((device_evdev->a11y_flags & CLUTTER_A11Y_BOUNCE_KEYS_ENABLED) &&
+ (get_debounce_delay (device) != 0))
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 11a9d5327..5d026d96b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,8 @@ clutter-Avoid-rounding-compensation-when-invalidating-2D-.patch
tests-Don-t-check-pixels-outside-actor-allocation.patch
screen-cast-Fix-monitor-recording-on-HiDPI.patch
monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch
+clutter-evdev-Fix-toggling-accessibility-features-from-ke.patch
+clutter-Fix-check-for-keyboard-a11y-features.patch
theme-use-gtk_render_icon_suface-to-paint-button-icon.patch
theme-load-icons-as-Gtk-does-with-fallback-and-RTL-suppor.patch
bgo768531_workaround-startup-notifications.patch
--- End Message ---
--- Begin Message ---
Simon McVittie:
> Control: tags 928093 - moreinfo
> Control: tags 928094 - moreinfo
>
> On Sat, 27 Apr 2019 at 21:32:00 +0000, Niels Thykier wrote:
>> Simon McVittie:
>>> Now that gnome-shell's RC bugs are (hopefully) dealt with, I'd like
>>> to update gnome-shell with the remaining bug fixes from the upstream
>>> gnome-3-30 branch, backported from 3.32.x development.
> ...
>>> While preparing gnome-shell/3.30.2-9 (see separate unblock request) I
>>> thought I should also look into updating the closely-related mutter
>>> package from the upstream gnome-3-30 stable branch.
>>
>> Please go ahead with the upload and remove the moreinfo tag once the
>> upload is in unstable and ready to be unblocked.
>
> Both uploaded and built on all release architectures (except
> gnome-shell:s390x, which is not a regression). Final debdiffs attached,
> piped through
> filterdiff -p1 --exclude 'debian/patches/Update-*-translation*.patch'
> in the case of gnome-shell.
>
> Thanks,
> smcv
>
Unblocked both, thanks.
~Niels
--- End Message ---
