rpms/gnome-control-center
7
0
Fork 0
Code Issues Pull Requests Releases Activity

+ gnome-control-center-3.35.90-1

Browse Source 
Update to 3.35.90
This commit is contained in:
Bastien Nocera 2020-02-03 14:53:58 +01:00
parent f7a1aea617
commit 7b2ae50fd8
6 changed files with 31 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,3 +17,4 @@
/gnome-control-center-3.34.0.1.tar.xz /gnome-control-center-3.34.0.1.tar.xz
/gnome-control-center-3.34.1.tar.xz /gnome-control-center-3.34.1.tar.xz
/gnome-control-center-3.34.2.tar.xz /gnome-control-center-3.34.2.tar.xz
/gnome-control-center-3.35.90.tar.xz

39
0001-Adapt-to-new-gnome-desktop-API-changes.patch
View File

@ -1,39 +0,0 @@
From 9dcb5cde73917832fa11cab69e7b51b092f281f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
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

31
0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch
View File

@ -1,31 +0,0 @@
From ce5adc79529590d36d9febc0b21777b47287ba40 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
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

104
distro-logo.patch
View File

@ -1,99 +1,31 @@
From 6d4cfd47a2bbeaa5d862c1beb6301cc8a336638e Mon Sep 17 00:00:00 2001 From 2e98b899f600b393fe538f61455670ad20ab57ff Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com> From: Bastien Nocera <hadess@hadess.net>
Date: Sun, 31 Mar 2013 20:28:19 -0400 Date: Mon, 3 Feb 2020 14:46:15 +0100
Subject: [PATCH] info: Switch around GNOME and distro information Subject: [PATCH] info-overview: Use the Fedora logo prominently
This makes the distribution logo prominent, and puts GNOME version This removes GNOME branding in favour of Fedora branding. We don't
information in the small print. 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-overview/cc-info-overview-panel.ui | 3 ++-
panels/info/cc-info-overview-panel.ui | 14 ++++++++------ 1 file changed, 2 insertions(+), 1 deletion(-)
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
index e2276a295..1055b82e5 100644 index bd43be8c9..e5d63149b 100644
--- a/panels/info/cc-info-overview-panel.c --- a/panels/info-overview/cc-info-overview-panel.ui
+++ b/panels/info/cc-info-overview-panel.c +++ b/panels/info-overview/cc-info-overview-panel.ui
@@ -435,7 +435,7 @@ static char * @@ -30,7 +30,8 @@
get_os_name (void) <object class="GtkImage">
{
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 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="halign">center</property>
- <property name="spacing">18</property>
+ <property name="spacing">6</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="system_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
- <property name="resource">/org/gnome/control-center/info/GnomeLogoVerticalMedium.svg</property> - <property name="resource">/org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg</property>
+ <property name="pixel_size">128</property> + <property name="pixel_size">128</property>
+ <property name="icon_name">fedora-logo-icon</property> + <property name="icon_name">fedora-logo-icon</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -39,11 +40,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="version_label">
+ <object class="GtkLabel" id="os_name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Version 3.0</property>
<property name="selectable">True</property>
+ <property name="margin-bottom">24</property>
<attributes>
<attribute name="scale" value="1.25"/>
</attributes>
@@ -130,8 +132,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes" comments="To translators: this field contains the distro name and version">OS name</property>
- <property name="mnemonic_widget">os_name_label</property>
+ <property name="label">GNOME</property>
+ <property name="mnemonic_widget">version_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -243,7 +245,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="os_name_label">
+ <object class="GtkLabel" id="version_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="ellipsize">end</property>
-- --
2.20.1 2.24.1

23
gnome-control-center.spec
View File

@ -1,7 +1,7 @@
%define gnome_online_accounts_version 3.25.3 %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 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 gsettings_desktop_schemas_version 3.31.0
%define upower_version 0.99.8 %define upower_version 0.99.8
%define gtk3_version 3.22.20 %define gtk3_version 3.22.20
@ -9,23 +9,17 @@
%define gnome_bluetooth_version 3.18.2 %define gnome_bluetooth_version 3.18.2
Name: gnome-control-center Name: gnome-control-center
Version: 3.34.2 Version: 3.35.90
Release: 4%{?dist} Release: 1%{?dist}
Summary: Utilities to configure the GNOME desktop Summary: Utilities to configure the GNOME desktop
License: GPLv2+ and CC-BY-SA License: GPLv2+ and CC-BY-SA
URL: http://www.gnome.org 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 # https://bugzilla.gnome.org/show_bug.cgi?id=695691
Patch0: distro-logo.patch 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: chrpath
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -33,6 +27,7 @@ BuildRequires: docbook-style-xsl libxslt
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gettext BuildRequires: gettext
BuildRequires: meson BuildRequires: meson
BuildRequires: git
BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(accountsservice)
BuildRequires: pkgconfig(cheese) >= %{cheese_version} BuildRequires: pkgconfig(cheese) >= %{cheese_version}
BuildRequires: pkgconfig(cheese-gtk) BuildRequires: pkgconfig(cheese-gtk)
@ -142,7 +137,7 @@ can install configuration files that are picked up by the control-center
utilities. utilities.
%prep %prep
%autosetup -p1 %autosetup -p1 -S git
%build %build
%meson -Ddocumentation=true %meson -Ddocumentation=true
@ -193,6 +188,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
%dir %{_datadir}/gnome/wm-properties %dir %{_datadir}/gnome/wm-properties
%changelog %changelog
* Mon Feb 03 2020 Bastien Nocera <bnocera@redhat.com> - 3.35.90-1
+ gnome-control-center-3.35.90-1
- Update to 3.35.90
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.2-4 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (gnome-control-center-3.34.2.tar.xz) = 7b206ea1f95cb3c44c818dec756534e5ff99150ca974859a21b7670fa419ecafacc898b94d906636bab632b7311ad8de3105d2f88e77181c0db2091b48733835 SHA512 (gnome-control-center-3.35.90.tar.xz) = e6a6495c98ba7e214928ea4c9780cbd3ee0b3c99920d8467e6763cc3e04901413ad0e1fb4046867983b40a65083467e61c22ef446c7fa828c39b376fda25785d