diff --git a/.gitignore b/.gitignore index 382343c..8a26f60 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /gnome-control-center-3.34.0.1.tar.xz /gnome-control-center-3.34.1.tar.xz /gnome-control-center-3.34.2.tar.xz +/gnome-control-center-3.35.90.tar.xz diff --git a/0001-Adapt-to-new-gnome-desktop-API-changes.patch b/0001-Adapt-to-new-gnome-desktop-API-changes.patch deleted file mode 100644 index c155d98..0000000 --- a/0001-Adapt-to-new-gnome-desktop-API-changes.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9dcb5cde73917832fa11cab69e7b51b092f281f2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Javier=20Jard=C3=B3n?= -Date: Wed, 15 Jan 2020 20:25:56 +0900 -Subject: [PATCH] Adapt to new gnome-desktop API changes - ---- - meson.build | 2 +- - panels/background/cc-background-item.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index fcc062bd5..e0c1ff6f0 100644 ---- a/meson.build -+++ b/meson.build -@@ -120,7 +120,7 @@ colord_dep = dependency('colord', version: '>= 0.1.34') - gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.23.0') - gio_dep = dependency('gio-2.0') - glib_dep = dependency('glib-2.0', version: '>= 2.53.0') --gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90') -+gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.35.4') - 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') -diff --git a/panels/background/cc-background-item.c b/panels/background/cc-background-item.c -index dc8850b66..50851e17d 100644 ---- a/panels/background/cc-background-item.c -+++ b/panels/background/cc-background-item.c -@@ -156,7 +156,7 @@ render_at_size (GnomeBG *bg, - GdkPixbuf *pixbuf; - - pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); -- gnome_bg_draw (bg, pixbuf, gdk_screen_get_default (), FALSE); -+ gnome_bg_draw (bg, pixbuf); - - return pixbuf; - } --- -2.24.1 - diff --git a/0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch b/0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch deleted file mode 100644 index 06be595..0000000 --- a/0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ce5adc79529590d36d9febc0b21777b47287ba40 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Mon, 7 Oct 2019 18:40:43 +0200 -Subject: [PATCH] region: Explicitly update LC_* even when matching LANG - -localed will not update the LC_* variables if they are not given. This -means that should the user switch the formats away from LANG and then -back, they will not be reset appropriately. - -Simply always setting the variables even if the match will fix this. ---- - panels/region/cc-region-panel.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c -index 39b1f9d7b..776f344b7 100644 ---- a/panels/region/cc-region-panel.c -+++ b/panels/region/cc-region-panel.c -@@ -1346,8 +1346,7 @@ set_localed_locale (CcRegionPanel *self) - lang_value = g_strconcat ("LANG=", self->system_language, NULL); - g_variant_builder_add (b, "s", lang_value); - -- if (self->system_region != NULL && -- g_strcmp0 (self->system_language, self->system_region) != 0) { -+ if (self->system_region != NULL) { - g_autofree gchar *time_value = NULL; - g_autofree gchar *numeric_value = NULL; - g_autofree gchar *monetary_value = NULL; --- -2.23.0 - diff --git a/distro-logo.patch b/distro-logo.patch index df4f2d5..b03e292 100644 --- a/distro-logo.patch +++ b/distro-logo.patch @@ -1,99 +1,31 @@ -From 6d4cfd47a2bbeaa5d862c1beb6301cc8a336638e Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Sun, 31 Mar 2013 20:28:19 -0400 -Subject: [PATCH] info: Switch around GNOME and distro information +From 2e98b899f600b393fe538f61455670ad20ab57ff Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 3 Feb 2020 14:46:15 +0100 +Subject: [PATCH] info-overview: Use the Fedora logo prominently -This makes the distribution logo prominent, and puts GNOME version -information in the small print. +This removes GNOME branding in favour of Fedora branding. We don't +make changes to the text information as the distribution/OS is clearly +visible above the GNOME version. -https://bugzilla.gnome.org/show_bug.cgi?id=695691 +See https://bugzilla.gnome.org/show_bug.cgi?id=695691 --- - panels/info/cc-info-overview-panel.c | 7 ++----- - panels/info/cc-info-overview-panel.ui | 14 ++++++++------ - 2 files changed, 10 insertions(+), 11 deletions(-) + panels/info-overview/cc-info-overview-panel.ui | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c -index e2276a295..1055b82e5 100644 ---- a/panels/info/cc-info-overview-panel.c -+++ b/panels/info/cc-info-overview-panel.c -@@ -435,7 +435,7 @@ static char * - get_os_name (void) - { - GHashTable *os_info; -- gchar *name, *version_id, *pretty_name, *build_id; -+ gchar *name, *version_id, *build_id; - gchar *result = NULL; - g_autofree gchar *name_version = NULL; - -@@ -446,12 +446,9 @@ get_os_name (void) - - name = g_hash_table_lookup (os_info, "NAME"); - version_id = g_hash_table_lookup (os_info, "VERSION_ID"); -- pretty_name = g_hash_table_lookup (os_info, "PRETTY_NAME"); - build_id = g_hash_table_lookup (os_info, "BUILD_ID"); - -- if (pretty_name) -- name_version = g_strdup (pretty_name); -- else if (name && version_id) -+ if (name && version_id) - name_version = g_strdup_printf ("%s %s", name, version_id); - else - name_version = g_strdup (_("Unknown")); -diff --git a/panels/info/cc-info-overview-panel.ui b/panels/info/cc-info-overview-panel.ui -index ce675d383..a6435cd42 100644 ---- a/panels/info/cc-info-overview-panel.ui -+++ b/panels/info/cc-info-overview-panel.ui -@@ -24,13 +24,14 @@ - False - center - center -- 18 -+ 6 - vertical - - +diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui +index bd43be8c9..e5d63149b 100644 +--- a/panels/info-overview/cc-info-overview-panel.ui ++++ b/panels/info-overview/cc-info-overview-panel.ui +@@ -30,7 +30,8 @@ + True False -- /org/gnome/control-center/info/GnomeLogoVerticalMedium.svg +- /org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg + 128 + fedora-logo-icon False -@@ -39,11 +40,12 @@ - - - -- -+ - True - False - Version 3.0 - True -+ 24 - - - -@@ -130,8 +132,8 @@ - True - False - 1 -- OS name -- os_name_label -+ GNOME -+ version_label - -@@ -243,7 +245,7 @@ - - - -- -+ - True - False - end -- -2.20.1 +2.24.1 diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 463fe5d..b3b73ca 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,7 +1,7 @@ %define gnome_online_accounts_version 3.25.3 -%define glib2_version 2.53.0 +%define glib2_version 2.56.0 %define gnome_desktop_version 3.35.4 -%define gsd_version 3.27.90 +%define gsd_version 3.35.0 %define gsettings_desktop_schemas_version 3.31.0 %define upower_version 0.99.8 %define gtk3_version 3.22.20 @@ -9,23 +9,17 @@ %define gnome_bluetooth_version 3.18.2 Name: gnome-control-center -Version: 3.34.2 -Release: 4%{?dist} +Version: 3.35.90 +Release: 1%{?dist} Summary: Utilities to configure the GNOME desktop License: GPLv2+ and CC-BY-SA URL: http://www.gnome.org -Source0: https://download.gnome.org/sources/gnome-control-center/3.34/gnome-control-center-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-control-center/3.35/gnome-control-center-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=695691 Patch0: distro-logo.patch -# https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/586 -Patch1: 0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch - -# https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/686 -Patch2: 0001-Adapt-to-new-gnome-desktop-API-changes.patch - BuildRequires: chrpath BuildRequires: cups-devel BuildRequires: desktop-file-utils @@ -33,6 +27,7 @@ BuildRequires: docbook-style-xsl libxslt BuildRequires: gcc BuildRequires: gettext BuildRequires: meson +BuildRequires: git BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(cheese) >= %{cheese_version} BuildRequires: pkgconfig(cheese-gtk) @@ -142,7 +137,7 @@ can install configuration files that are picked up by the control-center utilities. %prep -%autosetup -p1 +%autosetup -p1 -S git %build %meson -Ddocumentation=true @@ -193,6 +188,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center %dir %{_datadir}/gnome/wm-properties %changelog +* Mon Feb 03 2020 Bastien Nocera - 3.35.90-1 ++ gnome-control-center-3.35.90-1 +- Update to 3.35.90 + * Tue Jan 28 2020 Fedora Release Engineering - 3.34.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 33cb159..ba8d5cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-control-center-3.34.2.tar.xz) = 7b206ea1f95cb3c44c818dec756534e5ff99150ca974859a21b7670fa419ecafacc898b94d906636bab632b7311ad8de3105d2f88e77181c0db2091b48733835 +SHA512 (gnome-control-center-3.35.90.tar.xz) = e6a6495c98ba7e214928ea4c9780cbd3ee0b3c99920d8467e6763cc3e04901413ad0e1fb4046867983b40a65083467e61c22ef446c7fa828c39b376fda25785d