diff -Nru budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/changelog budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/changelog --- budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/changelog 2018-04-01 20:28:30.000000000 +0100 +++ budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/changelog 2019-01-13 19:02:27.000000000 +0000 @@ -1,3 +1,25 @@ +budgie-desktop (10.4+git20171031.10.g9f71bb8-1.2ubuntu1.1) bionic; urgency=medium + + * cherrypick upstream commits (LP: #1811620) + - 0003-Fix-show-desktop-applet-1609.patch: + Ensure show-desktop applet toggles correctly after showing a tooltip + - 0004-polkit-Ensure-the-cancellable-is-truly-unowned.patch: + Allow cancel from polkit windows + - 0005-Set-ellipsize-property-on-notifications.patch + 0006-Ensure-notification-title-is-properly-ellipsized.-Re.patch + Make notifications consistent size; stop overlarge notification + windows + - 0007-Disable-notification-timeout-when-mouse-hovering.-Re.patch + Ensure notifications remain visible if mouse is hovering over theme + - 0008-Fix-reading-themes-from-users-.themes-folder.patch + Support user based themes in legacy ~/.themes folder + - fix_panel_autohide.patch + Enable autohiding when using multiple budgie panels + - deduplicate-menuall.patch + deduplicate All category Menu + + -- David Mohammed Sun, 13 Jan 2019 19:02:27 +0000 + budgie-desktop (10.4+git20171031.10.g9f71bb8-1.2ubuntu1) bionic; urgency=medium * Bug fix release diff -Nru budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0002-Switch-to-checking-GSD-version-for-the-build-1319.patch budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0002-Switch-to-checking-GSD-version-for-the-build-1319.patch --- budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0002-Switch-to-checking-GSD-version-for-the-build-1319.patch 2018-03-17 15:41:00.000000000 +0000 +++ budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0002-Switch-to-checking-GSD-version-for-the-build-1319.patch 2019-01-13 19:02:27.000000000 +0000 @@ -20,7 +20,7 @@ +++ b/src/session/meson.build @@ -9,7 +9,6 @@ gnome_session_components = [ ] - + gnome_session_324_components = [ - 'org.gnome.SettingsDaemon.A11yKeyboard', 'org.gnome.SettingsDaemon.A11ySettings', @@ -29,7 +29,7 @@ @@ -29,6 +28,10 @@ gnome_session_324_components = [ 'org.gnome.SettingsDaemon.XSettings', ] - + +gsd_324_key = [ + 'org.gnome.SettingsDaemon.A11yKeyboard' +] @@ -40,7 +40,7 @@ @@ -45,11 +48,14 @@ if with_polkit == true budgie_components += 'budgie-polkit' endif - + -# Merge the list depending on the GNOME version. We pick mutter arbitrarily. -if dep_mutter.version().version_compare('>=3.25.4') +dep_gsd = dependency('gnome-settings-daemon', version: gnome_minimum_version) @@ -56,6 +56,6 @@ else session_components = gnome_session_components + budgie_components endif --- +-- 2.14.1 diff -Nru budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0003-Fix-show-desktop-applet-1609.patch budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0003-Fix-show-desktop-applet-1609.patch --- budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0003-Fix-show-desktop-applet-1609.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0003-Fix-show-desktop-applet-1609.patch 2019-01-13 19:02:27.000000000 +0000 @@ -0,0 +1,87 @@ +Description: [PATCH] Fix show desktop applet (#1609) + After the show-desktop applet tooltip is shown, the applet no + longer toggles the desktop. This patch resolves this. +Author: Yurizal Susanto +Origin: Commit d4373f3be4aebb4c79443e075da7544ff00ad584 +Last-Update: 2018-12-03 + +--- + .../show-desktop/ShowDesktopApplet.vala | 46 +++++++++++++++++-- + 1 file changed, 41 insertions(+), 5 deletions(-) + +diff --git a/src/applets/show-desktop/ShowDesktopApplet.vala b/src/applets/show-desktop/ShowDesktopApplet.vala +index cb48e322..1f008135 100644 +--- a/src/applets/show-desktop/ShowDesktopApplet.vala ++++ b/src/applets/show-desktop/ShowDesktopApplet.vala +@@ -22,6 +22,7 @@ public class ShowDesktopApplet : Budgie.Applet + protected Gtk.ToggleButton widget; + protected Gtk.Image img; + private Wnck.Screen wscreen; ++ private List window_list; + + public ShowDesktopApplet() + { +@@ -32,20 +33,55 @@ public class ShowDesktopApplet : Budgie.Applet + widget.add(img); + widget.set_tooltip_text(_("Toggle the desktop")); + ++ window_list = new List(); + wscreen = Wnck.Screen.get_default(); + +- wscreen.showing_desktop_changed.connect(()=> { +- bool showing = wscreen.get_showing_desktop(); +- widget.set_active(showing); ++ wscreen.window_opened.connect(() => { ++ window_list = new List(); ++ widget.set_active(false); + }); + +- widget.clicked.connect(()=> { +- wscreen.toggle_showing_desktop(widget.get_active()); ++ widget.toggled.connect(() => { ++ if (widget.get_active()) { ++ wscreen.get_windows_stacked().foreach(record_windows_state); ++ } else { ++ window_list.foreach(unminimize_windows); ++ } + }); + + add(widget); + show_all(); + } ++ ++ private void record_windows_state(Wnck.Window window) ++ { ++ if (window.is_skip_pager() || window.is_skip_tasklist()) { ++ return; ++ } ++ ++ window.state_changed.connect(() => { ++ if (!window.is_minimized()) { ++ window_list = new List(); ++ widget.set_active(false); ++ } ++ }); ++ ++ if (!window.is_minimized()) { ++ window_list.append(window.get_xid()); ++ window.minimize(); ++ } ++ } ++ ++ private void unminimize_windows(ulong xid) ++ { ++ var window = Wnck.Window.@get(xid); ++ ++ if (window != null && window.is_minimized()) { ++ var utc_now = new DateTime.now_utc(); ++ var now = (uint32) utc_now.to_unix(); ++ window.unminimize(now); ++ } ++ } + } + + +-- +2.17.1 + diff -Nru budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0004-polkit-Ensure-the-cancellable-is-truly-unowned.patch budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0004-polkit-Ensure-the-cancellable-is-truly-unowned.patch --- budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0004-polkit-Ensure-the-cancellable-is-truly-unowned.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0004-polkit-Ensure-the-cancellable-is-truly-unowned.patch 2019-01-13 19:02:27.000000000 +0000 @@ -0,0 +1,26 @@ +Description: [PATCH] polkit: Ensure the cancellable is truly unowned + Cancel button on polkit windows does not work. This patch resolves this +Origin: Commit 48cf2594ea7d42a6492b7aaaea52e5bee9d3a8d0 +Author: Ikey Doherty +Last-Update: 2018-05-01 + +--- + src/polkit/polkitdialog.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/polkit/polkitdialog.vala b/src/polkit/polkitdialog.vala +index 397579fc..5f677e07 100644 +--- a/src/polkit/polkitdialog.vala ++++ b/src/polkit/polkitdialog.vala +@@ -68,7 +68,7 @@ public class AgentDialog : Gtk.Window + } + + /* Manipulate Vala's pointer logic to prevent a copy */ +- public unowned GLib.Cancellable? cancellable { public set ; public get; } ++ public unowned GLib.Cancellable? cancellable { public set ; public unowned get; } + + public string cookie { public get; public set; } + +-- +2.17.1 + diff -Nru budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0005-Set-ellipsize-property-on-notifications.patch budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0005-Set-ellipsize-property-on-notifications.patch --- budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0005-Set-ellipsize-property-on-notifications.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20171031.10.g9f71bb8/debian/patches/0005-Set-ellipsize-property-on-notifications.patch 2019-01-13 19:02:27.000000000 +0000 @@ -0,0 +1,31 @@ +Description: [PATCH] Set ellipsize property on notifications + Ref #1267 +Origin: Commit f9347a830595a8064e6e487d45c17d42cedc0f8b +Last-Update: 2018-08-06 +Author: Unknown +--- + src/raven/ui/notification.ui | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/raven/ui/notification.ui b/src/raven/ui/notification.ui +index f5dae9cb..566c1e6a 100644 +--- a/src/raven/ui/notification.ui ++++ b/src/raven/ui/notification.ui +@@ -1,5 +1,5 @@ + +- ++ + + + +@@ -80,6 +80,7 @@ + + True + word-char ++ end + 0 +