From 9db9b800fcf259bca09e29711a30baa5de2521d3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 9 May 2023 05:20:02 +0000
Subject: [PATCH] import gnome-software-41.5-2.el9

---
 ...-removal-dialog-crrect-property-name.patch | 12 ++++
 SOURCES/0009-hide-some-errors.patch           | 70 +++++++++++++++++++
 SPECS/gnome-software.spec                     | 10 ++-
 3 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/0008-gs-removal-dialog-crrect-property-name.patch
 create mode 100644 SOURCES/0009-hide-some-errors.patch

diff --git a/SOURCES/0008-gs-removal-dialog-crrect-property-name.patch b/SOURCES/0008-gs-removal-dialog-crrect-property-name.patch
new file mode 100644
index 0000000..47325af
--- /dev/null
+++ b/SOURCES/0008-gs-removal-dialog-crrect-property-name.patch
@@ -0,0 +1,12 @@
+diff -up gnome-software-41.5/src/gs-removal-dialog.ui.4 gnome-software-41.5/src/gs-removal-dialog.ui
+--- gnome-software-41.5/src/gs-removal-dialog.ui.4	2022-09-12 08:59:57.819169830 +0200
++++ gnome-software-41.5/src/gs-removal-dialog.ui	2022-09-12 09:00:25.148201673 +0200
+@@ -20,7 +20,7 @@
+     </child>
+   </object>
+   <template class="GsRemovalDialog" parent="GtkMessageDialog">
+-    <property name="text" translatable="yes">Incompatible Software</property>
++    <property name="title" translatable="yes">Incompatible Software</property>
+     <property name="modal">True</property>
+     <property name="destroy_with_parent">True</property>
+     <child type="action">
diff --git a/SOURCES/0009-hide-some-errors.patch b/SOURCES/0009-hide-some-errors.patch
new file mode 100644
index 0000000..3dd6ade
--- /dev/null
+++ b/SOURCES/0009-hide-some-errors.patch
@@ -0,0 +1,70 @@
+From 19c19d37ec9ba8b15b806158572a8e4a34c55677 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 7 Sep 2022 09:01:16 +0200
+Subject: [PATCH] misc: Hide some errors in non-debug builds
+
+These two errors are useless for the users, they cannot do anything with them.
+While it can be useful to know them, they can be also disturbing and they just
+fill the journal log for the users.
+
+Related to https://gitlab.gnome.org/GNOME/gnome-software/-/issues/753
+---
+ lib/gs-plugin-loader.c | 15 +++++++++++----
+ src/gs-shell.c         | 15 +++++++++++----
+ 2 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
+index 63f741c37..e040358b7 100644
+--- a/lib/gs-plugin-loader.c
++++ b/lib/gs-plugin-loader.c
+@@ -358,10 +358,17 @@ gs_plugin_loader_claim_error (GsPluginLoader *plugin_loader,
+ 
+ 	/* invalid */
+ 	if (error_copy->domain != GS_PLUGIN_ERROR) {
+-		g_warning ("not GsPlugin error %s:%i: %s",
+-			   g_quark_to_string (error_copy->domain),
+-			   error_copy->code,
+-			   error_copy->message);
++		if (g_strcmp0 (BUILD_TYPE, "debug") == 0) {
++			g_warning ("not GsPlugin error %s:%i: %s",
++				   g_quark_to_string (error_copy->domain),
++				   error_copy->code,
++				   error_copy->message);
++		} else {
++			g_debug ("not GsPlugin error %s:%i: %s",
++				 g_quark_to_string (error_copy->domain),
++				 error_copy->code,
++				 error_copy->message);
++		}
+ 		error_copy->domain = GS_PLUGIN_ERROR;
+ 		error_copy->code = GS_PLUGIN_ERROR_FAILED;
+ 	}
+diff --git a/src/gs-shell.c b/src/gs-shell.c
+index beb76f0e9..af297d240 100644
+--- a/src/gs-shell.c
++++ b/src/gs-shell.c
+@@ -2080,10 +2080,17 @@ gs_shell_rescan_events (GsShell *shell)
+ 			    !g_error_matches (error,
+ 					      G_IO_ERROR,
+ 					      G_IO_ERROR_CANCELLED)) {
+-				g_warning ("not handling error %s for action %s: %s",
+-					   gs_plugin_error_to_string (error->code),
+-					   gs_plugin_action_to_string (action),
+-					   error->message);
++				if (g_strcmp0 (BUILD_TYPE, "debug") == 0) {
++					g_warning ("not handling error %s for action %s: %s",
++						   gs_plugin_error_to_string (error->code),
++						   gs_plugin_action_to_string (action),
++						   error->message);
++				} else {
++					g_debug ("not handling error %s for action %s: %s",
++						 gs_plugin_error_to_string (error->code),
++						 gs_plugin_action_to_string (action),
++						 error->message);
++				}
+ 			}
+ 			gs_plugin_event_add_flag (event, GS_PLUGIN_EVENT_FLAG_INVALID);
+ 			return;
+-- 
+GitLab
+
diff --git a/SPECS/gnome-software.spec b/SPECS/gnome-software.spec
index 22d1a9e..9590f5b 100644
--- a/SPECS/gnome-software.spec
+++ b/SPECS/gnome-software.spec
@@ -12,7 +12,7 @@
 
 Name:      gnome-software
 Version:   41.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A software center for GNOME
 
 License:   GPLv2+
@@ -22,6 +22,8 @@ Source0:   https://download.gnome.org/sources/gnome-software/41/%{name}-%{tarbal
 Patch01:   0001-crash-with-broken-theme.patch
 Patch02:   0006-optional-repos-cannot-be-disabled.patch
 Patch03:   0007-compulsory-only-for-repos.patch
+Patch04:   0008-gs-removal-dialog-crrect-property-name.patch
+Patch05:   0009-hide-some-errors.patch
 
 BuildRequires: appstream-devel >= %{appstream_version}
 BuildRequires: gcc
@@ -102,7 +104,7 @@ and update software in the GNOME desktop.
 This package includes the rpm-ostree backend.
 
 %prep
-%autosetup -p1 -n %{name}-%{tarball_version}
+%autosetup -p1 -n %{name}-%{tarball_version} -S gendiff
 
 %build
 %meson \
@@ -202,6 +204,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gtk-doc/html/gnome-software
 
 %changelog
+* Thu Sep 22 2022 Milan Crha <mcrha@redhat.com> - 41.5-2
+- Resolves: #2128812 (Correct property name in GsRemovalDialog .ui file)
+- Resolves: #2129021 (Hide some errors in non-debug builds)
+
 * Mon Mar 21 2022 Milan Crha <mcrha@redhat.com> - 41.5-1
 - Resolves: #2066164 (Update to 41.5)