diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/budgie-desktop.gsettings-override budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/budgie-desktop.gsettings-override --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/budgie-desktop.gsettings-override 2019-01-13 19:23:14.000000000 +0000 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/budgie-desktop.gsettings-override 2019-04-10 22:14:25.000000000 +0100 @@ -1,5 +1,2 @@ [org.gnome.settings-daemon.plugins.xsettings:Budgie] overrides={'Gtk/ShellShowsAppMenu': <0>, 'Gtk/DecorationLayout': <'menu:minimize,maximize,close'>} - -[org.gnome.desktop.interface:Budgie] -enable-animations=false diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/changelog budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/changelog --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/changelog 2019-01-13 19:23:14.000000000 +0000 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/changelog 2019-04-10 22:14:25.000000000 +0100 @@ -1,3 +1,23 @@ +budgie-desktop (10.4+git20180830.02.f2dbc215fdb-2ubuntu0.2) cosmic; urgency=medium + + * cherrypick upstream commits + - 0009-Polkit-Correctly-handle-the-user-dismissing-the-auth.patch + Hopefully resolve fix polkit crashes reported on errors.ubuntu.com due + to Polkit dialogs still having an open process when dismissed + (LP: #1729947) + - cleanup-keygrab.patch + Correcly manage custom keys and hence resolve custom keys not + occasionally working on logon (LP: #1824229) + - close-raven-on-workspace-switch.patch + Usability patch to correctly dismiss raven if opened when a workspace + is switched (LP: #1825050) + - Ensure animations remain working with newer versions of mutter + (LP: #1824102) animations.patch + * Packaging Changes + - budgie-desktop.gsettings-override remove disabling animation override + + -- David Mohammed Wed, 10 Apr 2019 22:14:25 +0100 + budgie-desktop (10.4+git20180830.02.f2dbc215fdb-2ubuntu0.1) cosmic; urgency=medium * cherrypick upstream commits (LP: #1811620) diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/0009-Polkit-Correctly-handle-the-user-dismissing-the-auth.patch budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/0009-Polkit-Correctly-handle-the-user-dismissing-the-auth.patch --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/0009-Polkit-Correctly-handle-the-user-dismissing-the-auth.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/0009-Polkit-Correctly-handle-the-user-dismissing-the-auth.patch 2019-04-10 22:14:25.000000000 +0100 @@ -0,0 +1,95 @@ +Description: Polkit: Correctly handle the user dismissing the + authentication dialog + . + Adapted from elementary/pantheon-agent-polkit#26: + * Throw Polkit.Error.CANCELLED when the user dismisses the dialog + * Listen for events in the Cancellable object instead of using it + . + Testing: + * `pkexec` -> click cancel on dialog -> pkexec exits as dismissed + * `pkexec` -> Ctrl-C in terminal -> authentication dialog closes + . + Fixes #1279 + . Upstream commit supplemented with upstream + vapi/polkit-agent-1.vapi changes due to incorrect vapi + definition +Author: LulzFTW +Origin: https://github.com/solus-project/budgie-desktop/pull/1746 +Last-Update: 2019-02-10 +--- + +Index: budgie-desktop-10.4+git20171031.10.g9f71bb8/src/polkit/polkitdialog.vala +=================================================================== +--- budgie-desktop-10.4+git20171031.10.g9f71bb8.orig/src/polkit/polkitdialog.vala 2019-04-04 15:42:09.592298306 +0100 ++++ budgie-desktop-10.4+git20171031.10.g9f71bb8/src/polkit/polkitdialog.vala 2019-04-04 15:42:09.588298306 +0100 +@@ -34,6 +34,8 @@ + [GtkChild] + private Gtk.Label? label_error; + ++ public bool is_cancelled; ++ + public PolkitAgent.Session? pk_session = null; + private Polkit.Identity? pk_identity = null; + +@@ -92,6 +94,8 @@ + window_position = Gtk.WindowPosition.CENTER_ALWAYS; + + key_release_event.connect(on_key_release); ++ ++ cancellable.cancelled.connect(on_agent_cancelled); + } + + bool on_key_release(Gdk.EventKey key) +@@ -127,7 +131,7 @@ + { + /* Not authed */ + set_sensitive(true); +- if (!authorized || cancellable.is_cancelled()) { ++ if (!authorized) { + label_error.set_text(_("Authentication failed")); + /* TODO: Cancel non existent spinner */ + var session = pk_session; +@@ -266,9 +270,7 @@ + if (pk_session != null) { + pk_session.cancel(); + } +- if (!cancellable.is_cancelled()) { +- cancellable.cancel(); +- } ++ is_cancelled = true; + done(); + } + +@@ -285,7 +287,7 @@ + private Budgie.ThemeManager theme_manager; + + public override async bool initiate_authentication(string action_id, string message, string icon_name, +- Polkit.Details details, string cookie, GLib.List? identities, GLib.Cancellable cancellable) ++ Polkit.Details details, string cookie, GLib.List? identities, GLib.Cancellable cancellable) throws Polkit.Error + { + + var dialog = new AgentDialog(action_id, message, "dialog-password-symbolic", cookie, cancellable); +@@ -305,6 +307,10 @@ + + dialog.destroy(); + ++ if (dialog.is_cancelled) { ++ throw new Polkit.Error.CANCELLED("Authentication dialog was dismissed by the user"); ++ } ++ + return true; + } + +Index: budgie-desktop-10.4+git20171031.10.g9f71bb8/vapi/polkit-agent-1.vapi +=================================================================== +--- budgie-desktop-10.4+git20171031.10.g9f71bb8.orig/vapi/polkit-agent-1.vapi 2017-10-31 15:13:59.000000000 +0000 ++++ budgie-desktop-10.4+git20171031.10.g9f71bb8/vapi/polkit-agent-1.vapi 2019-04-04 15:42:57.056298306 +0100 +@@ -6,7 +6,7 @@ + public abstract class Listener : GLib.Object { + [CCode (has_construct_function = false)] + protected Listener (); +- public virtual async bool initiate_authentication(string action_id, string message, string icon_name, Polkit.Details details, string cookie, GLib.List? identities, GLib.Cancellable cancellable); ++ public virtual async bool initiate_authentication(string action_id, string message, string icon_name, Polkit.Details details, string cookie, GLib.List? identities, GLib.Cancellable cancellable) throws Polkit.Error; + /* + public virtual void initiate_authentication(string action_id, string message, string icon_name, Polkit.Details details, string cookie, GLib.List? identities, GLib.Cancellable cancellable, GLib.AsyncReadyCallback @callback); + public virtual bool initiate_authentication_finish (GLib.AsyncResult res) throws GLib.Error;*/ diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/animations.patch budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/animations.patch --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/animations.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/animations.patch 2019-04-10 22:14:25.000000000 +0100 @@ -0,0 +1,23 @@ +Description: Ensure animations work with newer versions of mutter + v3.28.3+git20190124-0ubuntu18.04.1 and later versions of mutter + introduce clutter optimisations that break budgie animations. + This patch forces clutter.actor redrawing to ensure screen painting + is fully redrawn so that screen artifacts are not left behind due + to paint areas not correctly being marked as damaged. +Author: David Mohammed +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1824102 +Forwarded: https://github.com/solus-project/budgie-desktop/issues/1627 +Last-Update: 2019-04-10 + +Index: budgie-desktop-10.4+git20180830.02.f2dbc215fdb/src/wm/wm.vala +=================================================================== +--- budgie-desktop-10.4+git20180830.02.f2dbc215fdb.orig/src/wm/wm.vala ++++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/src/wm/wm.vala +@@ -599,6 +599,7 @@ public class BudgieWM : Meta.Plugin + return; + } + ++ actor.queue_relayout(); + actor.remove_all_transitions(); + + unowned AnimationState? state = state_map.lookup(actor); diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/cleanup-keygrab.patch budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/cleanup-keygrab.patch --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/cleanup-keygrab.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/cleanup-keygrab.patch 2019-04-10 22:14:25.000000000 +0100 @@ -0,0 +1,19 @@ +Description: Correctly cleanup grabbing accelerators + Resolve occasional shortcuts stopping working. +Author: David Mohammed +Forwarded: https://github.com/solus-project/budgie-desktop/issues/1763 +Last-Update: 2019-03-09 + +Index: budgie-desktop-10.4+git20171031.10.g9f71bb8/src/wm/shim.vala +=================================================================== +--- budgie-desktop-10.4+git20171031.10.g9f71bb8.orig/src/wm/shim.vala 2019-04-04 14:47:38.976818000 +0100 ++++ budgie-desktop-10.4+git20171031.10.g9f71bb8/src/wm/shim.vala 2019-04-04 14:47:38.972815999 +0100 +@@ -221,7 +221,7 @@ + continue; + } + display.ungrab_accelerator(key); +- grabs.remove(key); ++ iter.remove(); + } + } + diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/close-raven-on-workspace-switch.patch budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/close-raven-on-workspace-switch.patch --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/close-raven-on-workspace-switch.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/close-raven-on-workspace-switch.patch 2019-04-10 22:14:25.000000000 +0100 @@ -0,0 +1,28 @@ +Description: close raven when workspace switched + . + Part of the upstream commit +Author: David Mohammed +Origin: upstream, https://github.com/solus-project/budgie-desktop/commit/875a115c62f1e38a239bbdb471c8bd9c913725b9 +Bug: https://github.com/solus-project/budgie-desktop/issues/937 +Last-Update: 2019-04-04 + +Index: budgie-desktop-10.4+git20180830.02.f2dbc215fdb/src/wm/wm.vala +=================================================================== +--- budgie-desktop-10.4+git20180830.02.f2dbc215fdb.orig/src/wm/wm.vala ++++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/src/wm/wm.vala +@@ -1313,6 +1313,15 @@ public class BudgieWM : Meta.Plugin + public const int SWITCH_TIMEOUT = 250; + public override void switch_workspace(int from, int to, Meta.MotionDirection direction) + { ++ if (raven_proxy != null) { // Raven proxy is defined ++ try { ++ raven_proxy.Dismiss.begin(); // Dismiss ++ Timeout.add(200, () => {return false;}); // Delay until animation is complete. Looks janky otherwise ++ } catch (Error e) { ++ warning("Failed to dismiss Raven: %s", e.message); ++ } ++ } ++ + // Stop the Switcher if it was showing + this.stop_switch_windows(); + diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/series budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/series --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/series 2019-01-13 19:23:14.000000000 +0000 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/series 2019-04-10 22:14:25.000000000 +0100 @@ -13,3 +13,7 @@ 1000-Obtain-gsettings-transparency-key-value-before-showi.patch deduplicate-menuall.patch fix_panel_autohide.patch +0009-Polkit-Correctly-handle-the-user-dismissing-the-auth.patch +cleanup-keygrab.patch +close-raven-on-workspace-switch.patch +animations.patch