diff --git a/.gitignore b/.gitignore index acbcab8..536fb70 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /gnome-control-center-3.38.3.tar.xz /gnome-control-center-3.38.4.tar.xz /gnome-control-center-40.beta.tar.xz +/gnome-control-center-40.rc.tar.xz diff --git a/0001-network-connection-editor-Fixup-creation-of-the-netm.patch b/0001-network-connection-editor-Fixup-creation-of-the-netm.patch deleted file mode 100644 index b03f334..0000000 --- a/0001-network-connection-editor-Fixup-creation-of-the-netm.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5902d04ac2f2bfec361ed8d0feb053f96734a076 Mon Sep 17 00:00:00 2001 -From: Igor Raits -Date: Sat, 6 Mar 2021 22:07:29 +0100 -Subject: [PATCH] network/connection-editor: Fixup creation of the netmask - widget - -Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1274 -Signed-off-by: Igor Raits ---- - panels/network/connection-editor/ce-page-ip4.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c -index c1500f99f..6de6ce607 100644 ---- a/panels/network/connection-editor/ce-page-ip4.c -+++ b/panels/network/connection-editor/ce-page-ip4.c -@@ -360,7 +360,7 @@ add_route_row (CEPageIP4 *self, - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (row_box), widget); - -- widget = gtk_entry_new (); -+ widget = GTK_WIDGET (ce_netmask_entry_new ()); - g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED); - g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self, G_CONNECT_SWAPPED); - g_object_set_data (G_OBJECT (row), "netmask", widget); --- -2.30.1 - diff --git a/fix-language-chooser.patch b/fix-language-chooser.patch deleted file mode 100644 index bfe8634..0000000 --- a/fix-language-chooser.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 429bbe0564f8c129717635e8979fa6fa761a0f1c Mon Sep 17 00:00:00 2001 -From: Georges Basile Stavracas Neto -Date: Tue, 23 Feb 2021 10:24:49 -0300 -Subject: [PATCH] common: Add missing tag to CcLanguageChooser - -The UI file is not wrapping the tag with , which -fails to parse and blanks the dialog. - -Add the missing tag around the "More" row object. - -Fixes https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1270 - -common: Rename 'check' to 'check_image' - -The C code tries to fetch and use 'check_image', but the UI definition -calls it 'check', which throws a few warnings. Renaming it in the UI file -is easier than in the C file, so I went with the former. ---- - panels/common/cc-language-chooser.ui | 47 +++++++++++++++------------- - panels/common/cc-language-row.ui | 2 +- - 2 files changed, 27 insertions(+), 22 deletions(-) - -diff --git a/panels/common/cc-language-chooser.ui b/panels/common/cc-language-chooser.ui -index 5449fb3dd..885eb437a 100644 ---- a/panels/common/cc-language-chooser.ui -+++ b/panels/common/cc-language-chooser.ui -@@ -70,27 +70,32 @@ - False - - -- -- -- -- True -- 10 -- More… -- -- -- False -- view-more-symbolic -- 1 -- 10 -- 10 -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ True -+ 10 -+ More… -+ -+ -+ False -+ view-more-symbolic -+ 1 -+ 10 -+ 10 -+ -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/panels/common/cc-language-row.ui b/panels/common/cc-language-row.ui -index 3f2d67b68..957df54ab 100644 ---- a/panels/common/cc-language-row.ui -+++ b/panels/common/cc-language-row.ui -@@ -18,7 +18,7 @@ - - - -- -+ - False - object-select-symbolic - 1 --- -2.29.2 - diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 57c4608..6f3028a 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -12,8 +12,8 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-control-center -Version: 40~beta -Release: 5%{?dist} +Version: 40~rc +Release: 1%{?dist} Summary: Utilities to configure the GNOME desktop License: GPLv2+ and CC-BY-SA @@ -23,11 +23,6 @@ Source0: https://download.gnome.org/sources/gnome-control-center/40/gnome # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965 Patch0: distro-logo.patch -Patch1: fix-language-chooser.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1932674 -# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/963 -Patch2: 0001-network-connection-editor-Fixup-creation-of-the-netm.patch - BuildRequires: chrpath BuildRequires: cups-devel BuildRequires: desktop-file-utils @@ -35,7 +30,6 @@ 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) @@ -148,7 +142,7 @@ can install configuration files that are picked up by the control-center utilities. %prep -%autosetup -p1 -S git -n gnome-control-center-%{tarball_version} +%autosetup -p1 -n gnome-control-center-%{tarball_version} %build %meson \ @@ -210,6 +204,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center %dir %{_datadir}/gnome/wm-properties %changelog +* Mon Mar 15 2021 Kalev Lember - 40~rc-1 +- Update to 40.rc + * Wed Mar 10 2021 Michael Catanzaro - 40~beta-5 - Refresh distro logo patch - Drop Recommends: vino, let vino die! diff --git a/sources b/sources index ddcac55..1b18169 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-control-center-40.beta.tar.xz) = d09239c21d5129b32297671c7636d0f82663bbf72395f827d13470108c66dd004527e25b788850714ce4f7a513cbe0032d10e06e36b8f16ba129bc4bbca0238b +SHA512 (gnome-control-center-40.rc.tar.xz) = 74940eb7b0516b294b892be50fbae919c28945e13c1ba6203940ffcfb27ccbb9f9419e3f0151992e180994d0bbc8f2121ac500b07540c48286e069aa6cb1c51d