diff --git a/control-center.spec b/control-center.spec index 9dff18f..27bbe2c 100644 --- a/control-center.spec +++ b/control-center.spec @@ -17,6 +17,9 @@ License: GPLv2+ and GFDL URL: http://www.gnome.org Source0: https://download.gnome.org/sources/gnome-control-center/3.23/gnome-control-center-%{version}.tar.xz +# https://bugzilla.gnome.org/show_bug.cgi?id=695691 +Patch0: distro-logo.patch + BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(cheese-gtk) >= 3.5.91 BuildRequires: pkgconfig(clutter-gtk-1.0) @@ -129,6 +132,7 @@ utilities. %prep %setup -q -n gnome-control-center-%{version} +%patch0 -p1 -b .distro-logo %build %configure \ @@ -216,6 +220,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Mon Mar 06 2017 Kalev Lember - 1:3.23.91-1 - Update to 3.23.91 +- Restore distro-logo.patch * Wed Feb 15 2017 Richard Hughes - 1:3.23.90-1 - Update to 3.23.90 diff --git a/distro-logo.patch b/distro-logo.patch new file mode 100644 index 0000000..3f6fc18 --- /dev/null +++ b/distro-logo.patch @@ -0,0 +1,283 @@ +From e4ce92aa930cdefab24122dfa47997d4805e7741 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 + +This makes the distribution logo prominent, and puts GNOME version +information in the small print. + +https://bugzilla.gnome.org/show_bug.cgi?id=695691 +--- + panels/info/cc-info-panel.c | 55 +++++++++++++++++--------------- + panels/info/info.ui | 77 ++++++++++++++++++++++++++++++++------------- + 2 files changed, 84 insertions(+), 48 deletions(-) + +diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c +index 3ce8b5749..7ec29e663 100644 +--- a/panels/info/cc-info-panel.c ++++ b/panels/info/cc-info-panel.c +@@ -491,42 +491,23 @@ static char * + get_os_type (void) + { + GHashTable *os_info; +- gchar *name, *result, *build_id; +- int bits; ++ gchar *name, *result, *version; + + os_info = get_os_info (); + + if (!os_info) + return NULL; + +- name = g_hash_table_lookup (os_info, "PRETTY_NAME"); +- build_id = g_hash_table_lookup (os_info, "BUILD_ID"); ++ name = g_hash_table_lookup (os_info, "NAME"); ++ version = g_hash_table_lookup (os_info, "VERSION_ID"); + +- if (GLIB_SIZEOF_VOID_P == 8) +- bits = 64; +- else +- bits = 32; +- +- if (build_id) ++ if (name && version) + { +- if (name) +- /* translators: This is the name of the OS, followed by the type +- * of architecture and the build id, for example: +- * "Fedora 18 (Spherical Cow) 64-bit (Build ID: xyz)" or +- * "Ubuntu (Oneric Ocelot) 32-bit (Build ID: jki)" */ +- result = g_strdup_printf (_("%s %d-bit (Build ID: %s)"), name, bits, build_id); +- else +- result = g_strdup_printf (_("%d-bit (Build ID: %s)"), bits, build_id); ++ result = g_strconcat (name, " ", version, NULL); + } +- else ++ else if (name) + { +- if (name) +- /* translators: This is the name of the OS, followed by the type +- * of architecture, for example: +- * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit" */ +- result = g_strdup_printf (_("%s %d-bit"), name, bits); +- else +- result = g_strdup_printf (_("%d-bit"), bits); ++ result = g_strdup (name); + } + + g_clear_pointer (&os_info, g_hash_table_destroy); +@@ -534,6 +515,23 @@ get_os_type (void) + return result; + } + ++static char * ++get_os_description (void) ++{ ++ int bits; ++ gchar *result; ++ ++ if (GLIB_SIZEOF_VOID_P == 8) ++ bits = 64; ++ else ++ bits = 32; ++ ++ /* translators: This is the the type of OS architecture, eg: "64-bit" or "32-bit" */ ++ result = g_strdup_printf (_("%d-bit"), bits); ++ ++ return result; ++} ++ + static void + query_done (GFile *file, + GAsyncResult *res, +@@ -1520,6 +1518,11 @@ info_panel_setup_overview (CcInfoPanel *self) + gtk_label_set_text (GTK_LABEL (widget), text ? text : ""); + g_free (text); + ++ widget = WID ("os_description_label"); ++ text = get_os_description (); ++ gtk_label_set_text (GTK_LABEL (widget), text ? text : ""); ++ g_free (text); ++ + get_primary_disc_info (self); + + widget = WID ("graphics_label"); +diff --git a/panels/info/info.ui b/panels/info/info.ui +index 1967fdf18..0bdfc1a86 100644 +--- a/panels/info/info.ui ++++ b/panels/info/info.ui +@@ -199,13 +199,14 @@ + + True + False +- 18 ++ 6 + vertical + + + True + False +- /org/gnome/control-center/info/GnomeLogoVerticalMedium.svg ++ 128 ++ fedora-logo-icon + + + False +@@ -214,11 +215,12 @@ + + + +- ++ + True + False + Version 3.0 + True ++ 24 + + + +@@ -282,19 +284,35 @@ + + + ++ ++ True ++ False ++ 1 ++ OS Type ++ os_description_label ++ ++ ++ ++ 3 ++ 4 ++ ++ ++ + + True + False + 1 +- Base system +- os_type_label ++ GNOME ++ version_label + + + +- 4 +- 5 ++ 5 ++ 6 + + + +@@ -309,8 +327,8 @@ + + + +- 6 +- 7 ++ 7 ++ 8 + + + +@@ -354,7 +372,7 @@ + + + +- ++ + True + False + 0 +@@ -364,8 +382,23 @@ + + 1 + 2 +- 4 +- 5 ++ 3 ++ 4 ++ ++ ++ ++ ++ True ++ False ++ 0 ++ Unknown ++ True ++ ++ ++ 1 ++ 2 ++ 5 ++ 6 + + + +@@ -379,8 +412,8 @@ + + 1 + 2 +- 6 +- 7 ++ 7 ++ 8 + + + +@@ -462,8 +495,8 @@ + + + +- 3 +- 4 ++ 4 ++ 5 + + + +@@ -491,8 +524,8 @@ + + 1 + 2 +- 3 +- 4 ++ 4 ++ 5 + + + +@@ -510,8 +543,8 @@ + + + +- 5 +- 6 ++ 6 ++ 7 + + + +@@ -525,8 +558,8 @@ + + 1 + 2 +- 5 +- 6 ++ 6 ++ 7 + + + +-- +2.12.0 +