Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: gnome-control-center

gnome-control-center (1:3.36.4-1ubuntu1) groovy; urgency=medium * New stable version (lp: #1886495) [ Hui Wang ] * debian/patches/gitlab_ucm_mixer_control_select.patch: - consolidate port finding and setting with/without ucm (lp: #1885673) [ Marco Trevisan (Treviño) ] * Merge with debian unstable, containing new stable upstream version * Refresh patches: - d/p/0028-user-panel-Add-reference-to-selected-user-and-clear-.patch, d/p/0029-user-panel-Don-t-wait-for-fprintd-on-initialization.patch, d/p/0030-fingerprint-dialog-Don-t-use-sync-calls-for-deleting.patch, d/p/0031-fingerprint-dialog-Don-t-limit-the-number-of-maximum.patch, d/p/git-sound-profile.patch: + Removed, applied upstream - d/p/Revert-build-Bump-build-dependency-on-polkit.patch: + Removed, was a duplicated file for patch 0021. * user-accounts: Use newly designed fingerprint enroll dialog (LP: #1873298) -- Sebastien Bacher <seb128@ubuntu.com> Wed, 08 Jul 2020 17:03:08 +0200

Modifications :
  1. Download patch debian/patches/0032-online-accounts-maybe-leak-a-reference-to-the-panel.patch

    --- 1:3.36.4-1/debian/patches/0032-online-accounts-maybe-leak-a-reference-to-the-panel.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0032-online-accounts-maybe-leak-a-reference-to-the-panel.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,24 @@ +From: Olivier Tilloy <olivier.tilloy@canonical.com> +Date: Mon, 27 Apr 2020 22:32:03 +0200 +Subject: [PATCH] online-accounts: maybe leak a reference to the panel, + to prevent a crash. + +Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/401 +Bug-Ubuntu: https://bugs.launchpad.net/gnome-control-center/+bug/1862553 +--- + panels/online-accounts/cc-online-accounts-panel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c +index b9607b8..e1c7e93 100644 +--- a/panels/online-accounts/cc-online-accounts-panel.c ++++ b/panels/online-accounts/cc-online-accounts-panel.c +@@ -874,7 +874,7 @@ get_all_providers_cb (GObject *source, + GAsyncResult *res, + gpointer user_data) + { +- g_autoptr(CcGoaPanel) self = user_data; ++ CcGoaPanel *self = CC_GOA_PANEL (user_data); + GList *providers; + GList *l; +
  2. Download patch debian/patches/0023-sound-Add-a-button-to-select-the-default-theme.patch

    --- 1:3.36.4-1/debian/patches/0023-sound-Add-a-button-to-select-the-default-theme.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0023-sound-Add-a-button-to-select-the-default-theme.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,124 @@ +From: Robert Ancell <robert.ancell@canonical.com> +Date: Thu, 19 Mar 2020 16:44:44 +1300 +Subject: [PATCH 23/26] sound: Add a button to select the default theme + +--- + panels/sound/cc-alert-chooser.c | 44 +++++++++++++++++++++++++++++++++++++++- + panels/sound/cc-alert-chooser.ui | 7 +++++++ + 2 files changed, 50 insertions(+), 1 deletion(-) + +diff --git a/panels/sound/cc-alert-chooser.c b/panels/sound/cc-alert-chooser.c +index 8e60659..77363e1 100644 +--- a/panels/sound/cc-alert-chooser.c ++++ b/panels/sound/cc-alert-chooser.c +@@ -31,6 +31,7 @@ struct _CcAlertChooser + GtkBox parent_instance; + + CcSoundButton *bark_button; ++ CcSoundButton *default_button; + CcSoundButton *drip_button; + CcSoundButton *glass_button; + CcSoundButton *sonar_button; +@@ -124,6 +125,27 @@ set_sound_symlink (const gchar *alert_name, + g_warning ("Failed to make sound theme symbolic link %s->%s: %s", source_path, target_path, error->message); + } + ++static void ++remove_sound_symlink (const gchar *alert_name) ++{ ++ g_autofree gchar *dir = NULL; ++ g_autofree gchar *source_filename = NULL; ++ g_autofree gchar *source_path = NULL; ++ g_autoptr(GFile) file = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ dir = get_theme_dir (); ++ source_filename = g_strdup_printf ("%s.ogg", alert_name); ++ source_path = g_build_filename (dir, source_filename, NULL); ++ ++ file = g_file_new_for_path (source_path); ++ if (!g_file_delete (file, NULL, &error)) ++ { ++ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) ++ g_warning ("Failed to remove existing sound symbolic link %s: %s", source_path, error->message); ++ } ++} ++ + static void + set_custom_theme (CcAlertChooser *self, + const gchar *name) +@@ -165,6 +187,16 @@ set_custom_theme (CcAlertChooser *self, + g_settings_set_string (self->sound_settings, "theme-name", CUSTOM_THEME_NAME); + } + ++static void ++set_default_theme (CcAlertChooser *self) ++{ ++ remove_sound_symlink ("bell-terminal"); ++ remove_sound_symlink ("bell-window-system"); ++ ++ g_settings_set_boolean (self->sound_settings, "event-sounds", TRUE); ++ g_settings_reset (self->sound_settings, "theme-name"); ++} ++ + static void + select_sound (CcAlertChooser *self, + const gchar *name) +@@ -199,6 +231,11 @@ clicked_cb (CcAlertChooser *self, + { + if (button == self->bark_button) + select_sound (self, "bark"); ++ else if (button == self->default_button) ++ { ++ set_default_theme (self); ++ gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (self))); ++ } + else if (button == self->drip_button) + select_sound (self, "drip"); + else if (button == self->glass_button) +@@ -209,6 +246,8 @@ clicked_cb (CcAlertChooser *self, + set_button (self, button, TRUE); + if (button != self->bark_button) + set_button (self, self->bark_button, FALSE); ++ if (button != self->default_button) ++ set_button (self, self->default_button, FALSE); + if (button != self->drip_button) + set_button (self, self->drip_button, FALSE); + if (button != self->glass_button) +@@ -239,6 +278,7 @@ cc_alert_chooser_class_init (CcAlertChooserClass *klass) + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-alert-chooser.ui"); + + gtk_widget_class_bind_template_child (widget_class, CcAlertChooser, bark_button); ++ gtk_widget_class_bind_template_child (widget_class, CcAlertChooser, default_button); + gtk_widget_class_bind_template_child (widget_class, CcAlertChooser, drip_button); + gtk_widget_class_bind_template_child (widget_class, CcAlertChooser, glass_button); + gtk_widget_class_bind_template_child (widget_class, CcAlertChooser, sonar_button); +@@ -265,7 +305,9 @@ cc_alert_chooser_init (CcAlertChooser *self) + self->sound_settings = g_settings_new (KEY_SOUNDS_SCHEMA); + + alert_name = get_alert_name (); +- if (g_strcmp0 (alert_name, "bark") == 0) ++ if (alert_name == NULL) ++ set_button (self, self->default_button, TRUE); ++ else if (g_strcmp0 (alert_name, "bark") == 0) + set_button (self, self->bark_button, TRUE); + else if (g_strcmp0 (alert_name, "drip") == 0) + set_button (self, self->drip_button, TRUE); +diff --git a/panels/sound/cc-alert-chooser.ui b/panels/sound/cc-alert-chooser.ui +index c673711..4fa0fbc 100644 +--- a/panels/sound/cc-alert-chooser.ui ++++ b/panels/sound/cc-alert-chooser.ui +@@ -6,6 +6,13 @@ + <style> + <class name="linked"/> + </style> ++ <child> ++ <object class="CcSoundButton" id="default_button"> ++ <property name="visible">True</property> ++ <property name="label" translatable="yes">Default</property> ++ <signal name="clicked" handler="clicked_cb" object="CcAlertChooser" swapped="yes"/> ++ </object> ++ </child> + <child> + <object class="CcSoundButton" id="bark_button"> + <property name="visible">True</property>
  3. Download patch debian/patches/0001-Expose-touchpad-settings-if-synaptics-is-in-use.patch

    --- 1:3.36.4-1/debian/patches/0001-Expose-touchpad-settings-if-synaptics-is-in-use.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0001-Expose-touchpad-settings-if-synaptics-is-in-use.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,88 @@ +From: Daniel van Vugt <daniel.van.vugt@canonical.com> +Date: Fri, 16 Mar 2018 13:53:10 -0400 +Subject: [PATCH 01/26] Expose touchpad settings if synaptics is in use + +Upstream is aggressively pushing for libinput over synaptics. However that +creates a factually incorrect situation where gnome-control-center thinks +there is no touchpad unless you're using the xserver-xorg-input-libinput. +This patch adds support for both drivers, removing the code that would +hide the touchpad settings when xserver-xorg-input-synaptics is in use. + +This patch is only useful in the GNOME on Xorg session. +In GNOME on Wayland, libinput is used anyway. + +This patch requires a companion patch in mutter which GNOME has rejected. + +https://gitlab.gnome.org/GNOME/mutter/merge_requests/37 +--- + panels/mouse/cc-mouse-caps-helper.c | 7 +++++++ + panels/mouse/cc-mouse-panel.c | 16 +++++++++------- + 2 files changed, 16 insertions(+), 7 deletions(-) + +diff --git a/panels/mouse/cc-mouse-caps-helper.c b/panels/mouse/cc-mouse-caps-helper.c +index 69546b2..39534b9 100644 +--- a/panels/mouse/cc-mouse-caps-helper.c ++++ b/panels/mouse/cc-mouse-caps-helper.c +@@ -38,6 +38,13 @@ touchpad_check_capabilities_x11 (gboolean *have_two_finger_scrolling, + unsigned long nitems, bytes_after; + unsigned char *data; + ++ if (cc_synaptics_check ()) { ++ *have_two_finger_scrolling = TRUE; ++ *have_edge_scrolling = TRUE; ++ *have_tap_to_click = TRUE; ++ return TRUE; ++ } ++ + gdisplay = gdk_display_get_default (); + display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); + prop_scroll_methods = XInternAtom (display, "libinput Scroll Methods Available", False); +diff --git a/panels/mouse/cc-mouse-panel.c b/panels/mouse/cc-mouse-panel.c +index df2cd4b..a90062f 100644 +--- a/panels/mouse/cc-mouse-panel.c ++++ b/panels/mouse/cc-mouse-panel.c +@@ -72,7 +72,6 @@ struct _CcMousePanel + gboolean have_mouse; + gboolean have_touchpad; + gboolean have_touchscreen; +- gboolean have_synaptics; + + gboolean left_handed; + GtkGesture *left_gesture; +@@ -90,7 +89,7 @@ setup_touchpad_options (CcMousePanel *self) + gboolean have_edge_scrolling; + gboolean have_tap_to_click; + +- if (self->have_synaptics || !self->have_touchpad) { ++ if (!self->have_touchpad) { + gtk_widget_hide (GTK_WIDGET (self->touchpad_frame)); + return; + } +@@ -314,7 +313,10 @@ device_changed (GsdDeviceManager *device_manager, + GsdDevice *device, + CcMousePanel *self) + { +- self->have_touchpad = touchpad_is_present (); ++ self->have_touchpad = touchpad_is_present () || cc_synaptics_check (); ++ /* ^^^^^^^^^^^^^^^^^^^^^ ++ * Workaround https://gitlab.gnome.org/GNOME/gtk/issues/97 ++ */ + + setup_touchpad_options (self); + +@@ -409,11 +411,11 @@ cc_mouse_panel_init (CcMousePanel *self) + G_CALLBACK (device_changed), self); + + self->have_mouse = mouse_is_present (); +- self->have_touchpad = touchpad_is_present (); ++ self->have_touchpad = touchpad_is_present () || cc_synaptics_check (); ++ /* ^^^^^^^^^^^^^^^^^^^^^ ++ * Workaround https://gitlab.gnome.org/GNOME/gtk/issues/97 ++ */ + self->have_touchscreen = touchscreen_is_present (); +- self->have_synaptics = cc_synaptics_check (); +- if (self->have_synaptics) +- g_warning ("Detected synaptics X driver, please migrate to libinput"); + + setup_dialog (self); + }
  4. Download patch debian/patches/0014-shell-Change-the-default-height-so-all-category-are-.patch

    --- 1:3.36.4-1/debian/patches/0014-shell-Change-the-default-height-so-all-category-are-.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0014-shell-Change-the-default-height-so-all-category-are-.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,24 @@ +From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Date: Mon, 19 Aug 2019 16:17:20 +0100 +Subject: [PATCH 14/26] shell: Change the default height so all category are + on screen + +Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1728450 +Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=789372 +--- + shell/cc-window.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shell/cc-window.ui b/shell/cc-window.ui +index fb4c174..dfaf65a 100644 +--- a/shell/cc-window.ui ++++ b/shell/cc-window.ui +@@ -5,7 +5,7 @@ + <property name="can_focus">False</property> + <property name="window_position">center</property> + <property name="default-width">980</property> +- <property name="default-height">640</property> ++ <property name="default-height">770</property> + <signal name="notify::window" handler="gdk_window_set_cb" object="CcWindow" swapped="yes" /> + <signal name="map-event" handler="window_map_event_cb" object="CcWindow" swapped="yes" /> + <signal name="key-press-event" handler="window_key_press_event_cb" object="CcWindow" swapped="yes" after="yes" />
  5. Download patch debian/patches/0011-region-Add-Language-Selector-button.patch

    --- 1:3.36.4-1/debian/patches/0011-region-Add-Language-Selector-button.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0011-region-Add-Language-Selector-button.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,102 @@ +From: Jeremy Bicha <jbicha@ubuntu.com> +Date: Thu, 14 Sep 2017 09:23:42 -0400 +Subject: [PATCH 11/26] region: Add Language Selector button + +Workaround for https://launchpad.net/bugs/1631750 +--- + panels/region/cc-region-panel.c | 23 +++++++++++++++++++++++ + panels/region/cc-region-panel.ui | 26 ++++++++++++++++++++++++++ + 2 files changed, 49 insertions(+) + +diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c +index 060b48e..a8f7293 100644 +--- a/panels/region/cc-region-panel.c ++++ b/panels/region/cc-region-panel.c +@@ -73,6 +73,7 @@ struct _CcRegionPanel { + GtkListBox *language_list; + GtkListBoxRow *language_row; + GtkFrame *language_section_frame; ++ GtkButton *language_support_button; + GtkLabel *next_source; + GtkLabel *next_source_label; + GtkListBoxRow *no_inputs_row; +@@ -1300,6 +1301,26 @@ strip_quotes (const gchar *str) + return g_strdup (str); + } + ++ ++static void ++show_language_support (CcRegionPanel *self) ++{ ++ g_autoptr(GAppInfo) app_info = NULL; ++ g_autoptr(GdkAppLaunchContext) ctx = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ app_info = G_APP_INFO (g_desktop_app_info_new ("gnome-language-selector.desktop")); ++ ++ if (app_info == NULL) { ++ g_warning ("Failed to launch language-selector: couldn't create GDesktopAppInfo"); ++ return; ++ } ++ ++ ctx = gdk_display_get_app_launch_context (gdk_display_get_default ()); ++ if (!g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (ctx), &error)) ++ g_warning ("Failed to launch language-selector: %s", error->message); ++} ++ + static void + on_localed_properties_changed (CcRegionPanel *self, + GVariant *changed_properties, +@@ -1625,6 +1646,7 @@ cc_region_panel_class_init (CcRegionPanelClass * klass) + gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, language_list); + gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, language_row); + gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, language_section_frame); ++ gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, language_support_button); + gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, next_source); + gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, next_source_label); + gtk_widget_class_bind_template_child (widget_class, CcRegionPanel, no_inputs_row); +@@ -1638,6 +1660,7 @@ cc_region_panel_class_init (CcRegionPanelClass * klass) + + gtk_widget_class_bind_template_callback (widget_class, input_row_activated_cb); + gtk_widget_class_bind_template_callback (widget_class, restart_now); ++ gtk_widget_class_bind_template_callback (widget_class, show_language_support); + } + + static void +diff --git a/panels/region/cc-region-panel.ui b/panels/region/cc-region-panel.ui +index 20456aa..77da641 100644 +--- a/panels/region/cc-region-panel.ui ++++ b/panels/region/cc-region-panel.ui +@@ -304,6 +304,32 @@ + </style> + </object> + </child> ++ <child> ++ <object class="GtkBox"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkButton" id="language_support_button"> ++ <property name="label" translatable="yes">Manage Installed Languages</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ <signal name="clicked" handler="show_language_support" object="CcRegionPanel" swapped="yes"/> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="pack_type">end</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">3</property> ++ </packing> ++ </child> + </object> + </child> + </object>
  6. Download patch debian/patches/0003-info-overview-Use-the-Ubuntu-logo-prominently.patch

    --- 1:3.36.4-1/debian/patches/0003-info-overview-Use-the-Ubuntu-logo-prominently.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0003-info-overview-Use-the-Ubuntu-logo-prominently.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,29 @@ +From: Bastien Nocera <hadess@hadess.net> +Date: Mon, 3 Feb 2020 14:46:15 +0100 +Subject: [PATCH 03/26] info-overview: Use the Ubuntu logo prominently + +This removes GNOME branding in favour of Ubuntu branding. We don't +make changes to the text information as the distribution/OS is clearly +visible above the GNOME version. + +See https://bugzilla.gnome.org/show_bug.cgi?id=695691 + +(Patch taken from Fedora and updated for Ubuntu) +--- + panels/info-overview/cc-info-overview-panel.ui | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui +index de377bb..5333246 100644 +--- a/panels/info-overview/cc-info-overview-panel.ui ++++ b/panels/info-overview/cc-info-overview-panel.ui +@@ -30,7 +30,8 @@ + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> +- <property name="resource">/org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg</property> ++ <property name="pixel_size">128</property> ++ <property name="icon_name">ubuntu-logo-icon</property> + </object> + <packing> + <property name="expand">False</property>
  7. Download patch debian/patches/0030-temporarily-revert-alt-char-key.patch
  8. Download patch debian/patches/0002-Debian-s-adduser-doesn-t-allow-uppercase-letters-by-.patch

    --- 1:3.36.4-1/debian/patches/0002-Debian-s-adduser-doesn-t-allow-uppercase-letters-by-.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0002-Debian-s-adduser-doesn-t-allow-uppercase-letters-by-.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,24 @@ +From: Andrea Azzarone <andrea.azzarone@canonical.com> +Date: Tue, 31 Jul 2018 04:44:11 +0100 +Subject: [PATCH 02/26] Debian's adduser doesn't allow uppercase letters by + default. + +Forwarded: no +Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910141 +--- + panels/user-accounts/cc-add-user-dialog.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/panels/user-accounts/cc-add-user-dialog.c b/panels/user-accounts/cc-add-user-dialog.c +index 0b955c1..70f5602 100644 +--- a/panels/user-accounts/cc-add-user-dialog.c ++++ b/panels/user-accounts/cc-add-user-dialog.c +@@ -234,7 +234,7 @@ local_create_user (CcAddUserDialog *self) + + manager = act_user_manager_get_default (); + act_user_manager_create_user_async (manager, +- username, ++ g_ascii_strdown (username, -1), + name, + account_type, + self->cancellable,
  9. Download patch debian/patches/0007-sound-Allow-volume-to-be-set-above-100.patch

    --- 1:3.36.4-1/debian/patches/0007-sound-Allow-volume-to-be-set-above-100.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0007-sound-Allow-volume-to-be-set-above-100.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,192 @@ +From: Jeremy Bicha <jbicha@debian.org> +Date: Sat, 9 Feb 2019 16:32:03 -0500 +Subject: [PATCH 07/26] sound: Allow volume to be set above 100%. + +Some systems have low maximum volume set (like x220), allow, from an option +in gnome-control-center to set it above that 100% limit from g-s-d +(keyboard) and gnome-shell. +Only show the above 100% volume option if: +1. you are in an ubuntu session +2. the selected output supports amplified volume. If so: + present the settings to google that on and off. It will enable + GNOME Shell and media keys to set the sound above 100%. If not + enabled, volume and sliders are all capped to 100%. (LP: #1706524) +Modified from original patch in unity-control-center from Lars Uebernickel. +Adapted for Ubuntu gnome-control-center by Didier Roche +Updated for GNOME 3.32 by Jeremy Bicha +Origin: ubuntu +Bug-Ubuntu: https://launchpad.net/bugs/1706524 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=710424 +--- + panels/sound/cc-sound-panel.c | 20 +++++++++ + panels/sound/cc-sound-panel.ui | 92 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 112 insertions(+) + +diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c +index 7a7e20b..30f12e1 100644 +--- a/panels/sound/cc-sound-panel.c ++++ b/panels/sound/cc-sound-panel.c +@@ -65,6 +65,9 @@ struct _CcSoundPanel + CcProfileComboBox *output_profile_combo_box; + GtkListBoxRow *output_profile_row; + CcVolumeSlider *output_volume_slider; ++ CcVolumeSlider *output_volume_slider_ubuntu; ++ GtkWidget *allow_amplify_switch; ++ GtkWidget *ubuntu_output_frame; + CcStreamListBox *stream_list_box; + GtkListBoxRow *subwoofer_row; + CcSubwooferSlider *subwoofer_slider; +@@ -88,6 +91,8 @@ allow_amplified_changed_cb (CcSoundPanel *self) + { + cc_volume_slider_set_is_amplified (self->output_volume_slider, + g_settings_get_boolean (self->sound_settings, "allow-volume-above-100-percent")); ++ cc_volume_slider_set_is_amplified (self->output_volume_slider_ubuntu, ++ g_settings_get_boolean (self->sound_settings, "allow-volume-above-100-percent")); + } + + static void +@@ -107,6 +112,7 @@ output_device_changed_cb (CcSoundPanel *self) + stream = gvc_mixer_control_get_stream_from_device (self->mixer_control, device); + + cc_volume_slider_set_stream (self->output_volume_slider, stream, CC_STREAM_TYPE_OUTPUT); ++ cc_volume_slider_set_stream (self->output_volume_slider_ubuntu, stream, CC_STREAM_TYPE_OUTPUT); + cc_level_bar_set_stream (self->output_level_bar, stream, CC_STREAM_TYPE_OUTPUT); + + if (stream != NULL) +@@ -210,6 +216,9 @@ cc_sound_panel_class_init (CcSoundPanelClass *klass) + gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_profile_combo_box); + gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_profile_row); + gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_volume_slider); ++ gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_volume_slider_ubuntu); ++ gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, allow_amplify_switch); ++ gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, ubuntu_output_frame); + gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, stream_list_box); + gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, subwoofer_row); + gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, subwoofer_slider); +@@ -254,12 +263,23 @@ cc_sound_panel_init (CcSoundPanel *self) + G_CONNECT_SWAPPED); + allow_amplified_changed_cb (self); + ++ if (strstr (g_getenv("XDG_CURRENT_DESKTOP"), "ubuntu") != NULL) { ++ gtk_widget_set_visible(self->ubuntu_output_frame, TRUE); ++ gtk_widget_set_visible(GTK_WIDGET (self->output_volume_slider), FALSE); ++ g_settings_bind (self->sound_settings, "allow-volume-above-100-percent", ++ self->allow_amplify_switch, "active", G_SETTINGS_BIND_DEFAULT); ++ } else { ++ gtk_widget_set_visible(self->ubuntu_output_frame, FALSE); ++ gtk_widget_set_visible(GTK_WIDGET (self->output_volume_slider), TRUE); ++ } ++ + self->mixer_control = gvc_mixer_control_new ("GNOME Settings"); + gvc_mixer_control_open (self->mixer_control); + + cc_stream_list_box_set_mixer_control (self->stream_list_box, self->mixer_control); + cc_volume_slider_set_mixer_control (self->input_volume_slider, self->mixer_control); + cc_volume_slider_set_mixer_control (self->output_volume_slider, self->mixer_control); ++ cc_volume_slider_set_mixer_control (self->output_volume_slider_ubuntu, self->mixer_control); + cc_subwoofer_slider_set_mixer_control (self->subwoofer_slider, self->mixer_control); + cc_device_combo_box_set_mixer_control (self->input_device_combo_box, self->mixer_control, FALSE); + cc_device_combo_box_set_mixer_control (self->output_device_combo_box, self->mixer_control, TRUE); +diff --git a/panels/sound/cc-sound-panel.ui b/panels/sound/cc-sound-panel.ui +index 588c578..18a2995 100644 +--- a/panels/sound/cc-sound-panel.ui ++++ b/panels/sound/cc-sound-panel.ui +@@ -37,6 +37,98 @@ + <property name="visible">True</property> + </object> + </child> ++ <child> ++ <object class="GtkFrame" id="ubuntu_output_frame"> ++ <property name="visible">False</property> ++ <child> ++ <object class="GtkListBox" id="ubuntu_output_box"> ++ <property name="visible">True</property> ++ <property name="selection_mode">none</property> ++ <child> ++ <object class="GtkListBoxRow"> ++ <property name="width_request">100</property> ++ <property name="height_request">80</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <child> ++ <object class="CcVolumeSlider" id="output_volume_slider_ubuntu"> ++ <property name="visible">True</property> ++ </object> ++ </child> ++ </object> ++ </child> ++ <child> ++ <object class="GtkListBoxRow"> ++ <property name="width_request">100</property> ++ <property name="height_request">80</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <child> ++ <object class="GtkGrid"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="margin_left">20</property> ++ <property name="margin_right">20</property> ++ <property name="margin_top">10</property> ++ <property name="margin_bottom">10</property> ++ <property name="row_spacing">2</property> ++ <property name="column_spacing">16</property> ++ <child> ++ <object class="GtkLabel" id="allow_amplify_label"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="halign">start</property> ++ <property name="valign">center</property> ++ <property name="label" translatable="yes">Over-Amplification</property> ++ <property name="mnemonic-widget">allow_amplify_switch</property> ++ <attributes> ++ <attribute name="weight" value="bold"/> ++ </attributes> ++ </object> ++ <packing> ++ <property name="left_attach">0</property> ++ <property name="top_attach">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkSwitch" id="allow_amplify_switch"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="halign">end</property> ++ <property name="valign">center</property> ++ </object> ++ <packing> ++ <property name="left_attach">1</property> ++ <property name="top_attach">0</property> ++ <property name="height">2</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="allow_amplify_desc"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="label" translatable="yes">Allows raising the volume above 100%. This can result in a loss of audio quality; it is better to increase application volume settings, if possible.</property> ++ <property name="wrap">True</property> ++ <attributes> ++ <attribute name="scale" value="0.9"/> ++ </attributes> ++ <style> ++ <class name="dim-label"/> ++ </style> ++ </object> ++ <packing> ++ <property name="left_attach">0</property> ++ <property name="top_attach">1</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property>
  10. Download patch debian/upstream/metadata

    --- 1:3.36.4-1/debian/upstream/metadata 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -Bug-Database: http://gitlab.gnome.org/GNOME/gnome-control-center/issues -Bug-Submit: http://gitlab.gnome.org/GNOME/gnome-control-center/issues/new -Repository: https://gitlab.gnome.org/GNOME/gnome-control-center.git -Repository-Browse: https://gitlab.gnome.org/GNOME/gnome-control-center
  11. Download patch debian/patches/0018-applications-Add-hack-detect-snaps-before-X-SnapInst.patch

    --- 1:3.36.4-1/debian/patches/0018-applications-Add-hack-detect-snaps-before-X-SnapInst.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0018-applications-Add-hack-detect-snaps-before-X-SnapInst.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,41 @@ +From: Robert Ancell <robert.ancell@canonical.com> +Date: Tue, 12 Mar 2019 15:31:38 +1300 +Subject: [PATCH 18/26] applications: Add hack detect snaps before + X-SnapInstanceName works + +--- + panels/applications/cc-applications-panel.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c +index 59964b1..7352ba5 100644 +--- a/panels/applications/cc-applications-panel.c ++++ b/panels/applications/cc-applications-panel.c +@@ -225,8 +225,9 @@ get_portal_app_id (GAppInfo *info) + { + if (G_IS_DESKTOP_APP_INFO (info)) + { +- g_autofree gchar *snap_name = NULL; + gchar *flatpak_id; ++ g_autofree gchar *snap_name = NULL; ++ g_autofree gchar *executable = NULL; + + flatpak_id = g_desktop_app_info_get_string (G_DESKTOP_APP_INFO (info), "X-Flatpak"); + if (flatpak_id != NULL) +@@ -235,6 +236,16 @@ get_portal_app_id (GAppInfo *info) + snap_name = g_desktop_app_info_get_string (G_DESKTOP_APP_INFO (info), "X-SnapInstanceName"); + if (snap_name != NULL) + return g_strdup_printf ("%s%s", PORTAL_SNAP_PREFIX, snap_name); ++ ++ // FIXME: Hack until X-SnapInstanceName is ready ++ // https://github.com/snapcore/snapd/pull/6520 ++ executable = g_desktop_app_info_get_string (G_DESKTOP_APP_INFO (info), "Exec"); ++ if (executable != NULL && strstr (executable, "/snap/") != NULL) ++ { ++ const gchar *id = g_app_info_get_id (info); ++ g_auto(GStrv) tokens = g_strsplit (id, "_", 2); ++ return g_strdup_printf ("%s%s", PORTAL_SNAP_PREFIX, tokens[0]); ++ } + } + + return NULL;
  12. Download patch debian/rules

    --- 1:3.36.4-1/debian/rules 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/rules 2020-07-08 13:32:35.000000000 +0000 @@ -5,14 +5,19 @@ export DEB_CPPFLAGS_MAINT_APPEND = -DSSH export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed %: - dh $@ --with gnome + dh $@ --with gnome,migrations # -Dgnome_session_libexecdir can be removed after Bullseye release override_dh_auto_configure: dh_auto_configure -- \ -Dprivileged_group=sudo \ -Dgnome_session_libexecdir=/usr/lib/gnome-session \ - -Ddocumentation=true + -Ddocumentation=true \ + -Dsnap=true \ + -Dwhoopsie=true override_dh_missing: dh_missing --fail-missing + +override_dh_translations: + dh_translations --domain=gnome-control-center-2.0
  13. Download patch debian/patches/Revert-build-Bump-build-dependency-on-polkit.patch

    --- 1:3.36.4-1/debian/patches/Revert-build-Bump-build-dependency-on-polkit.patch 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/Revert-build-Bump-build-dependency-on-polkit.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: Laurent Bigonville <bigon@debian.org> -Date: Tue, 10 Mar 2020 19:10:35 +0100 -Subject: Revert "build: Bump build-dependency on polkit" - -This reverts commit 9ebcd17236a54daa0927a22d973d0309dfb4c8df. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gnome-control-center-3.36.2/meson.build -=================================================================== ---- gnome-control-center-3.36.2.orig/meson.build -+++ gnome-control-center-3.36.2/meson.build -@@ -128,7 +128,7 @@ gnome_settings_dep = dependency('gnome-s - goa_dep = dependency('goa-1.0', version: goa_req_version) - gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0') - libxml_dep = dependency('libxml-2.0') --polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.114') -+polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103') - pulse_dep = dependency('libpulse', version: pulse_req_version) - pulse_mainloop_dep = dependency('libpulse-mainloop-glib', version: pulse_req_version) - upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8')
  14. Download patch debian/patches/0026-applications-Launch-snap-store-if-it-is-installed.patch

    --- 1:3.36.4-1/debian/patches/0026-applications-Launch-snap-store-if-it-is-installed.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0026-applications-Launch-snap-store-if-it-is-installed.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,54 @@ +From: Robert Ancell <robert.ancell@canonical.com> +Date: Mon, 6 Apr 2020 10:30:27 +1200 +Subject: [PATCH 26/26] applications: Launch snap-store if it is installed + +--- + panels/applications/cc-applications-panel.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c +index 0a228a0..baf03fa 100644 +--- a/panels/applications/cc-applications-panel.c ++++ b/panels/applications/cc-applications-panel.c +@@ -148,6 +148,13 @@ gnome_software_is_installed (void) + return path != NULL; + } + ++static gboolean ++snap_store_is_installed (void) ++{ ++ g_autofree gchar *path = g_find_program_in_path ("snap-store"); ++ return path != NULL; ++} ++ + /* Callbacks */ + + static gboolean +@@ -168,6 +175,9 @@ open_software_cb (GtkButton *button, + { + const gchar *argv[] = { "gnome-software", "--details", "appid", NULL }; + ++ if (!gnome_software_is_installed ()) ++ argv[0] = "snap-store"; ++ + if (self->current_app_id == NULL) + argv[1] = NULL; + else +@@ -1594,7 +1604,7 @@ update_panel (CcApplicationsPanel *self, + + gtk_label_set_label (GTK_LABEL (self->title_label), g_app_info_get_display_name (info)); + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "settings"); +- gtk_widget_set_visible (self->header_button, gnome_software_is_installed ()); ++ gtk_widget_set_visible (self->header_button, gnome_software_is_installed () || snap_store_is_installed ()); + + g_clear_pointer (&self->current_app_id, g_free); + g_clear_pointer (&self->current_portal_app_id, g_free); +@@ -1943,7 +1953,7 @@ cc_applications_panel_init (CcApplicationsPanel *self) + + gtk_widget_init_template (GTK_WIDGET (self)); + +- gtk_widget_set_visible (GTK_WIDGET (self->install_button), gnome_software_is_installed ()); ++ gtk_widget_set_visible (GTK_WIDGET (self->install_button), gnome_software_is_installed () || snap_store_is_installed ()); + + provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); + gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider),
  15. Download patch debian/patches/0029-applications-Use-new-snapd-glib-API-for-labelling-Sn.patch
  16. Download patch debian/source_gnome-control-center.py

    --- 1:3.36.4-1/debian/source_gnome-control-center.py 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/source_gnome-control-center.py 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,32 @@ +import os, apport.packaging, re +import glob +from apport.hookutils import * + +def add_info(report): + # the issue is not in the gnome-control-center code so reassign + if "Stacktrace" in report and "/control-center-1/" in report["Stacktrace"]: + for words in report["Stacktrace"].split(): + if words.startswith("/usr/lib/") and "/control-center-1/" in words: + if apport.packaging.get_file_package(words) != 'gnome-control-center': + report.add_package_info(apport.packaging.get_file_package(words)) + return + component = re.compile("lib(\w*).so").search(words).groups(1)[0] + report['Title'] = '[%s]: %s' % (component, report.get('Title', report.standard_title())) + report['Tags'] = '%s %s' % (report.get('Tags', ""), component) + break # Stop on the first .so that's the interesting one + + # collect informations on the /usr/lib/control-center-1 components + plugin_packages = set() + for paneldir in (['/usr/lib/control-center-1'] + glob.glob('/usr/lib/*/control-center-1')): + for dirpath, dirnames, filenames in os.walk(paneldir): + for filename in filenames: + path = os.path.join(dirpath, filename) + package = apport.packaging.get_file_package(path) + if package == 'gnome-control-center': + continue + if not package: + continue + + plugin_packages.add(package) + if plugin_packages: + report["usr_lib_gnome-control-center"] = package_versions(*sorted(plugin_packages)) Binary files 1:3.36.4-1/debian/ubuntu-logo-icon.png and 1:3.36.4-1ubuntu1/debian/ubuntu-logo-icon.png differ
  17. Download patch debian/patches/0022-info-overview-Show-updates-in-software-propeties-ins.patch

    --- 1:3.36.4-1/debian/patches/0022-info-overview-Show-updates-in-software-propeties-ins.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0022-info-overview-Show-updates-in-software-propeties-ins.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,48 @@ +From: Robert Ancell <robert.ancell@canonical.com> +Date: Mon, 3 Feb 2020 14:23:34 +1300 +Subject: [PATCH 22/26] info-overview: Show updates in software propeties + instead of GNOME Software + +--- + panels/info-overview/cc-info-overview-panel.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c +index 9e7c1b3..07b5bb8 100644 +--- a/panels/info-overview/cc-info-overview-panel.c ++++ b/panels/info-overview/cc-info-overview-panel.c +@@ -719,6 +719,12 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self) + cc_list_row_set_secondary_markup (self->graphics_row, graphics_hardware_string); + } + ++static gboolean ++does_software_properties_exist (void) ++{ ++ return g_file_test (BINDIR "/software-properties-gtk", G_FILE_TEST_EXISTS); ++} ++ + static gboolean + does_gnome_software_exist (void) + { +@@ -739,7 +745,11 @@ open_software_update (CcInfoOverviewPanel *self) + g_auto(GStrv) argv = NULL; + + argv = g_new0 (gchar *, 3); +- if (does_gnome_software_exist ()) ++ if (does_software_properties_exist ()) ++ { ++ argv[0] = g_build_filename (BINDIR, "software-properties-gtk", NULL); ++ } ++ else if (does_gnome_software_exist ()) + { + argv[0] = g_build_filename (BINDIR, "gnome-software", NULL); + argv[1] = g_strdup_printf ("--mode=updates"); +@@ -849,7 +859,7 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) + + g_resources_register (cc_info_overview_get_resource ()); + +- if (!does_gnome_software_exist () && !does_gpk_update_viewer_exist ()) ++ if (!does_software_properties_exist () && !does_gnome_software_exist () && !does_gpk_update_viewer_exist ()) + gtk_widget_hide (GTK_WIDGET (self->software_updates_row)); + + info_overview_panel_setup_overview (self);
  18. Download patch debian/patches/0020-Disable-non-working-camera-microphones-panels.patch

    --- 1:3.36.4-1/debian/patches/0020-Disable-non-working-camera-microphones-panels.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0020-Disable-non-working-camera-microphones-panels.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,31 @@ +From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Date: Thu, 30 Jan 2020 10:16:06 +1300 +Subject: [PATCH 20/26] Disable non working camera/microphones panels + +Upstream: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/381 +--- + shell/cc-panel-loader.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index e870308..8f714e2 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -98,7 +98,7 @@ static CcPanelLoaderVtable default_panels[] = + #ifdef BUILD_BLUETOOTH + PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type, NULL), + #endif +- PANEL_TYPE("camera", cc_camera_panel_get_type, NULL), ++ //PANEL_TYPE("camera", cc_camera_panel_get_type, NULL), + PANEL_TYPE("color", cc_color_panel_get_type, NULL), + PANEL_TYPE("connectivity", cc_connectivity_panel_get_type, NULL), + PANEL_TYPE("datetime", cc_date_time_panel_get_type, NULL), +@@ -109,7 +109,7 @@ static CcPanelLoaderVtable default_panels[] = + PANEL_TYPE("keyboard", cc_keyboard_panel_get_type, NULL), + PANEL_TYPE("location", cc_location_panel_get_type, NULL), + PANEL_TYPE("lock", cc_lock_panel_get_type, NULL), +- PANEL_TYPE("microphone", cc_microphone_panel_get_type, NULL), ++ //PANEL_TYPE("microphone", cc_microphone_panel_get_type, NULL), + PANEL_TYPE("mouse", cc_mouse_panel_get_type, NULL), + #ifdef BUILD_NETWORK + PANEL_TYPE("network", cc_network_panel_get_type, NULL),
  19. Download patch debian/patches/0019-display-Support-UI-scaled-logical-monitor-mode.patch
  20. Download patch debian/patches/0013-notifications-Handle-.desktop-files-that-got-renamed.patch

    --- 1:3.36.4-1/debian/patches/0013-notifications-Handle-.desktop-files-that-got-renamed.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0013-notifications-Handle-.desktop-files-that-got-renamed.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,32 @@ +From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Date: Tue, 31 Jul 2018 04:44:12 +0100 +Subject: [PATCH 13/26] notifications: Handle .desktop files that got renamed + +upstream, those use NoDisplay but the panel doesn't respect that key, +skip known buggy entries for file-roller and nautilus +Origin: ubuntu +Bug-Ubuntu: https://launchpad.net/bugs/1716267 +Forwarded: not-needed +--- + panels/notifications/cc-notifications-panel.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/panels/notifications/cc-notifications-panel.c b/panels/notifications/cc-notifications-panel.c +index 79c1f0d..d7d5204 100644 +--- a/panels/notifications/cc-notifications-panel.c ++++ b/panels/notifications/cc-notifications-panel.c +@@ -446,6 +446,14 @@ process_app_info (CcNotificationsPanel *panel, + guint i; + + app_id = app_info_get_id (app_info); ++ ++ /* Ignore compatibility desktops (lp: #1716267) */ ++ if (g_strcmp0 (app_id, "file-roller") == 0) ++ return; ++ ++ if (g_strcmp0 (app_id, "nautilus") == 0) ++ return; ++ + g_strcanon (app_id, + "0123456789" + "abcdefghijklmnopqrstuvwxyz"
  21. Download patch debian/patches/0012-printers-Temporarily-add-an-additional-advanced-prin.patch

    --- 1:3.36.4-1/debian/patches/0012-printers-Temporarily-add-an-additional-advanced-prin.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0012-printers-Temporarily-add-an-additional-advanced-prin.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,138 @@ +From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Date: Tue, 31 Jul 2018 04:44:12 +0100 +Subject: [PATCH 12/26] printers: Temporarily add an additional advanced + printer button. + +The printers panel doesn't support printer sharing and other features. +Workaround it for now by adding in multiple places an advanced printer +button starting system-config-printer to avoid doubling the panel in Settings. +Origin: ubuntu + +Bug-Ubuntu: https://launchpad.net/bugs/1706524a +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=692532 +--- + panels/printers/cc-printers-panel.c | 28 ++++++++++++++++++++++++ + panels/printers/printers.ui | 43 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 71 insertions(+) + +diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c +index 01bb678..01be98b 100644 +--- a/panels/printers/cc-printers-panel.c ++++ b/panels/printers/cc-printers-panel.c +@@ -25,6 +25,7 @@ + #include "pp-printer.h" + + #include <string.h> ++#include <gio/gdesktopappinfo.h> + #include <glib/gi18n-lib.h> + #include <glib/gstdio.h> + #include <polkit/polkit.h> +@@ -965,6 +966,25 @@ printer_add_cb (GtkToolButton *toolbutton, + self); + } + ++static void ++show_system_config_printer (void) ++{ ++ g_autoptr(GAppInfo) app_info = NULL; ++ g_autoptr(GdkAppLaunchContext) ctx = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ app_info = G_APP_INFO (g_desktop_app_info_new ("system-config-printer.desktop")); ++ ++ if (app_info == NULL) { ++ g_warning ("Failed to launch system-config-printer: couldn't create GDesktopAppInfo"); ++ return; ++ } ++ ++ ctx = gdk_display_get_app_launch_context (gdk_display_get_default ()); ++ if (!g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (ctx), &error)) ++ g_warning ("Failed to launch system-config-printer: %s", error->message); ++} ++ + static void + update_sensitivity (gpointer user_data) + { +@@ -1240,6 +1260,14 @@ cc_printers_panel_init (CcPrintersPanel *self) + gtk_builder_get_object (self->builder, "printer-add-button2"); + g_signal_connect (widget, "clicked", G_CALLBACK (printer_add_cb), self); + ++ widget = (GtkWidget*) gtk_builder_get_object (self->builder, "system-config-printer-button1"); ++ g_signal_connect_swapped (widget, "clicked", ++ G_CALLBACK (show_system_config_printer), NULL); ++ ++ widget = (GtkWidget*) gtk_builder_get_object (self->builder, "system-config-printer-button2"); ++ g_signal_connect_swapped (widget, "clicked", ++ G_CALLBACK (show_system_config_printer), NULL); ++ + widget = (GtkWidget*) + gtk_builder_get_object (self->builder, "content"); + gtk_list_box_set_filter_func (GTK_LIST_BOX (widget), +diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui +index d8f8af2..f4c0d98 100644 +--- a/panels/printers/printers.ui ++++ b/panels/printers/printers.ui +@@ -134,6 +134,7 @@ + <child> + <object class="GtkBox"> + <property name="visible">True</property> ++ <property name="orientation">vertical</property> + <child> + <object class="GtkListBox" id="content"> + <property name="visible">True</property> +@@ -146,6 +147,32 @@ + </style> + </object> + </child> ++ <child> ++ <object class="GtkBox"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="orientation">horizontal</property> ++ <child> ++ <object class="GtkButton" id="system-config-printer-button1"> ++ <property name="label" translatable="yes">Additional Printer Settings…</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ <property name="margin-start">60</property> ++ <property name="margin-end">60</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="pack_type">end</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ </packing> ++ </child> + </object> + </child> + </object> +@@ -213,6 +240,22 @@ + <property name="position">2</property> + </packing> + </child> ++ <child> ++ <object class="GtkButton" id="system-config-printer-button2"> ++ <property name="label" translatable="yes">Additional Printer Settings…</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">False</property> ++ <property name="halign">center</property> ++ <property name="relief">normal</property> ++ <property name="margin-top">30</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">3</property> ++ </packing> ++ </child> + </object> + <packing> + <property name="name">empty-state</property>
  22. Download patch debian/gnome-control-center-faces.install

    --- 1:3.36.4-1/debian/gnome-control-center-faces.install 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/gnome-control-center-faces.install 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1 @@ +usr/share/pixmaps/faces
  23. Download patch debian/control

    --- 1:3.36.4-1/debian/control 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/control 2020-07-08 13:32:35.000000000 +0000 @@ -5,9 +5,11 @@ Source: gnome-control-center Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> -Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> +Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org> Build-Depends: debhelper-compat (= 12), + dh-migrations, libaccountsservice-dev (>= 0.6.39), desktop-file-utils, gnome-pkg-tools (>= 0.10), @@ -42,9 +44,11 @@ Build-Depends: debhelper-compat (= 12), libpwquality-dev, libsecret-1-dev, libsmbclient-dev (>= 2:3.6.12-1~), + libsnapd-glib-dev (>= 1.57), libudisks2-dev, libupower-glib-dev (>= 0.99.8), libwacom-dev (>= 0.7) [linux-any], + libwhoopsie-preferences-dev, libxi-dev (>= 2:1.2), libx11-dev, libxft-dev (>= 2.1.2), @@ -60,8 +64,10 @@ Build-Depends: debhelper-compat (= 12), at-spi2-core Standards-Version: 4.5.0 Rules-Requires-Root: no -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center/tree/ubuntu/master Package: gnome-control-center Architecture: any @@ -70,30 +76,33 @@ Depends: ${misc:Depends}, accountsservice, apg, colord (>= 0.1.30), - desktop-base (>= 10.0.0), +# desktop-base (>= 10.0.0), desktop-file-utils, gnome-control-center-data (<< ${gnome:NextVersion}), gnome-control-center-data (>= ${source:Version}), gnome-desktop3-data, gnome-settings-daemon (>= 3.29), gsettings-desktop-schemas (>= 3.31.0), + language-selector-gnome (>= 0.179~), + system-config-printer (>= 1.4), + whoopsie-preferences, Recommends: cups-pk-helper, gnome-online-accounts (>= 3.25.3), gnome-user-docs, - gnome-user-share, gkbd-capplet, + ibus, iso-codes, libcanberra-pulse, mousetweaks, policykit-1, - rygel | rygel-tracker, - system-config-printer-common (>= 1.4), network-manager-gnome (>= 0.9.8), - libnss-myhostname, cracklib-runtime, pulseaudio-module-bluetooth, - realmd + gnome-control-center-faces, + rygel | rygel-tracker, Suggests: gnome-software | gnome-packagekit, + gnome-user-share, + realmd, gstreamer1.0-pulseaudio, libcanberra-gtk-module, libcanberra-gtk3-module, @@ -107,6 +116,16 @@ Description: utilities to configure the It also contains a front end to these applets, which can also be accessed with the GNOME panel or the Nautilus file manager. +Package: gnome-control-center-faces +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Conflicts: unity-control-center-faces +Replaces: unity-control-center-faces +Provides: unity-control-center-faces +Description: utilities to configure the GNOME desktop - faces images + This package contains images that can be used for user profile's icon + Package: gnome-control-center-dev Architecture: all Multi-Arch: foreign
  24. Download patch debian/patches/Expose-touchpad-settings-if-synaptics-is-in-use.patch

    --- 1:3.36.4-1/debian/patches/Expose-touchpad-settings-if-synaptics-is-in-use.patch 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/Expose-touchpad-settings-if-synaptics-is-in-use.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -From 81899262bee17c66dc993065fd77307f00e0b265 Mon Sep 17 00:00:00 2001 -From: Daniel van Vugt <daniel.van.vugt@canonical.com> -Date: Fri, 16 Mar 2018 13:53:10 -0400 -Subject: [PATCH 01/22] Expose touchpad settings if synaptics is in use - -Upstream is aggressively pushing for libinput over synaptics. However that -creates a factually incorrect situation where gnome-control-center thinks -there is no touchpad unless you're using the xserver-xorg-input-libinput. -This patch adds support for both drivers, removing the code that would -hide the touchpad settings when xserver-xorg-input-synaptics is in use. - -This patch is only useful in the GNOME on Xorg session. -In GNOME on Wayland, libinput is used anyway. - -This patch requires a companion patch in mutter which GNOME has rejected. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/37 ---- - panels/mouse/cc-mouse-caps-helper.c | 7 +++++++ - panels/mouse/cc-mouse-panel.c | 16 +++++++++------- - 2 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/panels/mouse/cc-mouse-caps-helper.c b/panels/mouse/cc-mouse-caps-helper.c -index 69546b2b6..39534b912 100644 ---- a/panels/mouse/cc-mouse-caps-helper.c -+++ b/panels/mouse/cc-mouse-caps-helper.c -@@ -38,6 +38,13 @@ touchpad_check_capabilities_x11 (gboolean *have_two_finger_scrolling, - unsigned long nitems, bytes_after; - unsigned char *data; - -+ if (cc_synaptics_check ()) { -+ *have_two_finger_scrolling = TRUE; -+ *have_edge_scrolling = TRUE; -+ *have_tap_to_click = TRUE; -+ return TRUE; -+ } -+ - gdisplay = gdk_display_get_default (); - display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - prop_scroll_methods = XInternAtom (display, "libinput Scroll Methods Available", False); -diff --git a/panels/mouse/cc-mouse-panel.c b/panels/mouse/cc-mouse-panel.c -index df2cd4b7a..a90062f72 100644 ---- a/panels/mouse/cc-mouse-panel.c -+++ b/panels/mouse/cc-mouse-panel.c -@@ -72,7 +72,6 @@ struct _CcMousePanel - gboolean have_mouse; - gboolean have_touchpad; - gboolean have_touchscreen; -- gboolean have_synaptics; - - gboolean left_handed; - GtkGesture *left_gesture; -@@ -90,7 +89,7 @@ setup_touchpad_options (CcMousePanel *self) - gboolean have_edge_scrolling; - gboolean have_tap_to_click; - -- if (self->have_synaptics || !self->have_touchpad) { -+ if (!self->have_touchpad) { - gtk_widget_hide (GTK_WIDGET (self->touchpad_frame)); - return; - } -@@ -314,7 +313,10 @@ device_changed (GsdDeviceManager *device_manager, - GsdDevice *device, - CcMousePanel *self) - { -- self->have_touchpad = touchpad_is_present (); -+ self->have_touchpad = touchpad_is_present () || cc_synaptics_check (); -+ /* ^^^^^^^^^^^^^^^^^^^^^ -+ * Workaround https://gitlab.gnome.org/GNOME/gtk/issues/97 -+ */ - - setup_touchpad_options (self); - -@@ -409,11 +411,11 @@ cc_mouse_panel_init (CcMousePanel *self) - G_CALLBACK (device_changed), self); - - self->have_mouse = mouse_is_present (); -- self->have_touchpad = touchpad_is_present (); -+ self->have_touchpad = touchpad_is_present () || cc_synaptics_check (); -+ /* ^^^^^^^^^^^^^^^^^^^^^ -+ * Workaround https://gitlab.gnome.org/GNOME/gtk/issues/97 -+ */ - self->have_touchscreen = touchscreen_is_present (); -- self->have_synaptics = cc_synaptics_check (); -- if (self->have_synaptics) -- g_warning ("Detected synaptics X driver, please migrate to libinput"); - - setup_dialog (self); - } --- -2.25.1 -
  25. Download patch debian/patches/distro-logo.patch

    --- 1:3.36.4-1/debian/patches/distro-logo.patch 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/distro-logo.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -From bb771170ddabc8a6c900e10925f2e6ff00747e61 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Mon, 3 Feb 2020 14:46:15 +0100 -Subject: [PATCH 03/22] info-overview: Use the Ubuntu logo prominently - -This removes GNOME branding in favour of Ubuntu branding. We don't -make changes to the text information as the distribution/OS is clearly -visible above the GNOME version. - -See https://bugzilla.gnome.org/show_bug.cgi?id=695691 - -(Patch taken from Fedora and updated for Ubuntu) ---- - panels/info-overview/cc-info-overview-panel.ui | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui -index de377bb69..5333246e0 100644 ---- a/panels/info-overview/cc-info-overview-panel.ui -+++ b/panels/info-overview/cc-info-overview-panel.ui -@@ -30,7 +30,8 @@ - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> -- <property name="resource">/org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg</property> -+ <property name="pixel_size">128</property> -+ <property name="pixbuf">/usr/share/icons/vendor/scalable/emblems/emblem-vendor.svg</property> - </object> - <packing> - <property name="expand">False</property> --- -2.25.1 -
  26. Download patch debian/control.in

    --- 1:3.36.4-1/debian/control.in 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/control.in 2020-07-08 13:32:35.000000000 +0000 @@ -1,9 +1,11 @@ Source: gnome-control-center Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> Uploaders: @GNOME_TEAM@ Build-Depends: debhelper-compat (= 12), + dh-migrations, libaccountsservice-dev (>= 0.6.39), desktop-file-utils, gnome-pkg-tools (>= 0.10), @@ -38,9 +40,11 @@ Build-Depends: debhelper-compat (= 12), libpwquality-dev, libsecret-1-dev, libsmbclient-dev (>= 2:3.6.12-1~), + libsnapd-glib-dev (>= 1.57), libudisks2-dev, libupower-glib-dev (>= 0.99.8), libwacom-dev (>= 0.7) [linux-any], + libwhoopsie-preferences-dev, libxi-dev (>= 2:1.2), libx11-dev, libxft-dev (>= 2.1.2), @@ -56,8 +60,10 @@ Build-Depends: debhelper-compat (= 12), at-spi2-core Standards-Version: 4.5.0 Rules-Requires-Root: no -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center/tree/ubuntu/master Package: gnome-control-center Architecture: any @@ -66,30 +72,33 @@ Depends: ${misc:Depends}, accountsservice, apg, colord (>= 0.1.30), - desktop-base (>= 10.0.0), +# desktop-base (>= 10.0.0), desktop-file-utils, gnome-control-center-data (<< ${gnome:NextVersion}), gnome-control-center-data (>= ${source:Version}), gnome-desktop3-data, gnome-settings-daemon (>= 3.29), gsettings-desktop-schemas (>= 3.31.0), + language-selector-gnome (>= 0.179~), + system-config-printer (>= 1.4), + whoopsie-preferences, Recommends: cups-pk-helper, gnome-online-accounts (>= 3.25.3), gnome-user-docs, - gnome-user-share, gkbd-capplet, + ibus, iso-codes, libcanberra-pulse, mousetweaks, policykit-1, - rygel | rygel-tracker, - system-config-printer-common (>= 1.4), network-manager-gnome (>= 0.9.8), - libnss-myhostname, cracklib-runtime, pulseaudio-module-bluetooth, - realmd + gnome-control-center-faces, + rygel | rygel-tracker, Suggests: gnome-software | gnome-packagekit, + gnome-user-share, + realmd, gstreamer1.0-pulseaudio, libcanberra-gtk-module, libcanberra-gtk3-module, @@ -103,6 +112,16 @@ Description: utilities to configure the It also contains a front end to these applets, which can also be accessed with the GNOME panel or the Nautilus file manager. +Package: gnome-control-center-faces +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Conflicts: unity-control-center-faces +Replaces: unity-control-center-faces +Provides: unity-control-center-faces +Description: utilities to configure the GNOME desktop - faces images + This package contains images that can be used for user profile's icon + Package: gnome-control-center-dev Architecture: all Multi-Arch: foreign
  27. Download patch debian/patches/0025-applications-Hide-buttons-that-launch-gnome-software.patch

    --- 1:3.36.4-1/debian/patches/0025-applications-Hide-buttons-that-launch-gnome-software.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0025-applications-Hide-buttons-that-launch-gnome-software.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,76 @@ +From: Robert Ancell <robert.ancell@canonical.com> +Date: Mon, 16 Dec 2019 15:03:32 +1300 +Subject: [PATCH 25/26] applications: Hide buttons that launch gnome-software + if it is not available + +Fixes #417 +--- + panels/applications/cc-applications-panel.c | 13 ++++++++++++- + panels/applications/cc-applications-panel.ui | 2 +- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c +index 7352ba5..0a228a0 100644 +--- a/panels/applications/cc-applications-panel.c ++++ b/panels/applications/cc-applications-panel.c +@@ -75,6 +75,7 @@ struct _CcApplicationsPanel + GSettings *search_settings; + + GtkListBox *stack; ++ GtkButton *install_button; + + GtkWidget *permission_section; + GtkWidget *permission_list; +@@ -140,6 +141,13 @@ enum + PROP_PARAMETERS + }; + ++static gboolean ++gnome_software_is_installed (void) ++{ ++ g_autofree gchar *path = g_find_program_in_path ("gnome-software"); ++ return path != NULL; ++} ++ + /* Callbacks */ + + static gboolean +@@ -1586,7 +1594,7 @@ update_panel (CcApplicationsPanel *self, + + gtk_label_set_label (GTK_LABEL (self->title_label), g_app_info_get_display_name (info)); + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "settings"); +- gtk_widget_show (self->header_button); ++ gtk_widget_set_visible (self->header_button, gnome_software_is_installed ()); + + g_clear_pointer (&self->current_app_id, g_free); + g_clear_pointer (&self->current_portal_app_id, g_free); +@@ -1876,6 +1884,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass) + gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_section); + gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_reset); + gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_list); ++ gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, install_button); + gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, integration_list); + gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, integration_section); + gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, location); +@@ -1934,6 +1943,8 @@ cc_applications_panel_init (CcApplicationsPanel *self) + + gtk_widget_init_template (GTK_WIDGET (self)); + ++ gtk_widget_set_visible (GTK_WIDGET (self->install_button), gnome_software_is_installed ()); ++ + provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); + gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider), + "/org/gnome/control-center/applications/cc-applications-panel.css"); +diff --git a/panels/applications/cc-applications-panel.ui b/panels/applications/cc-applications-panel.ui +index d52fd6a..09f939e 100644 +--- a/panels/applications/cc-applications-panel.ui ++++ b/panels/applications/cc-applications-panel.ui +@@ -55,7 +55,7 @@ + </packing> + </child> + <child> +- <object class="GtkButton"> ++ <object class="GtkButton" id="install_button"> + <property name="label" translatable="yes">Install some…</property> + <property name="visible">1</property> + <property name="can-focus">1</property>
  28. Download patch debian/gnome-control-center-data.install

    --- 1:3.36.4-1/debian/gnome-control-center-data.install 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/gnome-control-center-data.install 2020-07-08 13:32:35.000000000 +0000 @@ -4,6 +4,7 @@ usr/share/sounds usr/share/locale usr/share/gettext/its usr/share/icons -usr/share/pixmaps/faces usr/share/polkit-1 -debian/gnome-control-center.pkla /var/lib/polkit-1/localauthority/10-vendor.d/ +debian/source_gnome-control-center.py /usr/share/apport/package-hooks +debian/ubuntu-logo-icon.png /usr/share/icons/hicolor/256x256/apps/ +debian/ubuntu-panel-assets/* /usr/share/icons/hicolor/
  29. Download patch debian/patches/0015-connectivity-add-network-connectivity-checking-toggl.patch
  30. Download patch debian/gnome-control-center-data.links
  31. Download patch debian/patches/0010-Provide-an-api-for-the-installation-of-language-pack.patch
  32. Download patch debian/patches/0005-Adapts-the-region-capplet-and-the-language-chooser-i.patch
  33. Download patch debian/patches/git-nongnome-segfault.patch

    --- 1:3.36.4-1/debian/patches/git-nongnome-segfault.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/git-nongnome-segfault.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,30 @@ +From: Robert Ancell <robert.ancell@canonical.com> +Date: Tue, 14 Apr 2020 11:04:05 +1200 +Subject: [PATCH] display: Add missing parameter checks on CcDisplayConfig + methods + +Closes #945 +--- + panels/display/cc-display-config.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/panels/display/cc-display-config.c b/panels/display/cc-display-config.c +index 30c97c4..80aabc4 100644 +--- a/panels/display/cc-display-config.c ++++ b/panels/display/cc-display-config.c +@@ -614,6 +614,7 @@ cc_display_config_set_minimum_size (CcDisplayConfig *self, + int width, + int height) + { ++ g_return_if_fail (CC_IS_DISPLAY_CONFIG (self)); + CC_DISPLAY_CONFIG_GET_CLASS (self)->set_minimum_size (self, width, height); + } + +@@ -622,5 +623,7 @@ cc_display_config_is_scaled_mode_valid (CcDisplayConfig *self, + CcDisplayMode *mode, + double scale) + { ++ g_return_val_if_fail (CC_IS_DISPLAY_CONFIG (self), FALSE); ++ g_return_val_if_fail (CC_IS_DISPLAY_MODE (mode), FALSE); + return CC_DISPLAY_CONFIG_GET_CLASS (self)->is_scaled_mode_valid (self, mode, scale); + }
  34. Download patch debian/patches/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch
  35. Download patch debian/ubuntu-volume-amplification-to-gnome

    --- 1:3.36.4-1/debian/ubuntu-volume-amplification-to-gnome 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/ubuntu-volume-amplification-to-gnome 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,29 @@ +#!/usr/bin/python3 + +from gi.repository import Gio +import sys + +UBUNTU_VOLUME_SETTINGS = "com.ubuntu.sound" +UBUNTU_VOLUME_AMPLIFIED_KEY = "allow-amplified-volume" + +GNOME_VOLUME_SETTINGS = "org.gnome.desktop.sound" +GNOME_VOLUME_AMPLIFIED_KEY = "allow-volume-above-100-percent" + + +if __name__ == "__main__": + source = Gio.SettingsSchemaSource.get_default() + # Old and new keys installed + if (source.lookup(UBUNTU_VOLUME_SETTINGS, True) is None or + source.lookup(GNOME_VOLUME_SETTINGS, True) is None): + print("Missing ubuntu or gnome volume key: no migration needed") + sys.exit(0) + + src_settings = Gio.Settings.new(UBUNTU_VOLUME_SETTINGS) + dst_settings = Gio.Settings.new(GNOME_VOLUME_SETTINGS) + if not dst_settings.is_writable(GNOME_VOLUME_AMPLIFIED_KEY): + print("Can't migrate amplification key to GNOME one as they are not writable") + sys.exit(0) + + volume_is_amplified = src_settings.get_boolean(UBUNTU_VOLUME_AMPLIFIED_KEY) + dst_settings.set_boolean(GNOME_VOLUME_AMPLIFIED_KEY, volume_is_amplified) + dst_settings.sync()
  36. Download patch debian/patches/series

    --- 1:3.36.4-1/debian/patches/series 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/series 2020-07-08 14:59:36.000000000 +0000 @@ -1,4 +1,38 @@ -Expose-touchpad-settings-if-synaptics-is-in-use.patch -Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch -distro-logo.patch -Revert-build-Bump-build-dependency-on-polkit.patch +# Upstream +# on master only +git-nongnome-segfault.patch +git-user-accounts-Use-newly-designed-fingerprint-enroll-dialo.patch + +# Ubuntu changes +0001-Expose-touchpad-settings-if-synaptics-is-in-use.patch +0002-Debian-s-adduser-doesn-t-allow-uppercase-letters-by-.patch +0003-info-overview-Use-the-Ubuntu-logo-prominently.patch +0004-Display-locale-modifiers-properly.patch +0005-Adapts-the-region-capplet-and-the-language-chooser-i.patch +0006-keyboard-Add-launch-terminal-shortcut.patch +0007-sound-Allow-volume-to-be-set-above-100.patch +0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch +0009-lock-Add-Lock-Screen-on-Suspend-option.patch +0010-Provide-an-api-for-the-installation-of-language-pack.patch +0011-region-Add-Language-Selector-button.patch +0012-printers-Temporarily-add-an-additional-advanced-prin.patch +0013-notifications-Handle-.desktop-files-that-got-renamed.patch +0014-shell-Change-the-default-height-so-all-category-are-.patch +0015-connectivity-add-network-connectivity-checking-toggl.patch +0016-diagnostics-Add-Whoopsie-support.patch +0017-online-accounts-Hide-window-after-adding-an-online-a.patch +0018-applications-Add-hack-detect-snaps-before-X-SnapInst.patch +0019-display-Support-UI-scaled-logical-monitor-mode.patch +0020-Disable-non-working-camera-microphones-panels.patch +0021-Revert-build-Bump-build-dependency-on-polkit.patch +0022-info-overview-Show-updates-in-software-propeties-ins.patch +0023-sound-Add-a-button-to-select-the-default-theme.patch +0024-display-Allow-fractional-scaling-to-be-enabled.patch +0025-applications-Hide-buttons-that-launch-gnome-software.patch +0026-applications-Launch-snap-store-if-it-is-installed.patch +0027-window-Stop-using-HdyLeaflet.patch +0029-applications-Use-new-snapd-glib-API-for-labelling-Sn.patch +0030-temporarily-revert-alt-char-key.patch +0032-online-accounts-maybe-leak-a-reference-to-the-panel.patch + +gitlab_ucm_mixer_control_select.patch
  37. Download patch debian/patches/0016-diagnostics-Add-Whoopsie-support.patch
  38. Download patch debian/patches/0024-display-Allow-fractional-scaling-to-be-enabled.patch
  39. Download patch debian/patches/gitlab_ucm_mixer_control_select.patch
  40. Download patch debian/patches/0004-Display-locale-modifiers-properly.patch

    --- 1:3.36.4-1/debian/patches/0004-Display-locale-modifiers-properly.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0004-Display-locale-modifiers-properly.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,65 @@ +From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Date: Mon, 19 Aug 2019 16:17:20 +0100 +Subject: [PATCH 04/26] Display locale @modifiers properly + +Make items in the UI represented by locale modifiers distinguishable from +items without modifiers. + This is a diff generated from the upstream merge request + gnome-control-center!507, which has not been merged yet but will likely + be before the 3.34 release. + +Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com> +Forwarded: https://gitlab.gnome.org/GNOME/gnome-desktop/issues/50 +--- + panels/common/cc-language-chooser.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c +index c1c11b6..0dde398 100644 +--- a/panels/common/cc-language-chooser.c ++++ b/panels/common/cc-language-chooser.c +@@ -52,6 +52,23 @@ struct _CcLanguageChooser { + + G_DEFINE_TYPE (CcLanguageChooser, cc_language_chooser, HDY_TYPE_DIALOG) + ++static gchar * ++get_language_label (const gchar *language_code, ++ const gchar *modifier, ++ const gchar *locale_id) ++{ ++ g_autofree gchar *language = NULL; ++ g_autofree gchar *t_mod = NULL; ++ ++ language = gnome_get_language_from_code (language_code, locale_id); ++ ++ if (modifier == NULL) ++ return g_steal_pointer (&language); ++ ++ t_mod = gnome_get_translated_modifier (modifier, locale_id); ++ return g_strdup_printf ("%s — %s", language, t_mod); ++} ++ + static GtkWidget * + language_widget_new (const gchar *locale_id, + gboolean is_extra) +@@ -62,16 +79,17 @@ language_widget_new (const gchar *locale_id, + g_autofree gchar *country = NULL; + g_autofree gchar *language_local = NULL; + g_autofree gchar *country_local = NULL; ++ g_autofree gchar *modifier = NULL; + GtkWidget *row; + GtkWidget *box; + GtkWidget *language_label; + GtkWidget *check; + GtkWidget *country_label; + +- gnome_parse_locale (locale_id, &language_code, &country_code, NULL, NULL); +- language = gnome_get_language_from_code (language_code, locale_id); ++ gnome_parse_locale (locale_id, &language_code, &country_code, NULL, &modifier); ++ language = get_language_label (language_code, modifier, locale_id); + country = gnome_get_country_from_code (country_code, locale_id); +- language_local = gnome_get_language_from_code (language_code, NULL); ++ language_local = get_language_label (language_code, modifier, NULL); + country_local = gnome_get_country_from_code (country_code, NULL); + + row = gtk_list_box_row_new ();
  41. Download patch debian/gnome-control-center-data.migrations

    --- 1:3.36.4-1/debian/gnome-control-center-data.migrations 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/gnome-control-center-data.migrations 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1 @@ +debian/ubuntu-volume-amplification-to-gnome
  42. Download patch debian/patches/0009-lock-Add-Lock-Screen-on-Suspend-option.patch

    --- 1:3.36.4-1/debian/patches/0009-lock-Add-Lock-Screen-on-Suspend-option.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0009-lock-Add-Lock-Screen-on-Suspend-option.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,70 @@ +From: Tim Lunn <tim@feathertop.org> +Date: Mon, 3 Jun 2013 17:27:45 +1000 +Subject: [PATCH 09/26] lock: Add "Lock Screen on Suspend" option + +--- + panels/lock/cc-lock-panel.c | 8 ++++++++ + panels/lock/cc-lock-panel.ui | 17 +++++++++++++++++ + 2 files changed, 25 insertions(+) + +diff --git a/panels/lock/cc-lock-panel.c b/panels/lock/cc-lock-panel.c +index cab917d..3706a94 100644 +--- a/panels/lock/cc-lock-panel.c ++++ b/panels/lock/cc-lock-panel.c +@@ -39,6 +39,7 @@ struct _CcLockPanel + GtkComboBox *lock_after_combo; + GtkListBox *lock_list_box; + GtkSwitch *show_notifications_switch; ++ GtkSwitch *lock_on_suspend_switch; + }; + + CC_PANEL_REGISTER (CcLockPanel, cc_lock_panel) +@@ -205,6 +206,7 @@ cc_lock_panel_class_init (CcLockPanelClass *klass) + gtk_widget_class_bind_template_child (widget_class, CcLockPanel, lock_after_combo); + gtk_widget_class_bind_template_child (widget_class, CcLockPanel, lock_list_box); + gtk_widget_class_bind_template_child (widget_class, CcLockPanel, show_notifications_switch); ++ gtk_widget_class_bind_template_child (widget_class, CcLockPanel, lock_on_suspend_switch); + + gtk_widget_class_bind_template_callback (widget_class, on_blank_screen_delay_changed_cb); + gtk_widget_class_bind_template_callback (widget_class, on_lock_combo_changed_cb); +@@ -247,6 +249,12 @@ cc_lock_panel_init (CcLockPanel *self) + "active", + G_SETTINGS_BIND_DEFAULT); + ++ g_settings_bind (self->lock_settings, ++ "ubuntu-lock-on-suspend", ++ self->lock_on_suspend_switch, ++ "active", ++ G_SETTINGS_BIND_DEFAULT); ++ + value = g_settings_get_uint (self->session_settings, "idle-delay"); + set_blank_screen_delay_value (self, value); + } +diff --git a/panels/lock/cc-lock-panel.ui b/panels/lock/cc-lock-panel.ui +index ae84915..09ee9b9 100644 +--- a/panels/lock/cc-lock-panel.ui ++++ b/panels/lock/cc-lock-panel.ui +@@ -98,6 +98,23 @@ + </object> + </child> + ++ <!-- Automatic Screen Lock Delay row --> ++ <child> ++ <object class="HdyActionRow"> ++ <property name="visible">true</property> ++ <property name="title" translatable="yes">Lock Screen on Suspend</property> ++ <property name="activatable-widget">lock_on_suspend_switch</property> ++ <property name="use-underline">true</property> ++ <child type="action"> ++ <object class="GtkSwitch" id="lock_on_suspend_switch"> ++ <property name="visible">1</property> ++ <property name="halign">end</property> ++ <property name="valign">center</property> ++ </object> ++ </child> ++ </object> ++ </child> ++ + <!-- Show Notifications row --> + <child> + <object class="HdyActionRow">
  43. Download patch debian/patches/0006-keyboard-Add-launch-terminal-shortcut.patch

    --- 1:3.36.4-1/debian/patches/0006-keyboard-Add-launch-terminal-shortcut.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0006-keyboard-Add-launch-terminal-shortcut.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,21 @@ +From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Date: Tue, 31 Jul 2018 04:44:12 +0100 +Subject: [PATCH 06/26] keyboard: Add launch terminal shortcut + +--- + panels/keyboard/01-launchers.xml.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/panels/keyboard/01-launchers.xml.in b/panels/keyboard/01-launchers.xml.in +index 67c8325..dd0292d 100644 +--- a/panels/keyboard/01-launchers.xml.in ++++ b/panels/keyboard/01-launchers.xml.in +@@ -9,6 +9,8 @@ + + <KeyListEntry name="email" description="Launch email client"/> + ++ <KeyListEntry name="terminal" description="Launch terminal"/> ++ + <KeyListEntry name="www" description="Launch web browser"/> + + <KeyListEntry name="home" description="Home folder"/>
  44. Download patch debian/ubuntu-panel-assets/scalable/apps/preferences-ubuntu-panel-symbolic.svg

    --- 1:3.36.4-1/debian/ubuntu-panel-assets/scalable/apps/preferences-ubuntu-panel-symbolic.svg 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/ubuntu-panel-assets/scalable/apps/preferences-ubuntu-panel-symbolic.svg 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,20 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16"> + <defs> + <polygon id="adwaita---appearance-icon---16x16-v1-a" points="0 .005 16 .005 16 12.006 0 12.006"/> + <polygon id="adwaita---appearance-icon---16x16-v1-c" points="0 15.995 16 15.995 16 1 0 1"/> + </defs> + <g fill="none" fill-rule="evenodd"> + <path fill="#333" d="M9.998,8.0029 C9.445,8.0029 8.998,7.5549 8.998,7.0029 C8.998,6.4509 9.445,6.0029 9.998,6.0029 C10.55,6.0029 10.998,6.4509 10.998,7.0029 C10.998,7.5549 10.55,8.0029 9.998,8.0029 M9.991,5.0019 C8.587,5.0019 7.176,6.1009 6.321,6.9999 C7.128,7.8409 8.55,8.9869 9.991,8.9869 C11.545,8.9869 12.97,7.7419 13.68,6.9999 C12.963,6.2379 11.518,5.0019 9.991,5.0019"/> + <g transform="translate(0 .995)"> + <mask id="adwaita---appearance-icon---16x16-v1-b" fill="#fff"> + <use xlink:href="#adwaita---appearance-icon---16x16-v1-a"/> + </mask> + <path fill="#333" d="M9.9912,8.9931 C7.2362,8.9931 5.0022,6.0061 5.00319966,6.0061 C5.0042,6.0061 7.2362,3.0071 9.9912,3.0071 C12.7462,3.0071 14.9792,5.9461 14.9792,6.0271 C14.9792,6.0541 12.7462,8.9931 9.9912,8.9931 L9.9912,8.9931 Z M0.9972,4.0061 L2.9972,4.0061 L2.9972,2.0061 L0.9972,2.0061 L0.9972,4.0061 Z M0.9972,7.0041 L2.9972,7.0041 L2.9972,5.0041 L0.9972,5.0041 L0.9972,7.0041 Z M0.9972,10.0061 L2.9972,10.0061 L2.9972,8.0061 L0.9972,8.0061 L0.9972,10.0061 Z M14.3832,0.0051 L1.6162,0.0051 C0.7272,0.0051 0.0002,0.7331 0.0002,1.6221 L0.0002,10.3891 C0.0002,11.2771 0.7272,12.0061 1.6162,12.0061 L14.3832,12.0061 C15.2722,12.0061 16.0002,11.2771 16.0002,10.3891 L16.0002,1.6221 C16.0002,0.7331 15.2722,0.0051 14.3832,0.0051 L14.3832,0.0051 Z" mask="url(#adwaita---appearance-icon---16x16-v1-b)"/> + </g> + <mask id="adwaita---appearance-icon---16x16-v1-d" fill="#fff"> + <use xlink:href="#adwaita---appearance-icon---16x16-v1-c"/> + </mask> + <polygon fill="#333" points="3.988 15.995 11.988 15.995 11.988 14.995 3.988 14.995" mask="url(#adwaita---appearance-icon---16x16-v1-d)"/> + <polygon fill="#333" points="5.998 15.003 9.998 15.003 9.998 13.003 5.998 13.003" mask="url(#adwaita---appearance-icon---16x16-v1-d)"/> + </g> +</svg>
  45. Download patch debian/patches/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch

    --- 1:3.36.4-1/debian/patches/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -From: Andrea Azzarone <andrea.azzarone@canonical.com> -Date: Tue, 31 Jul 2018 04:44:11 +0100 -Subject: Debian's adduser doesn't allow uppercase letters by default. - -Forwarded: no -Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910141 ---- - panels/user-accounts/cc-add-user-dialog.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/panels/user-accounts/cc-add-user-dialog.c b/panels/user-accounts/cc-add-user-dialog.c -index 07c1edf..0ca8122 100644 ---- a/panels/user-accounts/cc-add-user-dialog.c -+++ b/panels/user-accounts/cc-add-user-dialog.c -@@ -234,7 +234,7 @@ local_create_user (CcAddUserDialog *self) - - manager = act_user_manager_get_default (); - act_user_manager_create_user_async (manager, -- username, -+ g_ascii_strdown (username, -1), - name, - account_type, - self->cancellable,
  46. Download patch debian/patches/0027-window-Stop-using-HdyLeaflet.patch
  47. Download patch debian/gbp.conf

    --- 1:3.36.4-1/debian/gbp.conf 2020-07-06 14:47:10.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/gbp.conf 2020-07-08 13:32:35.000000000 +0000 @@ -1,7 +1,8 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master -upstream-branch = upstream/latest +debian-branch=ubuntu/master +upstream-branch=upstream/latest +debian-tag=ubuntu/%(version)s upstream-vcs-tag = %(version)s [buildpackage]
  48. Download patch debian/patches/git-user-accounts-Use-newly-designed-fingerprint-enroll-dialo.patch
  49. Download patch debian/patches/0017-online-accounts-Hide-window-after-adding-an-online-a.patch

    --- 1:3.36.4-1/debian/patches/0017-online-accounts-Hide-window-after-adding-an-online-a.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0017-online-accounts-Hide-window-after-adding-an-online-a.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,38 @@ +From: Andrea Azzarone <andrea.azzarone@canonical.com> +Date: Tue, 31 Jul 2018 04:44:12 +0100 +Subject: [PATCH 17/26] online-accounts: Hide window after adding an online + account from another app + +Some applications (e.g. gnome-calendar, gnome-todo, etc.) use gnome-control-center +to allow the user to add online accounts. This patch makes sure that g-c-c main window +is closed after the user interacted with the new-account dialog. + +Bug-Ubuntu: https://launchpad.net/bugs/1754651 +Forwarded: no +Last-Update: 2018-03-09 +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/16 +--- + panels/online-accounts/cc-online-accounts-panel.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c +index 0da41a7..b9607b8 100644 +--- a/panels/online-accounts/cc-online-accounts-panel.c ++++ b/panels/online-accounts/cc-online-accounts-panel.c +@@ -382,9 +382,14 @@ cc_goa_panel_set_property (GObject *object, + } + + if (g_strcmp0 (first_arg, "add") == 0) +- command_add (CC_GOA_PANEL (object), parameters); ++ { ++ command_add (CC_GOA_PANEL (object), parameters); ++ g_application_quit (g_application_get_default ()); ++ } + else if (first_arg != NULL) +- select_account_by_id (CC_GOA_PANEL (object), first_arg); ++ { ++ select_account_by_id (CC_GOA_PANEL (object), first_arg); ++ } + + return; + }
  50. Download patch debian/patches/0021-Revert-build-Bump-build-dependency-on-polkit.patch

    --- 1:3.36.4-1/debian/patches/0021-Revert-build-Bump-build-dependency-on-polkit.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/patches/0021-Revert-build-Bump-build-dependency-on-polkit.patch 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1,22 @@ +From: Robert Ancell <robert.ancell@canonical.com> +Date: Mon, 3 Feb 2020 14:06:45 +1300 +Subject: [PATCH 21/26] Revert "build: Bump build-dependency on polkit" + +This reverts commit 9ebcd17236a54daa0927a22d973d0309dfb4c8df. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index d129832..ad91bc4 100644 +--- a/meson.build ++++ b/meson.build +@@ -128,7 +128,7 @@ gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.27.90') + goa_dep = dependency('goa-1.0', version: goa_req_version) + gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0') + libxml_dep = dependency('libxml-2.0') +-polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.114') ++polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103') + pulse_dep = dependency('libpulse', version: pulse_req_version) + pulse_mainloop_dep = dependency('libpulse-mainloop-glib', version: pulse_req_version) + upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8')
  51. Download patch debian/source/include-binaries

    --- 1:3.36.4-1/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.36.4-1ubuntu1/debian/source/include-binaries 2020-07-08 13:32:35.000000000 +0000 @@ -0,0 +1 @@ +debian/ubuntu-logo-icon.png
  1. gnome-control-center