diff -Nru gnome-control-center-3.36.4/debian/changelog gnome-control-center-3.36.4/debian/changelog --- gnome-control-center-3.36.4/debian/changelog 2020-09-24 08:03:01.000000000 -0700 +++ gnome-control-center-3.36.4/debian/changelog 2020-12-04 11:53:51.000000000 -0800 @@ -1,3 +1,11 @@ +gnome-control-center (1:3.36.4-0ubuntu3) focal; urgency=medium + + * 0016-diagnostics-Add-Whoopsie-support.patch: ensure that we always perform + the call to automatically report crashes so that it will be turned off if + "never" is chosen. (LP: #1906877) + + -- Brian Murray Fri, 04 Dec 2020 11:53:51 -0800 + gnome-control-center (1:3.36.4-0ubuntu2) focal; urgency=medium * debian/patches/git_useraccount_segfault.patch: diff -Nru gnome-control-center-3.36.4/debian/control gnome-control-center-3.36.4/debian/control --- gnome-control-center-3.36.4/debian/control 2020-09-24 08:03:01.000000000 -0700 +++ gnome-control-center-3.36.4/debian/control 2020-12-04 11:53:51.000000000 -0800 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville +Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville , Sebastien Bacher Build-Depends: debhelper-compat (= 12), dh-migrations, libaccountsservice-dev (>= 0.6.39), diff -Nru gnome-control-center-3.36.4/debian/patches/0016-diagnostics-Add-Whoopsie-support.patch gnome-control-center-3.36.4/debian/patches/0016-diagnostics-Add-Whoopsie-support.patch --- gnome-control-center-3.36.4/debian/patches/0016-diagnostics-Add-Whoopsie-support.patch 2020-09-24 08:03:01.000000000 -0700 +++ gnome-control-center-3.36.4/debian/patches/0016-diagnostics-Add-Whoopsie-support.patch 2020-12-04 11:53:23.000000000 -0800 @@ -10,10 +10,10 @@ panels/diagnostics/meson.build | 7 +- 5 files changed, 175 insertions(+), 2 deletions(-) -diff --git a/meson.build b/meson.build -index 5f3bcf5..d129832 100644 ---- a/meson.build -+++ b/meson.build +Index: gnome-control-center-3.36.4/meson.build +=================================================================== +--- gnome-control-center-3.36.4.orig/meson.build ++++ gnome-control-center-3.36.4/meson.build @@ -207,6 +207,14 @@ endif config_h.set('HAVE_SNAP', enable_snap, description: 'Define to 1 if Snap support is enabled') @@ -29,26 +29,26 @@ if host_is_linux # network manager network_manager_deps = [ -@@ -299,5 +307,6 @@ output += ' IBus (Region panel IBus support) ........... ' + enable_ibus.to_ +@@ -299,5 +307,6 @@ output += ' IBus (Region panel IBus output += ' NetworkManager (Network panel) ............. ' + host_is_linux.to_string() + '\n' output += ' Wacom (Wacom tablet panel) ................. ' + host_is_linux_not_s390.to_string() + '\n' output += ' Snap support ............................... ' + enable_snap.to_string() + '\n' +output += ' Whoopsie .................................. ' + enable_whoopsie.to_string() + '\n' message(output) -diff --git a/meson_options.txt b/meson_options.txt -index e76308e..554c213 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -7,3 +7,4 @@ option('tests', type: 'boolean', value: true, description: 'build tests') +Index: gnome-control-center-3.36.4/meson_options.txt +=================================================================== +--- gnome-control-center-3.36.4.orig/meson_options.txt ++++ gnome-control-center-3.36.4/meson_options.txt +@@ -7,3 +7,4 @@ option('tests', type: 'boolean', value: option('tracing', type: 'boolean', value: false, description: 'add extra debugging information') option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') option('profile', type: 'combo', choices: ['default','development'], value: 'default') +option('whoopsie', type: 'boolean', value: false, description: 'build with Whoopsie support') -diff --git a/panels/diagnostics/cc-diagnostics-panel.c b/panels/diagnostics/cc-diagnostics-panel.c -index 7f1b5e2..b4171d0 100644 ---- a/panels/diagnostics/cc-diagnostics-panel.c -+++ b/panels/diagnostics/cc-diagnostics-panel.c +Index: gnome-control-center-3.36.4/panels/diagnostics/cc-diagnostics-panel.c +=================================================================== +--- gnome-control-center-3.36.4.orig/panels/diagnostics/cc-diagnostics-panel.c ++++ gnome-control-center-3.36.4/panels/diagnostics/cc-diagnostics-panel.c @@ -18,6 +18,8 @@ * Author: Matthias Clasen */ @@ -83,7 +83,7 @@ }; CC_PANEL_REGISTER (CcDiagnosticsPanel, cc_diagnostics_panel) -@@ -71,9 +82,86 @@ abrt_vanished_cb (GDBusConnection *connection, +@@ -71,9 +82,85 @@ abrt_vanished_cb (GDBusConnection *conne gpointer user_data) { g_debug ("ABRT vanished"); @@ -102,8 +102,8 @@ + + if (!whoopsie_preferences_call_set_report_crashes_finish (WHOOPSIE_PREFERENCES (source_object), res, &error)) + g_warning ("Failed to toggle crash reporting: %s", error->message); -+} -+ + } + +static void +whoopsie_set_report_crashes_mode_done (GObject *source_object, + GAsyncResult *res, @@ -140,14 +140,13 @@ + whoopsie_set_report_crashes_done, + NULL); + -+ if (report_crashes) -+ whoopsie_preferences_call_set_automatically_report_crashes (self->whoopsie, -+ automatically_report, -+ NULL, -+ whoopsie_set_report_crashes_mode_done, -+ NULL); - } - ++ whoopsie_preferences_call_set_automatically_report_crashes (self->whoopsie, ++ automatically_report, ++ NULL, ++ whoopsie_set_report_crashes_mode_done, ++ NULL); ++} ++ +static void +whoopsie_properties_changed (CcDiagnosticsPanel *self) +{ @@ -170,7 +169,7 @@ void cc_diagnostics_panel_static_init_func (void) { -@@ -85,7 +173,9 @@ cc_diagnostics_panel_static_init_func (void) +@@ -85,7 +172,9 @@ cc_diagnostics_panel_static_init_func (v NULL, NULL); @@ -180,7 +179,7 @@ } static void -@@ -110,7 +200,13 @@ cc_diagnostics_panel_class_init (CcDiagnosticsPanelClass *klass) +@@ -110,7 +199,13 @@ cc_diagnostics_panel_class_init (CcDiagn gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, diagnostics_explanation_label); gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, diagnostics_list_box); @@ -194,7 +193,7 @@ } static void -@@ -120,6 +216,7 @@ cc_diagnostics_panel_init (CcDiagnosticsPanel *self) +@@ -120,6 +215,7 @@ cc_diagnostics_panel_init (CcDiagnostics g_autofree gchar *url = NULL; g_autofree gchar *msg = NULL; g_autofree gchar *link = NULL; @@ -202,7 +201,7 @@ g_resources_register (cc_diagnostics_get_resource ()); -@@ -135,6 +232,26 @@ cc_diagnostics_panel_init (CcDiagnosticsPanel *self) +@@ -135,6 +231,26 @@ cc_diagnostics_panel_init (CcDiagnostics self->abrt_switch, "active", G_SETTINGS_BIND_DEFAULT); @@ -229,10 +228,10 @@ os_name = cc_os_release_get_value ("NAME"); url = cc_os_release_get_value ("PRIVACY_POLICY_URL"); if (!url) -diff --git a/panels/diagnostics/cc-diagnostics-panel.ui b/panels/diagnostics/cc-diagnostics-panel.ui -index 1930e91..0b61281 100644 ---- a/panels/diagnostics/cc-diagnostics-panel.ui -+++ b/panels/diagnostics/cc-diagnostics-panel.ui +Index: gnome-control-center-3.36.4/panels/diagnostics/cc-diagnostics-panel.ui +=================================================================== +--- gnome-control-center-3.36.4.orig/panels/diagnostics/cc-diagnostics-panel.ui ++++ gnome-control-center-3.36.4/panels/diagnostics/cc-diagnostics-panel.ui @@ -52,7 +52,7 @@ 1 none @@ -242,10 +241,13 @@ 1 -@@ -85,6 +85,47 @@ - - - +@@ -82,6 +82,47 @@ + + + ++ ++ ++ + + + 1 @@ -284,16 +286,13 @@ + + + -+ -+ -+ -