From 48736876e783dfa8a015a8bf068bc4919018fc61 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Fri, 27 May 2022 10:01:22 +0100
Subject: [PATCH] Update to 42.2

---
 .gitignore                                    |  1 +
 ...e-control-center-42.1-unparent-child.patch | 32 -------------------
 gnome-control-center.spec                     |  6 ++--
 sources                                       |  2 +-
 4 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 gnome-control-center-42.1-unparent-child.patch

diff --git a/.gitignore b/.gitignore
index c0f39fb..cb3f65a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@
 /gnome-control-center-42.rc.tar.xz
 /gnome-control-center-42.0.tar.xz
 /gnome-control-center-42.1.tar.xz
+/gnome-control-center-42.2.tar.xz
diff --git a/gnome-control-center-42.1-unparent-child.patch b/gnome-control-center-42.1-unparent-child.patch
deleted file mode 100644
index 4a4d9f4..0000000
--- a/gnome-control-center-42.1-unparent-child.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1501a84f626997fa62ad4d02acedccda23adbd90 Mon Sep 17 00:00:00 2001
-From: Felipe Borges <felipeborges@gnome.org>
-Date: Tue, 3 May 2022 10:50:33 +0200
-Subject: [PATCH] connection-editor: Unparent child widget on dispose
-
-WirelessSecurityWPAEAP is a GtkWidget owned by the CEPage8021xSecurity
-widget, which is supposed to "unparent" it on "dispose" (since parents
-hold a reference to child widgets). Instead we were calling
-g_clear_object on it.
-
-Fixes #1671
----
- panels/network/connection-editor/ce-page-8021x-security.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panels/network/connection-editor/ce-page-8021x-security.c b/panels/network/connection-editor/ce-page-8021x-security.c
-index deec51fc8..f0b36e70a 100644
---- a/panels/network/connection-editor/ce-page-8021x-security.c
-+++ b/panels/network/connection-editor/ce-page-8021x-security.c
-@@ -154,8 +154,8 @@ ce_page_8021x_security_dispose (GObject *object)
- {
- 	CEPage8021xSecurity *self = CE_PAGE_8021X_SECURITY (object);
- 
-+        gtk_widget_unparent (GTK_WIDGET (self->security));
-         g_clear_object (&self->connection);
--        g_clear_object (&self->security);
-         g_clear_object (&self->group);
- 
- 	G_OBJECT_CLASS (ce_page_8021x_security_parent_class)->dispose (object);
--- 
-GitLab
-
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 0bf0f86..4e32bf6 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -12,7 +12,7 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           gnome-control-center
-Version:        42.1
+Version:        42.2
 Release:        %autorelease
 Summary:        Utilities to configure the GNOME desktop
 
@@ -22,8 +22,6 @@ Source0:        https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_
 
 # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965
 Patch0:         distro-logo.patch
-# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1671
-Patch1:         gnome-control-center-42.1-unparent-child.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-style-xsl libxslt
@@ -147,7 +145,7 @@ can install configuration files that are picked up by the control-center
 utilities.
 
 %prep
-%autosetup -p1 -n gnome-control-center-%{tarball_version}
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
 %meson \
diff --git a/sources b/sources
index 1a52dbd..e76095d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-control-center-42.1.tar.xz) = a29df2604d90e42a602060a7042d70238eed9e59c46b500610c6b5842e015ba0d9567528a3dfd6bf365973f274de47ccd4b8f2f50cfa35c8f88bb05cb31e774d
+SHA512 (gnome-control-center-42.2.tar.xz) = f8fda1a501939788de62a33d1570e45b95392165d23f90cb4c1ae94c92f61d5f5d72d1e25df1a9fb355ea88abecf7bf38bc67c69fb2b3495d027365deb44f21c