[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#927199: marked as done (unblock: gnome-shell/3.30.2-7)



Your message dated Wed, 17 Apr 2019 04:52:00 +0000
with message-id <876be3b5-ca55-17da-ffff-5d40af85803a@thykier.net>
and subject line Re: Bug#927199: unblock: gnome-shell/3.30.2-7
has caused the Debian Bug report #927199,
regarding unblock: gnome-shell/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 owner@bugs.debian.org
immediately.)


-- 
927199: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927199
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package gnome-shell.

Changes are:

1. Vcs-Git, gbp.conf: point to the correct, Buster-specific, branches.

2. Avoid test failures on buildd environments where HOME, XDG_RUNTIME_DIR might
   be invalid. This allows the tests to run a bit further on s390x. The package
   still FTBFS there but as Simon McVittie wrote, "The remaining test failures
   on s390x look to me more like a bug in mozjs60 or gjs than a bug in
   gnome-shell" — which I guess is #927081.

3. Add missing French layouts to on screen keyboard (Closes: #926452)
    
   Due to a bug in the code that generates on screen keyboard layouts, the
   French layout ends up being generated from the French-Canadian layout (which
   is qwerty rather than azerty). This is a regression compared to Stretch.

   Fixed by cherry-picking the relevant upstream (3.32.0) commit.

4. Fix on screen keyboard language's menu closing the keyboard (Closes: #926453)
    
   GNOME Shell 3.30's on screen keyboard now offers a menu that allows selecting
   among the supported keyboard layouts. But moving the pointer over this menu
   closes the keyboard. This is a regression from Stretch, where that menu did
   not exist yet.

   Fixed by cherry-picking the relevant upstream (3.32.0) commits.

unblock gnome-shell/3.30.2-6
diff -Nru gnome-shell-3.30.2/debian/changelog gnome-shell-3.30.2/debian/changelog
--- gnome-shell-3.30.2/debian/changelog	2019-02-06 10:46:52.000000000 +0100
+++ gnome-shell-3.30.2/debian/changelog	2019-04-15 13:23:31.000000000 +0200
@@ -1,3 +1,33 @@
+gnome-shell (3.30.2-6) unstable; urgency=medium
+
+  * Team upload
+  * d/p/keyboard-Make-items-in-language-menu-unfocusable.patch,
+    d/p/popupMenu-Respect-items-can-focus-property.patch:
+    Add patches from upstream to fix the on-screen keyboard language's menu
+    closing said keyboard (Closes: #926453)
+  * d/p/osk-layouts-Fix-French-layout.patch:
+    Add patches from upstream to add missing French layouts to
+    the on-screen keyboard (Closes: #926452)
+
+ -- intrigeri <intrigeri@debian.org>  Mon, 15 Apr 2019 11:23:31 +0000
+
+gnome-shell (3.30.2-5) unstable; urgency=medium
+
+  * Team upload
+  * Really create a suitable temporary XDG_RUNTIME_DIR for the unit tests
+  * Clean up debian/home with d/clean, not a dh_clean override
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 14 Apr 2019 15:33:47 +0100
+
+gnome-shell (3.30.2-4) unstable; urgency=medium
+
+  * Team upload
+  * d/rules: Create a temporary HOME, XDG_RUNTIME_DIR for the unit tests.
+    This hopefully fixes test failures and FTBFS on the s390x buildd.
+  * d/.gitignore: Add
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 14 Apr 2019 10:40:33 +0100
+
 gnome-shell (3.30.2-3) unstable; urgency=medium
 
   * Team upload
diff -Nru gnome-shell-3.30.2/debian/clean gnome-shell-3.30.2/debian/clean
--- gnome-shell-3.30.2/debian/clean	1970-01-01 01:00:00.000000000 +0100
+++ gnome-shell-3.30.2/debian/clean	2019-04-15 13:23:31.000000000 +0200
@@ -0,0 +1 @@
+debian/home
diff -Nru gnome-shell-3.30.2/debian/control gnome-shell-3.30.2/debian/control
--- gnome-shell-3.30.2/debian/control	2019-02-06 10:46:52.000000000 +0100
+++ gnome-shell-3.30.2/debian/control	2019-04-15 13:23:31.000000000 +0200
@@ -55,7 +55,7 @@
 Rules-Requires-Root: no
 Standards-Version: 4.3.0
 Homepage: https://wiki.gnome.org/Projects/GnomeShell
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git -b debian/buster
 Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell
 
 Package: gnome-shell
diff -Nru gnome-shell-3.30.2/debian/control.in gnome-shell-3.30.2/debian/control.in
--- gnome-shell-3.30.2/debian/control.in	2019-02-06 10:46:52.000000000 +0100
+++ gnome-shell-3.30.2/debian/control.in	2019-04-15 13:23:31.000000000 +0200
@@ -51,7 +51,7 @@
 Rules-Requires-Root: no
 Standards-Version: 4.3.0
 Homepage: https://wiki.gnome.org/Projects/GnomeShell
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git -b debian/buster
 Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell
 
 Package: gnome-shell
diff -Nru gnome-shell-3.30.2/debian/gbp.conf gnome-shell-3.30.2/debian/gbp.conf
--- gnome-shell-3.30.2/debian/gbp.conf	2019-02-06 10:46:52.000000000 +0100
+++ gnome-shell-3.30.2/debian/gbp.conf	2019-04-15 13:23:31.000000000 +0200
@@ -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 -Nru gnome-shell-3.30.2/debian/patches/keyboard-Make-items-in-language-menu-unfocusable.patch gnome-shell-3.30.2/debian/patches/keyboard-Make-items-in-language-menu-unfocusable.patch
--- gnome-shell-3.30.2/debian/patches/keyboard-Make-items-in-language-menu-unfocusable.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-shell-3.30.2/debian/patches/keyboard-Make-items-in-language-menu-unfocusable.patch	2019-04-15 13:23:31.000000000 +0200
@@ -0,0 +1,47 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 11 Sep 2018 18:00:22 +0200
+Subject: keyboard: Make items in language menu unfocusable
+
+The menu grabs the key focus when opened, which takes focus away from
+whichever actor triggered the keyboard. And as the menu doesn't have
+any text entries, the keyboard is popped down as a result.
+
+Prevent this by making the menu items unfocusable, so the keyboard
+focus just stays where it is. Considering that the menu is part
+of the on-screen keyboard itself, not being keyboard-navigatable
+isn't a big deal here.
+
+Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/171
+Bug-Debian: https://bugs.debian.org/926453
+Origin: upstream, 3.31.92, commit:7dd326f0908558fcc9cc8e6e94533a36ba8d3907
+---
+ js/ui/keyboard.js | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
+index 491495c..593bd18 100644
+--- a/js/ui/keyboard.js
++++ b/js/ui/keyboard.js
+@@ -186,16 +186,20 @@ var LanguageSelectionPopup = new Lang.Class({
+         let inputSourceManager = InputSourceManager.getInputSourceManager();
+         let inputSources = inputSourceManager.inputSources;
+ 
++        let item;
+         for (let i in inputSources) {
+             let is = inputSources[i];
+ 
+-            this.addAction(is.displayName, () => {
++            item = this.addAction(is.displayName, () => {
+                 inputSourceManager.activateInputSource(is, true);
+             });
++            item.actor.can_focus = false;
+         }
+ 
+         this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+-        this.addAction(_("Region & Language Settings"), this._launchSettings.bind(this));
++        item = this.addAction(_("Region & Language Settings"), this._launchSettings.bind(this));
++        item.actor.can_focus = false;
++
+         this._capturedEventId = 0;
+ 
+         this._unmapId = actor.connect('notify::mapped', () => {
diff -Nru gnome-shell-3.30.2/debian/patches/osk-layouts-Fix-French-layout.patch gnome-shell-3.30.2/debian/patches/osk-layouts-Fix-French-layout.patch
--- gnome-shell-3.30.2/debian/patches/osk-layouts-Fix-French-layout.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-shell-3.30.2/debian/patches/osk-layouts-Fix-French-layout.patch	2019-04-15 13:23:31.000000000 +0200
@@ -0,0 +1,822 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 27 Feb 2019 20:11:35 +0100
+Subject: osk-layouts: Fix French layout
+
+The script to convert XML keyboard layouts to json has a small bug
+that causes the French-Canadian layout to end up as French.
+
+Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/997
+Bug-Debian: https://bugs.debian.org/926452
+Origin: upstream, 3.31.92, commit:859aef78c4d2472b2545ce9ecc889c00b9893494
+---
+ data/gnome-shell-osk-layouts.gresource.xml |   1 +
+ data/osk-layouts/ca.json                   | 599 +++++++++++++++++++++++++++++
+ data/osk-layouts/fr.json                   |  89 +++--
+ 3 files changed, 652 insertions(+), 37 deletions(-)
+ create mode 100644 data/osk-layouts/ca.json
+
+diff --git a/data/gnome-shell-osk-layouts.gresource.xml b/data/gnome-shell-osk-layouts.gresource.xml
+index b7969c7..6c98a64 100644
+--- a/data/gnome-shell-osk-layouts.gresource.xml
++++ b/data/gnome-shell-osk-layouts.gresource.xml
+@@ -6,6 +6,7 @@
+     <file>be.json</file>
+     <file>bg.json</file>
+     <file>by.json</file>
++    <file>ca.json</file>
+     <file>cz.json</file>
+     <file>de.json</file>
+     <file>dk.json</file>
+diff --git a/data/osk-layouts/ca.json b/data/osk-layouts/ca.json
+new file mode 100644
+index 0000000..2b2bedc
+--- /dev/null
++++ b/data/osk-layouts/ca.json
+@@ -0,0 +1,599 @@
++{
++  "levels": [
++    {
++      "level": "",
++      "mode": "default",
++      "rows": [
++        [
++          [
++            "q"
++          ],
++          [
++            "w"
++          ],
++          [
++            "e",
++            "é",
++            "è",
++            "ê",
++            "ë",
++            "%",
++            "ę",
++            "ė",
++            "ē"
++          ],
++          [
++            "r"
++          ],
++          [
++            "t"
++          ],
++          [
++            "y",
++            "%",
++            "ÿ"
++          ],
++          [
++            "u",
++            "ù",
++            "û",
++            "%",
++            "ü",
++            "ú",
++            "ū"
++          ],
++          [
++            "i",
++            "î",
++            "%",
++            "ï",
++            "ì",
++            "í",
++            "į",
++            "ī"
++          ],
++          [
++            "o",
++            "ô",
++            "œ",
++            "%",
++            "ö",
++            "ò",
++            "ó",
++            "õ",
++            "ø",
++            "ō",
++            "º"
++          ],
++          [
++            "p"
++          ]
++        ],
++        [
++          [
++            "a",
++            "à",
++            "â",
++            "%",
++            "æ",
++            "á",
++            "ä",
++            "ã",
++            "å",
++            "ā",
++            "ª"
++          ],
++          [
++            "s"
++          ],
++          [
++            "d"
++          ],
++          [
++            "f"
++          ],
++          [
++            "g"
++          ],
++          [
++            "h"
++          ],
++          [
++            "j"
++          ],
++          [
++            "k"
++          ],
++          [
++            "l"
++          ]
++        ],
++        [
++          [
++            "z"
++          ],
++          [
++            "x"
++          ],
++          [
++            "c",
++            "ç",
++            "ć",
++            "č"
++          ],
++          [
++            "v"
++          ],
++          [
++            "b"
++          ],
++          [
++            "n"
++          ],
++          [
++            "m"
++          ]
++        ],
++        [
++          [
++            ","
++          ],
++          [
++            " "
++          ],
++          [
++            ".",
++            "#",
++            "!",
++            ",",
++            "?",
++            "-",
++            ":",
++            "'",
++            "@"
++          ]
++        ]
++      ]
++    },
++    {
++      "level": "shift",
++      "mode": "latched",
++      "rows": [
++        [
++          [
++            "Q"
++          ],
++          [
++            "W"
++          ],
++          [
++            "E",
++            "É",
++            "È",
++            "Ê",
++            "Ë",
++            "%",
++            "Ę",
++            "Ė",
++            "Ē"
++          ],
++          [
++            "R"
++          ],
++          [
++            "T"
++          ],
++          [
++            "Y",
++            "%",
++            "Ÿ"
++          ],
++          [
++            "U",
++            "Ù",
++            "Û",
++            "%",
++            "Ü",
++            "Ú",
++            "Ū"
++          ],
++          [
++            "I",
++            "Î",
++            "%",
++            "Ï",
++            "Ì",
++            "Í",
++            "Į",
++            "Ī"
++          ],
++          [
++            "O",
++            "Ô",
++            "Œ",
++            "%",
++            "Ö",
++            "Ò",
++            "Ó",
++            "Õ",
++            "Ø",
++            "Ō",
++            "º"
++          ],
++          [
++            "P"
++          ]
++        ],
++        [
++          [
++            "A",
++            "À",
++            "Â",
++            "%",
++            "Æ",
++            "Á",
++            "Ä",
++            "Ã",
++            "Å",
++            "Ā",
++            "ª"
++          ],
++          [
++            "S"
++          ],
++          [
++            "D"
++          ],
++          [
++            "F"
++          ],
++          [
++            "G"
++          ],
++          [
++            "H"
++          ],
++          [
++            "J"
++          ],
++          [
++            "K"
++          ],
++          [
++            "L"
++          ]
++        ],
++        [
++          [
++            "Z"
++          ],
++          [
++            "X"
++          ],
++          [
++            "C",
++            "Ç",
++            "Ć",
++            "Č"
++          ],
++          [
++            "V"
++          ],
++          [
++            "B"
++          ],
++          [
++            "N"
++          ],
++          [
++            "M"
++          ]
++        ],
++        [
++          [
++            ","
++          ],
++          [
++            " "
++          ],
++          [
++            ".",
++            "#",
++            "!",
++            ",",
++            "?",
++            "-",
++            ":",
++            "'",
++            "@"
++          ]
++        ]
++      ]
++    },
++    {
++      "level": "opt",
++      "mode": "locked",
++      "rows": [
++        [
++          [
++            "1",
++            "¹",
++            "½",
++            "⅓",
++            "¼",
++            "⅛"
++          ],
++          [
++            "2",
++            "²",
++            "⅔"
++          ],
++          [
++            "3",
++            "³",
++            "¾",
++            "⅜"
++          ],
++          [
++            "4",
++            "⁴"
++          ],
++          [
++            "5",
++            "⅝"
++          ],
++          [
++            "6"
++          ],
++          [
++            "7",
++            "⅞"
++          ],
++          [
++            "8"
++          ],
++          [
++            "9"
++          ],
++          [
++            "0",
++            "ⁿ",
++            "∅"
++          ]
++        ],
++        [
++          [
++            "@"
++          ],
++          [
++            "#"
++          ],
++          [
++            "$",
++            "¢",
++            "£",
++            "€",
++            "¥",
++            "₱"
++          ],
++          [
++            "%",
++            "‰"
++          ],
++          [
++            "&"
++          ],
++          [
++            "-",
++            "_",
++            "–",
++            "—",
++            "·"
++          ],
++          [
++            "+",
++            "±"
++          ],
++          [
++            "(",
++            "<",
++            "{",
++            "["
++          ],
++          [
++            ")",
++            ">",
++            "}",
++            "]"
++          ]
++        ],
++        [
++          [
++            "*",
++            "†",
++            "‡",
++            "★"
++          ],
++          [
++            "\"",
++            "“",
++            "”",
++            "«",
++            "»"
++          ],
++          [
++            "'",
++            "‘",
++            "’",
++            "‹",
++            "›"
++          ],
++          [
++            ":"
++          ],
++          [
++            ";"
++          ],
++          [
++            "!",
++            "¡"
++          ],
++          [
++            "?",
++            "¿"
++          ]
++        ],
++        [
++          [
++            "_"
++          ],
++          [
++            "/"
++          ],
++          [
++            " "
++          ],
++          [
++            ","
++          ],
++          [
++            ".",
++            "…"
++          ]
++        ]
++      ]
++    },
++    {
++      "level": "opt+shift",
++      "mode": "locked",
++      "rows": [
++        [
++          [
++            "~"
++          ],
++          [
++            "`"
++          ],
++          [
++            "|"
++          ],
++          [
++            "•",
++            "♪",
++            "♥",
++            "♠",
++            "♦",
++            "♣"
++          ],
++          [
++            "√"
++          ],
++          [
++            "Π",
++            "π"
++          ],
++          [
++            "÷"
++          ],
++          [
++            "×"
++          ],
++          [
++            "¶",
++            "§"
++          ],
++          [
++            "∆"
++          ]
++        ],
++        [
++          [
++            "£"
++          ],
++          [
++            "¢"
++          ],
++          [
++            "€"
++          ],
++          [
++            "¥"
++          ],
++          [
++            "^",
++            "↑",
++            "↓",
++            "←",
++            "→"
++          ],
++          [
++            "°",
++            "′",
++            "″"
++          ],
++          [
++            "=",
++            "≠",
++            "≈",
++            "∞"
++          ],
++          [
++            "{"
++          ],
++          [
++            "}"
++          ]
++        ],
++        [
++          [
++            "\\"
++          ],
++          [
++            "©"
++          ],
++          [
++            "®"
++          ],
++          [
++            "™"
++          ],
++          [
++            "℅"
++          ],
++          [
++            "["
++          ],
++          [
++            "]"
++          ]
++        ],
++        [
++          [
++            "<",
++            "‹",
++            "≤",
++            "«"
++          ],
++          [
++            ">",
++            "›",
++            "≥",
++            "»"
++          ],
++          [
++            " "
++          ],
++          [
++            ","
++          ],
++          [
++            ".",
++            "…"
++          ]
++        ]
++      ]
++    }
++  ],
++  "locale": "fr-CA",
++  "name": "French Canada"
++}
+\ No newline at end of file
+diff --git a/data/osk-layouts/fr.json b/data/osk-layouts/fr.json
+index 2b2bedc..dd572b1 100644
+--- a/data/osk-layouts/fr.json
++++ b/data/osk-layouts/fr.json
+@@ -6,10 +6,20 @@
+       "rows": [
+         [
+           [
+-            "q"
++            "a",
++            "à",
++            "â",
++            "%",
++            "æ",
++            "á",
++            "ä",
++            "ã",
++            "å",
++            "ā",
++            "ª"
+           ],
+           [
+-            "w"
++            "z"
+           ],
+           [
+             "e",
+@@ -71,17 +81,7 @@
+         ],
+         [
+           [
+-            "a",
+-            "à",
+-            "â",
+-            "%",
+-            "æ",
+-            "á",
+-            "ä",
+-            "ã",
+-            "å",
+-            "ā",
+-            "ª"
++            "q"
+           ],
+           [
+             "s"
+@@ -106,11 +106,14 @@
+           ],
+           [
+             "l"
++          ],
++          [
++            "m"
+           ]
+         ],
+         [
+           [
+-            "z"
++            "w"
+           ],
+           [
+             "x"
+@@ -131,7 +134,11 @@
+             "n"
+           ],
+           [
+-            "m"
++            "'",
++            "‘",
++            "’",
++            "‹",
++            "›"
+           ]
+         ],
+         [
+@@ -161,10 +168,20 @@
+       "rows": [
+         [
+           [
+-            "Q"
++            "A",
++            "À",
++            "Â",
++            "%",
++            "Æ",
++            "Á",
++            "Ä",
++            "Ã",
++            "Å",
++            "Ā",
++            "ª"
+           ],
+           [
+-            "W"
++            "Z"
+           ],
+           [
+             "E",
+@@ -226,17 +243,7 @@
+         ],
+         [
+           [
+-            "A",
+-            "À",
+-            "Â",
+-            "%",
+-            "Æ",
+-            "Á",
+-            "Ä",
+-            "Ã",
+-            "Å",
+-            "Ā",
+-            "ª"
++            "Q"
+           ],
+           [
+             "S"
+@@ -261,11 +268,14 @@
+           ],
+           [
+             "L"
++          ],
++          [
++            "M"
+           ]
+         ],
+         [
+           [
+-            "Z"
++            "W"
+           ],
+           [
+             "X"
+@@ -286,7 +296,11 @@
+             "N"
+           ],
+           [
+-            "M"
++            "'",
++            "‘",
++            "’",
++            "‹",
++            "›"
+           ]
+         ],
+         [
+@@ -369,10 +383,10 @@
+             "#"
+           ],
+           [
+-            "$",
++            "€",
+             "¢",
+             "£",
+-            "€",
++            "$",
+             "¥",
+             "₱"
+           ],
+@@ -511,13 +525,14 @@
+             "£"
+           ],
+           [
+-            "¢"
++            "¥"
+           ],
+           [
+-            "€"
++            "$",
++            "¢"
+           ],
+           [
+-            "¥"
++            "¢"
+           ],
+           [
+             "^",
+@@ -594,6 +609,6 @@
+       ]
+     }
+   ],
+-  "locale": "fr-CA",
+-  "name": "French Canada"
++  "locale": "fr",
++  "name": "French"
+ }
+\ No newline at end of file
diff -Nru gnome-shell-3.30.2/debian/patches/popupMenu-Respect-items-can-focus-property.patch gnome-shell-3.30.2/debian/patches/popupMenu-Respect-items-can-focus-property.patch
--- gnome-shell-3.30.2/debian/patches/popupMenu-Respect-items-can-focus-property.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-shell-3.30.2/debian/patches/popupMenu-Respect-items-can-focus-property.patch	2019-04-15 13:23:31.000000000 +0200
@@ -0,0 +1,34 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 11 Sep 2018 17:55:36 +0200
+Subject: popupMenu: Respect items' :can-focus property
+
+Menu items use a single 'active' state that follows both hover and
+keyboard focus. It therefore makes sense for the active item to always
+grab the focus, in particular as an item that is sensitive but not
+focusable by keynav would be rather weird.
+
+As it turns out, we do have a case that is weird enough where we want
+exactly that, so only grab focus if the actor's :can-focus property
+allows it.
+
+Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/171
+Bug-Debian: https://bugs.debian.org/926453
+Origin: upstream, 3.31.92, commit:24a26e025b65494f8a83f22e0876b52287380ea8
+---
+ js/ui/popupMenu.js | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
+index 0b2cce8..8f28aca 100644
+--- a/js/ui/popupMenu.js
++++ b/js/ui/popupMenu.js
+@@ -182,7 +182,8 @@ var PopupBaseMenuItem = new Lang.Class({
+             this.active = active;
+             if (active) {
+                 this.actor.add_style_class_name('selected');
+-                this.actor.grab_key_focus();
++                if (this.actor.can_focus)
++                    this.actor.grab_key_focus();
+             } else {
+                 this.actor.remove_style_class_name('selected');
+                 // Remove the CSS active state if the user press the button and
diff -Nru gnome-shell-3.30.2/debian/patches/series gnome-shell-3.30.2/debian/patches/series
--- gnome-shell-3.30.2/debian/patches/series	2019-02-06 10:46:52.000000000 +0100
+++ gnome-shell-3.30.2/debian/patches/series	2019-04-15 13:23:31.000000000 +0200
@@ -12,3 +12,6 @@
 power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
 tweener-Save-handlers-on-target-and-remove-them-on-destro.patch
 workaround_crasher_fractional_scaling.patch
+popupMenu-Respect-items-can-focus-property.patch
+keyboard-Make-items-in-language-menu-unfocusable.patch
+osk-layouts-Fix-French-layout.patch
diff -Nru gnome-shell-3.30.2/debian/rules gnome-shell-3.30.2/debian/rules
--- gnome-shell-3.30.2/debian/rules	2019-02-06 10:46:52.000000000 +0100
+++ gnome-shell-3.30.2/debian/rules	2019-04-15 13:23:31.000000000 +0200
@@ -32,4 +32,16 @@
 	dh_strip --dbgsym-migration='gnome-shell-dbg (<< 3.20.2-2~)'
 
 override_dh_auto_test:
-	xvfb-run -a dh_auto_test
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	# Avoid test failures on buildd environments where HOME,
+	# XDG_RUNTIME_DIR might be invalid
+	mkdir -p -m700 $(CURDIR)/debian/home/run
+	env \
+		-u XDG_CACHE_HOME \
+		-u XDG_CONFIG_DIRS \
+		-u XDG_CONFIG_HOME \
+		-u XDG_DATA_HOME \
+		HOME=$(CURDIR)/debian/home \
+		XDG_RUNTIME_DIR=$(CURDIR)/debian/home/run \
+		xvfb-run -a dh_auto_test
+endif

--- End Message ---
--- Begin Message ---
Simon McVittie:
> Control: retitle -1 unblock: gnome-shell/3.30.2-7
> Control: tags -1 - moreinfo
> 
> On Tue, 16 Apr 2019 at 08:08:00 +0000, Niels Thykier wrote:
>> There is a bug in d/clean.  The "debian/home" line is a directory and
>> therefore needs a trailing slash (otherwise, dh_clean will refuse to
>> remove it - see "man dh_clean").
> 
> Fixed in -7. Updated diff between buster and proposed version attached;
> interdiff also attached.
> 
> (The .gitignore was presumably excluded from intrigeri's
> upload by different git-buildpackage settings: I use "-I.git
> --extend-diff-ignore=\\.git" which doesn't exclude .gitignore and other
> .gitfoo files. I assume that isn't considered to be a problem.)
> 
>     smcv
> 

Unblocked, thanks.
~Niels

--- End Message ---

Reply to: