Skip to content
Commits on Source (7)
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 9075ffb5
gnome-control-center (1:41.4-1ubuntu9) jammy; urgency=medium
* debian/patches: Refresh (and drop removed ones)
* ubuntu-panel: Update color assets to match tuned yaru colors
* ubuntu-panel: Auto-generate color assets, to make them easier to maintain
* ubuntu-panel: Fully auto-generate the gresource xml file
* background: Do not show the dark/light notice on GNOME session
(LP: #1965507)
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Mon, 28 Mar 2022 18:15:08 +0200
gnome-control-center (1:41.4-1ubuntu8) jammy; urgency=medium
* debian/gnome-control-center-data.install,
......
debian/patches/debian/info-overview-Use-the-Vendor-logo-prominently.patch deleted 100644 → 0
View file @ 824425d9
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 3 Feb 2020 14:46:15 +0100
Subject: info-overview: Use the Vendor logo prominently
This removes GNOME branding in favour of the vendor branding. We don't
make changes to the text information as the distribution/OS is clearly
visible above the GNOME version.
This may be removed when debian will expose the LOGO property in
/etc/os-release (as per upstream commit f39cd5a93)
See https://bugzilla.gnome.org/show_bug.cgi?id=695691
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989690
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/base-files/+bug/1931582
---
panels/info-overview/cc-info-overview-panel.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index 35969b8..b755cc5 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -956,7 +956,8 @@ setup_os_logo (CcInfoOverviewPanel *panel)
g_ptr_array_add (array, (gpointer) g_strdup_printf ("%s", logo_name));
icon = g_themed_icon_new_from_names ((char **) array->pdata, array->len);
- gtk_image_set_from_gicon (panel->os_logo, icon, GTK_ICON_SIZE_INVALID);
+ gtk_image_set_from_file (panel->os_logo, "/usr/share/pixmaps/ubuntu-logo-icon.png");
+ gtk_image_set_pixel_size (panel->os_logo, 128);
}
static void
debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch
View file @ 9075ffb5
......@@ -18,16 +18,7 @@ Forwarded: not-needed
---
panels/meson.build | 1 +
panels/ubuntu/appearance.css | 24 +
panels/ubuntu/assets/colors/bark.svg | 5 +
panels/ubuntu/assets/colors/blue.svg | 5 +
panels/ubuntu/assets/colors/magenta.svg | 5 +
panels/ubuntu/assets/colors/olive.svg | 5 +
panels/ubuntu/assets/colors/orange.svg | 5 +
panels/ubuntu/assets/colors/prussiangreen.svg | 5 +
panels/ubuntu/assets/colors/purple.svg | 5 +
panels/ubuntu/assets/colors/red.svg | 5 +
panels/ubuntu/assets/colors/sage.svg | 5 +
panels/ubuntu/assets/colors/viridian.svg | 5 +
panels/ubuntu/assets/colors/color.svg.in | 5 +
panels/ubuntu/assets/theme-dark.svg | 1 +
panels/ubuntu/assets/theme-light.svg | 1 +
panels/ubuntu/cc-ubuntu-dock-dialog.c | 106 ++
......@@ -37,23 +28,14 @@ Forwarded: not-needed
panels/ubuntu/cc-ubuntu-panel.h | 35 +
panels/ubuntu/cc-ubuntu-panel.ui | 618 +++++++++
panels/ubuntu/gnome-ubuntu-panel.desktop.in.in | 16 +
panels/ubuntu/meson.build | 56 +
panels/ubuntu/ubuntu.gresource.xml | 20 +
panels/ubuntu/meson.build | 104 ++
panels/ubuntu/ubuntu.gresource.xml | 6 +
po/POTFILES.in | 5 +
shell/cc-panel-list.c | 1 +
shell/cc-panel-loader.c | 3 +
26 files changed, 2807 insertions(+)
17 files changed, 2796 insertions(+)
create mode 100644 panels/ubuntu/appearance.css
create mode 100644 panels/ubuntu/assets/colors/bark.svg
create mode 100644 panels/ubuntu/assets/colors/blue.svg
create mode 100644 panels/ubuntu/assets/colors/magenta.svg
create mode 100644 panels/ubuntu/assets/colors/olive.svg
create mode 100644 panels/ubuntu/assets/colors/orange.svg
create mode 100644 panels/ubuntu/assets/colors/prussiangreen.svg
create mode 100644 panels/ubuntu/assets/colors/purple.svg
create mode 100644 panels/ubuntu/assets/colors/red.svg
create mode 100644 panels/ubuntu/assets/colors/sage.svg
create mode 100644 panels/ubuntu/assets/colors/viridian.svg
create mode 100644 panels/ubuntu/assets/colors/color.svg.in
create mode 100644 panels/ubuntu/assets/theme-dark.svg
create mode 100644 panels/ubuntu/assets/theme-light.svg
create mode 100644 panels/ubuntu/cc-ubuntu-dock-dialog.c
......@@ -108,114 +90,15 @@ index 0000000..ce63aa2
+image.colors-thumbnail {
+ border-radius: 9999px;
+}
diff --git a/panels/ubuntu/assets/colors/bark.svg b/panels/ubuntu/assets/colors/bark.svg
diff --git a/panels/ubuntu/assets/colors/color.svg.in b/panels/ubuntu/assets/colors/color.svg.in
new file mode 100644
index 0000000..8a1b42e
index 0000000..4c0e136
--- /dev/null
+++ b/panels/ubuntu/assets/colors/bark.svg
+++ b/panels/ubuntu/assets/colors/color.svg.in
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#787859" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/colors/blue.svg b/panels/ubuntu/assets/colors/blue.svg
new file mode 100644
index 0000000..47312b9
--- /dev/null
+++ b/panels/ubuntu/assets/colors/blue.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#0073E5" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/colors/magenta.svg b/panels/ubuntu/assets/colors/magenta.svg
new file mode 100644
index 0000000..65c43b8
--- /dev/null
+++ b/panels/ubuntu/assets/colors/magenta.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#BC33DB" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/colors/olive.svg b/panels/ubuntu/assets/colors/olive.svg
new file mode 100644
index 0000000..67f0f71
--- /dev/null
+++ b/panels/ubuntu/assets/colors/olive.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#4B8501" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/colors/orange.svg b/panels/ubuntu/assets/colors/orange.svg
new file mode 100644
index 0000000..e486e84
--- /dev/null
+++ b/panels/ubuntu/assets/colors/orange.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#f37e40" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/colors/prussiangreen.svg b/panels/ubuntu/assets/colors/prussiangreen.svg
new file mode 100644
index 0000000..6ae821b
--- /dev/null
+++ b/panels/ubuntu/assets/colors/prussiangreen.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#308280" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/colors/purple.svg b/panels/ubuntu/assets/colors/purple.svg
new file mode 100644
index 0000000..aaa4f43
--- /dev/null
+++ b/panels/ubuntu/assets/colors/purple.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#8856EB" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/colors/red.svg b/panels/ubuntu/assets/colors/red.svg
new file mode 100644
index 0000000..cd3eb0c
--- /dev/null
+++ b/panels/ubuntu/assets/colors/red.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#E61D34" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/colors/sage.svg b/panels/ubuntu/assets/colors/sage.svg
new file mode 100644
index 0000000..4a661ae
--- /dev/null
+++ b/panels/ubuntu/assets/colors/sage.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#657B69" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/colors/viridian.svg b/panels/ubuntu/assets/colors/viridian.svg
new file mode 100644
index 0000000..2a61c2d
--- /dev/null
+++ b/panels/ubuntu/assets/colors/viridian.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-401 -339)">
+ <circle cx="417" cy="355" r="13.35" fill="#03875B" stroke-width="2.9706"/>
+ <circle cx="417" cy="355" r="13.35" fill="#00ff00" stroke-width="2.9706"/>
+ </g>
+</svg>
diff --git a/panels/ubuntu/assets/theme-dark.svg b/panels/ubuntu/assets/theme-dark.svg
......@@ -511,7 +394,7 @@ index 0000000..512f606
+</interface>
diff --git a/panels/ubuntu/cc-ubuntu-panel.c b/panels/ubuntu/cc-ubuntu-panel.c
new file mode 100644
index 0000000..b114af3
index 0000000..b268d5b
--- /dev/null
+++ b/panels/ubuntu/cc-ubuntu-panel.c
@@ -0,0 +1,1719 @@
......@@ -581,7 +464,7 @@ index 0000000..b114af3
+#define GEDIT_PREFRENCES_SCHEMA "org.gnome.gedit.preferences.editor"
+#define GEDIT_THEME_KEY "scheme"
+
+#define DEFAULT_ACCENT_COLOR "orange"
+#define DEFAULT_ACCENT_COLOR "default"
+
+struct _CcUbuntuPanel {
+ CcPanel parent_instance;
......@@ -606,7 +489,7 @@ index 0000000..b114af3
+ GtkFlowBoxChild *accent_bark;
+ GtkFlowBoxChild *accent_blue;
+ GtkFlowBoxChild *accent_olive;
+ GtkFlowBoxChild *accent_orange;
+ GtkFlowBoxChild *accent_default;
+ GtkFlowBoxChild *accent_magenta;
+ GtkFlowBoxChild *accent_purple;
+ GtkFlowBoxChild *accent_prussiangreen;
......@@ -1550,7 +1433,7 @@ index 0000000..b114af3
+ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, accent_bark);
+ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, accent_blue);
+ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, accent_olive);
+ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, accent_orange);
+ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, accent_default);
+ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, accent_magenta);
+ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, accent_purple);
+ gtk_widget_class_bind_template_child (widget_class, CcUbuntuPanel, accent_prussiangreen);
......@@ -2191,7 +2074,7 @@ index 0000000..b114af3
+ g_object_set_qdata (G_OBJECT (self->accent_blue), accent_quark (), "blue");
+ g_object_set_qdata (G_OBJECT (self->accent_magenta), accent_quark (), "magenta");
+ g_object_set_qdata (G_OBJECT (self->accent_olive), accent_quark (), "olive");
+ g_object_set_qdata (G_OBJECT (self->accent_orange), accent_quark (), "orange");
+ g_object_set_qdata (G_OBJECT (self->accent_default), accent_quark (), "default");
+ g_object_set_qdata (G_OBJECT (self->accent_purple), accent_quark (), "purple");
+ g_object_set_qdata (G_OBJECT (self->accent_prussiangreen), accent_quark (), "prussiangreen");
+ g_object_set_qdata (G_OBJECT (self->accent_red), accent_quark (), "red");
......@@ -2277,7 +2160,7 @@ index 0000000..b13f611
+#endif /* _CC_EDIT_DIALOG_H_ */
diff --git a/panels/ubuntu/cc-ubuntu-panel.ui b/panels/ubuntu/cc-ubuntu-panel.ui
new file mode 100644
index 0000000..796483d
index 0000000..ff8daba
--- /dev/null
+++ b/panels/ubuntu/cc-ubuntu-panel.ui
@@ -0,0 +1,618 @@
......@@ -2431,7 +2314,7 @@ index 0000000..796483d
+ <class name="colors" />
+ </style>
+ <child>
+ <object class="GtkFlowBoxChild" id="accent_orange">
+ <object class="GtkFlowBoxChild" id="accent_default">
+ <property name="tooltip_text" translatable="yes" context="Yaru theme accent color">Orange</property>
+ <property name="visible">1</property>
+ <property name="valign">center</property>
......@@ -2449,7 +2332,7 @@ index 0000000..796483d
+ <child>
+ <object class="GtkImage">
+ <property name="visible">1</property>
+ <property name="resource">/org/gnome/control-center/ubuntu/assets/colors/orange.svg</property>
+ <property name="resource">/org/gnome/control-center/ubuntu/assets/colors/default.svg</property>
+ <style>
+ <class name="colors-thumbnail" />
+ </style>
......@@ -2923,10 +2806,12 @@ index 0000000..8235e5c
+Keywords=Dock;Launcher;Theme;Ubuntu;Dark;icons;Yaru;Accent;
diff --git a/panels/ubuntu/meson.build b/panels/ubuntu/meson.build
new file mode 100644
index 0000000..cdfbd03
index 0000000..dec7469
--- /dev/null
+++ b/panels/ubuntu/meson.build
@@ -0,0 +1,56 @@
@@ -0,0 +1,104 @@
+fs = import('fs')
+
+panels_list += cappletname
+desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
+
......@@ -2950,27 +2835,73 @@ index 0000000..cdfbd03
+ 'cc-ubuntu-dock-dialog.c',
+)
+
+colors = {
+ 'default': '#E95420',
+ 'bark': '#787859',
+ 'sage': '#657B69',
+ 'olive': '#4B8501',
+ 'viridian': '#03875B',
+ 'prussiangreen': '#308280',
+ 'blue': '#0073E5',
+ 'purple': '#7764D8',
+ 'magenta': '#B34CB3',
+ 'red': '#DA3450',
+}
+
+gresource_xml_contents = []
+resource_generated_data = []
+resource_data = files(
+ 'appearance.css',
+ 'assets/theme-dark.svg',
+ 'assets/theme-light.svg',
+ 'assets/colors/orange.svg',
+ 'assets/colors/bark.svg',
+ 'assets/colors/blue.svg',
+ 'assets/colors/magenta.svg',
+ 'assets/colors/olive.svg',
+ 'assets/colors/purple.svg',
+ 'assets/colors/red.svg',
+ 'assets/colors/viridian.svg',
+ 'cc-ubuntu-panel.ui',
+ 'cc-ubuntu-dock-dialog.ui',
+)
+
+foreach file: resource_data
+ file_path = '@0@'.format(file)
+ gresource_xml_contents += '<file alias="@0@" preprocess="@1@">@2@</file>'.format(
+ (meson.project_source_root() / file_path).replace(meson.current_source_dir() + '/', ''),
+ fs.name(file).endswith('.ui') or fs.name(file).endswith('.svg') ? 'xml-stripblanks' : '',
+ meson.project_source_root() / file_path,
+ )
+endforeach
+
+foreach color, code: colors
+ asset_name = color + '.svg'
+ asset_path = 'assets' / 'colors'
+ color_asset = custom_target(
+ asset_name,
+ input: asset_path / 'color.svg.in',
+ depfile: '@INPUT@',
+ output: asset_name,
+ command: [
+ 'sed',
+ 's/#00ff00/@0@/g'.format(code),
+ '@INPUT@',
+ ],
+ capture: true,
+ )
+
+ gresource_xml_contents += (
+ '<file alias="@0@" preprocess="xml-stripblanks">@1@</file>'.format(
+ asset_path / asset_name, color_asset.full_path()))
+ resource_generated_data += color_asset
+endforeach
+
+gresource_xml = configure_file(
+ configuration: {
+ 'GENERATED_FILES': '\n'.join(gresource_xml_contents)
+ },
+ input: cappletname + '.gresource.xml',
+ output: cappletname + '.generated.gresource.xml',
+)
+
+sources += gnome.compile_resources(
+ 'cc-' + cappletname + '-resources',
+ cappletname + '.gresource.xml',
+ gresource_xml,
+ c_name: 'cc_' + cappletname,
+ dependencies: resource_data,
+ dependencies: resource_data + resource_generated_data,
+ export: true
+)
+
......@@ -2985,28 +2916,14 @@ index 0000000..cdfbd03
+)
diff --git a/panels/ubuntu/ubuntu.gresource.xml b/panels/ubuntu/ubuntu.gresource.xml
new file mode 100644
index 0000000..6e20032
index 0000000..a636e9c
--- /dev/null
+++ b/panels/ubuntu/ubuntu.gresource.xml
@@ -0,0 +1,20 @@
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/control-center/ubuntu">
+ <file preprocess="xml-stripblanks">cc-ubuntu-panel.ui</file>
+ <file preprocess="xml-stripblanks">cc-ubuntu-dock-dialog.ui</file>
+ <file>appearance.css</file>
+ <file>assets/theme-dark.svg</file>
+ <file>assets/theme-light.svg</file>
+ <file>assets/colors/bark.svg</file>
+ <file>assets/colors/blue.svg</file>
+ <file>assets/colors/magenta.svg</file>
+ <file>assets/colors/olive.svg</file>
+ <file>assets/colors/orange.svg</file>
+ <file>assets/colors/prussiangreen.svg</file>
+ <file>assets/colors/purple.svg</file>
+ <file>assets/colors/red.svg</file>
+ <file>assets/colors/sage.svg</file>
+ <file>assets/colors/viridian.svg</file>
+ @GENERATED_FILES@
+ </gresource>
+</gresources>
diff --git a/po/POTFILES.in b/po/POTFILES.in
......
debian/patches/ubuntu/background-Support-changing-the-light-dark-theme-from-g-c.patch
View file @ 9075ffb5
......@@ -5,14 +5,14 @@ Subject: background: Support changing the light / dark theme from g-c-c
Without this we'd not be able to change the background when the dark
theme has been chosen.
---
panels/background/cc-background-chooser.c | 18 ++++++++++++++++
panels/background/cc-background-chooser.c | 24 ++++++++++++++++++++++
panels/background/cc-background-chooser.h | 2 ++
panels/background/cc-background-chooser.ui | 13 ++++++++++++
panels/background/cc-background-panel.c | 33 ++++++++++++++++++++++++++++--
4 files changed, 64 insertions(+), 2 deletions(-)
4 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/panels/background/cc-background-chooser.c b/panels/background/cc-background-chooser.c
index 04fd85c..97aea0b 100644
index 04fd85c..0005b81 100644
--- a/panels/background/cc-background-chooser.c
+++ b/panels/background/cc-background-chooser.c
@@ -36,6 +36,7 @@ struct _CcBackgroundChooser
......@@ -54,6 +54,23 @@ index 04fd85c..97aea0b 100644
gtk_widget_class_bind_template_callback (widget_class, on_item_activated_cb);
}
@@ -322,10 +340,16 @@ cc_background_chooser_class_init (CcBackgroundChooserClass *klass)
static void
cc_background_chooser_init (CcBackgroundChooser *self)
{
+ g_auto(GStrv) current_desktop = NULL;
gtk_widget_init_template (GTK_WIDGET (self));
self->recent_source = bg_recent_source_new (GTK_WIDGET (self));
self->wallpapers_source = bg_wallpapers_source_new (GTK_WIDGET (self));
+
+ current_desktop = g_strsplit (g_getenv ("XDG_CURRENT_DESKTOP"), ":", -1);
+ if (g_strv_contains ( (const gchar **) current_desktop, "ubuntu"))
+ gtk_widget_set_visible (GTK_WIDGET (self->bg_notice), TRUE);
+
setup_flowbox (self);
}
diff --git a/panels/background/cc-background-chooser.h b/panels/background/cc-background-chooser.h
index 1751098..043df64 100644
--- a/panels/background/cc-background-chooser.h
......@@ -67,7 +84,7 @@ index 1751098..043df64 100644
G_END_DECLS
diff --git a/panels/background/cc-background-chooser.ui b/panels/background/cc-background-chooser.ui
index aa7da28..422418e 100644
index aa7da28..cf9a7ab 100644
--- a/panels/background/cc-background-chooser.ui
+++ b/panels/background/cc-background-chooser.ui
@@ -5,6 +5,19 @@
......@@ -76,7 +93,7 @@ index aa7da28..422418e 100644
+ <child>
+ <object class="GtkLabel" id="bg_notice">
+ <property name="visible">True</property>
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="visible">1</property>
+ <property name="xalign">0.5</property>
......
debian/patches/ubuntu/diagnostics-Add-Whoopsie-support.patch
View file @ 9075ffb5
......@@ -10,10 +10,10 @@ Subject: diagnostics: Add Whoopsie support
panels/diagnostics/meson.build | 7 +-
5 files changed, 171 insertions(+), 2 deletions(-)
Index: gnome-control-center/meson.build
===================================================================
--- gnome-control-center.orig/meson.build
+++ gnome-control-center/meson.build
diff --git a/meson.build b/meson.build
index 4fffa43..19fdaae 100644
--- a/meson.build
+++ b/meson.build
@@ -227,6 +227,14 @@ endif
config_h.set('HAVE_MALCONTENT', enable_malcontent,
description: 'Define to 1 if malcontent support is enabled')
......@@ -35,19 +35,19 @@ Index: gnome-control-center/meson.build
'Malcontent': enable_malcontent,
+ 'Whoopsie': enable_whoopsie,
}, section: 'Optional Dependencies')
Index: gnome-control-center/meson_options.txt
===================================================================
--- gnome-control-center.orig/meson_options.txt
+++ gnome-control-center/meson_options.txt
@@ -10,3 +10,4 @@ option('profile', type: 'combo', choices
diff --git a/meson_options.txt b/meson_options.txt
index 5305c86..e08e441 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,3 +10,4 @@ option('profile', type: 'combo', choices: ['default','development'], value: 'def
option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support')
option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel')
option('dark_mode_distributor_logo', type: 'string', description: 'absolute path to distributor logo dark mode variant')
+option('whoopsie', type: 'boolean', value: false, description: 'build with Whoopsie support')
Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
===================================================================
--- gnome-control-center.orig/panels/diagnostics/cc-diagnostics-panel.c
+++ gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
diff --git a/panels/diagnostics/cc-diagnostics-panel.c b/panels/diagnostics/cc-diagnostics-panel.c
index 0ea554e..fa2901c 100644
--- a/panels/diagnostics/cc-diagnostics-panel.c
+++ b/panels/diagnostics/cc-diagnostics-panel.c
@@ -18,6 +18,8 @@
* Author: Matthias Clasen <mclasen@redhat.com>
*/
......@@ -82,7 +82,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
};
CC_PANEL_REGISTER (CcDiagnosticsPanel, cc_diagnostics_panel)
@@ -70,9 +81,82 @@ abrt_vanished_cb (GDBusConnection *conne
@@ -70,9 +81,82 @@ abrt_vanished_cb (GDBusConnection *connection,
gpointer user_data)
{
g_debug ("ABRT vanished");
......@@ -101,8 +101,8 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
+
+ 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,
......@@ -144,8 +144,8 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
+ NULL,
+ whoopsie_set_report_crashes_mode_done,
+ NULL);
+}
+
}
+static void
+whoopsie_properties_changed (CcDiagnosticsPanel *self)
+{
......@@ -165,7 +165,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
void
cc_diagnostics_panel_static_init_func (void)
{
@@ -84,7 +168,9 @@ cc_diagnostics_panel_static_init_func (v
@@ -84,7 +168,9 @@ cc_diagnostics_panel_static_init_func (void)
NULL,
NULL);
......@@ -175,7 +175,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
}
static void
@@ -109,7 +195,13 @@ cc_diagnostics_panel_class_init (CcDiagn
@@ -109,7 +195,13 @@ cc_diagnostics_panel_class_init (CcDiagnosticsPanelClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, diagnostics_explanation_label);
gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, diagnostics_list_box);
......@@ -189,7 +189,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
}
static void
@@ -119,6 +211,7 @@ cc_diagnostics_panel_init (CcDiagnostics
@@ -119,6 +211,7 @@ cc_diagnostics_panel_init (CcDiagnosticsPanel *self)
g_autofree gchar *url = NULL;
g_autofree gchar *msg = NULL;
g_autofree gchar *link = NULL;
......@@ -197,7 +197,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
g_resources_register (cc_diagnostics_get_resource ());
@@ -134,6 +227,26 @@ cc_diagnostics_panel_init (CcDiagnostics
@@ -134,6 +227,26 @@ cc_diagnostics_panel_init (CcDiagnosticsPanel *self)
self->abrt_switch, "active",
G_SETTINGS_BIND_DEFAULT);
......@@ -224,10 +224,10 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
if (!os_name)
os_name = g_strdup ("GNOME");
Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.ui
===================================================================
--- gnome-control-center.orig/panels/diagnostics/cc-diagnostics-panel.ui
+++ gnome-control-center/panels/diagnostics/cc-diagnostics-panel.ui
diff --git a/panels/diagnostics/cc-diagnostics-panel.ui b/panels/diagnostics/cc-diagnostics-panel.ui
index 4838a63..2c05bf4 100644
--- a/panels/diagnostics/cc-diagnostics-panel.ui
+++ b/panels/diagnostics/cc-diagnostics-panel.ui
@@ -50,7 +50,7 @@
<property name="can-focus">1</property>
<property name="selection-mode">none</property>
......@@ -237,13 +237,10 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.ui
<property name="visible">1</property>
<child>
<object class="GtkBox">
@@ -80,6 +80,47 @@
</object>
</child>
</object>
+ </child>
+ </object>
+ </child>
@@ -83,6 +83,47 @@
</child>
</object>
</child>
+ <child>
+ <object class="GtkListBoxRow">
+ <property name="visible">1</property>
......@@ -282,13 +279,16 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.ui
+ </object>
+ </child>
+ </object>
</child>
</object>
</child>
Index: gnome-control-center/panels/diagnostics/meson.build
===================================================================
--- gnome-control-center.orig/panels/diagnostics/meson.build
+++ gnome-control-center/panels/diagnostics/meson.build
+ </child>
+ </object>
+ </child>
<style>
<class name="view"/>
<class name="frame"/>
diff --git a/panels/diagnostics/meson.build b/panels/diagnostics/meson.build
index 2f25c21..8c3cea9 100644
--- a/panels/diagnostics/meson.build
+++ b/panels/diagnostics/meson.build
@@ -28,12 +28,17 @@ sources += gnome.compile_resources(
export: true
)
......
debian/patches/ubuntu/distro-logo.patch
View file @ 9075ffb5
From 763cde56be06ce352f41adcdc1c6756f17043f5d Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Tue, 9 Mar 2021 14:51:54 -0600
Subject: [PATCH 1/2] info-overview: add build option to control distributor
......@@ -16,15 +15,15 @@ Because the logo might include text, distributions may want to vary the
logo used in dark mode. A subsequent commit will add a second option for
this.
---
meson.build | 6 ++++++
meson_options.txt | 1 +
panels/info-overview/cc-info-overview-panel.c | 4 ++++
3 files changed, 11 insertions(+)
meson.build | 11 +++++++++++
meson_options.txt | 2 ++
panels/info-overview/cc-info-overview-panel.c | 13 +++++++++++++
3 files changed, 26 insertions(+)
Index: gnome-control-center/meson.build
===================================================================
--- gnome-control-center.orig/meson.build
+++ gnome-control-center/meson.build
diff --git a/meson.build b/meson.build
index cde84d9..4fffa43 100644
--- a/meson.build
+++ b/meson.build
@@ -50,6 +50,17 @@ foreach define: set_defines
config_h.set_quoted(define[0], define[1])
endforeach
......@@ -43,21 +42,21 @@ Index: gnome-control-center/meson.build
# meson does not support octal values, so it must be handled as a
# string. See: https://github.com/mesonbuild/meson/issues/2047
config_h.set('USER_DIR_MODE', '0700',
Index: gnome-control-center/meson_options.txt
===================================================================
--- gnome-control-center.orig/meson_options.txt
+++ gnome-control-center/meson_options.txt
@@ -8,3 +8,5 @@ option('tracing', type: 'boolean', value
diff --git a/meson_options.txt b/meson_options.txt
index 1b7b548..5305c86 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,3 +8,5 @@ option('tracing', type: 'boolean', value: false, description: 'add extra debuggi
option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
option('profile', type: 'combo', choices: ['default','development'], value: 'default')
option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support')
+option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel')
+option('dark_mode_distributor_logo', type: 'string', description: 'absolute path to distributor logo dark mode variant')
Index: gnome-control-center/panels/info-overview/cc-info-overview-panel.c
===================================================================
--- gnome-control-center.orig/panels/info-overview/cc-info-overview-panel.c
+++ gnome-control-center/panels/info-overview/cc-info-overview-panel.c
@@ -917,6 +917,7 @@ cc_info_panel_row_activated_cb (CcInfoOv
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index 35969b8..79d6616 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -917,6 +917,7 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
open_software_update (self);
}
......@@ -65,7 +64,7 @@ Index: gnome-control-center/panels/info-overview/cc-info-overview-panel.c
static gboolean
use_dark_theme (CcInfoOverviewPanel *panel)
{
@@ -934,10 +935,21 @@ use_dark_theme (CcInfoOverviewPanel *pan
@@ -934,10 +935,21 @@ use_dark_theme (CcInfoOverviewPanel *panel)
g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
return (theme_name != NULL && g_str_has_suffix (theme_name, "dark")) ? TRUE : FALSE;
}
......@@ -87,7 +86,7 @@ Index: gnome-control-center/panels/info-overview/cc-info-overview-panel.c
g_autofree char *logo_name = g_get_os_info ("LOGO");
g_autoptr(GPtrArray) array = NULL;
g_autoptr(GIcon) icon = NULL;
@@ -957,6 +969,7 @@ setup_os_logo (CcInfoOverviewPanel *pane
@@ -957,6 +969,7 @@ setup_os_logo (CcInfoOverviewPanel *panel)
icon = g_themed_icon_new_from_names ((char **) array->pdata, array->len);
gtk_image_set_from_gicon (panel->os_logo, icon, GTK_ICON_SIZE_INVALID);
......
debian/patches/ubuntu/info-overview-Show-updates-in-software-propeties-instead-.patch
View file @ 9075ffb5
......@@ -8,7 +8,7 @@ Subject: info-overview: Show updates in software propeties instead of GNOME
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index b755cc5..da2bcaa 100644
index 79d6616..39d1862 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -825,6 +825,13 @@ does_gnome_software_allow_updates (void)
......@@ -40,7 +40,7 @@ index b755cc5..da2bcaa 100644
}
else
{
@@ -1001,7 +1007,7 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self)
@@ -1013,7 +1019,7 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self)
g_resources_register (cc_info_overview_get_resource ());
......