public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Milan Crha <mcrha@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/gnome-software] f44: Resolves: #2463990 (Package updates sometimes shown an online (flatpak) updates)
Date: Mon, 01 Jun 2026 09:52:39 GMT	[thread overview]
Message-ID: <178030755929.1.10351897201573166336.rpms-gnome-software-a584830f11df@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/gnome-software
Branch : f44
Commit : a584830f11dff73066f128206cde4d84091b0cb4
Author : Milan Crha <mcrha@redhat.com>
Date   : 2026-06-01T11:50:32+02:00
Stats  : +71/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/gnome-software/c/a584830f11dff73066f128206cde4d84091b0cb4?branch=f44

Log:
Resolves: #2463990 (Package updates sometimes shown an online (flatpak) updates)

---
diff --git a/0003-m2434-recognize-added-packages-in-update.patch b/0003-m2434-recognize-added-packages-in-update.patch
new file mode 100644
index 0000000..443e9b8
--- /dev/null
+++ b/0003-m2434-recognize-added-packages-in-update.patch
@@ -0,0 +1,67 @@
+From 11cacd4d7f4ac52e60057b2e0b87d2d5447b4c8b Mon Sep 17 00:00:00 2001
+Date: Fri, 29 May 2026 10:40:28 +0200
+Subject: [PATCH 1/2] packagekit: Recognize packages added as new dependencies
+ during update
+
+The PackageKit 1.3.4 returns packages to be installed as new dependencies
+with info "enhancement", not as "install". This allows to distinguish
+between real updates and newly installed packages in System Updates
+proxy app.
+
+This is https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/2434 ,
+which also fixes https://bugzilla.redhat.com/show_bug.cgi?id=2463990
+---
+ plugins/packagekit/gs-plugin-packagekit.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/packagekit/gs-plugin-packagekit.c b/plugins/packagekit/gs-plugin-packagekit.c
+index 3ce21ef2d..30383dc7b 100644
+--- a/plugins/packagekit/gs-plugin-packagekit.c
++++ b/plugins/packagekit/gs-plugin-packagekit.c
+@@ -1286,7 +1286,8 @@ gs_plugin_packagekit_set_update_app_state (GsApp *app,
+ 	    pk_package_get_info (package) == PK_INFO_ENUM_OBSOLETING) {
+ 		gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+ 	} else if (pk_package_get_info (package) == PK_INFO_ENUM_INSTALL ||
+-		   pk_package_get_info (package) == PK_INFO_ENUM_INSTALLING) {
++		   pk_package_get_info (package) == PK_INFO_ENUM_INSTALLING ||
++		   pk_package_get_info (package) == PK_INFO_ENUM_ENHANCEMENT) {
+ 		gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+ 	} else {
+ 		gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+-- 
+GitLab
+
+
+From abd181b81372785ad66b7ba646ddb3c121352f2b Mon Sep 17 00:00:00 2001
+Date: Fri, 29 May 2026 10:42:59 +0200
+Subject: [PATCH 2/2] gs-app: When adding related app check specifically for
+ updatable_live states
+
+The comment says it above the if, but the if does not really do it.
+The PackageKit plugin can return apps for update in various states,
+not only in "updatable", which then breaks the logic behind this
+code, which results into the "System Updates" being shown in
+the section with live updates, instead of in the section with offline
+updated when there are only other than updatable bare package updates.
+---
+ lib/gs-app.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/gs-app.c b/lib/gs-app.c
+index c530de58a..00635405a 100644
+--- a/lib/gs-app.c
++++ b/lib/gs-app.c
+@@ -4374,8 +4374,8 @@ gs_app_add_related (GsApp *app, GsApp *app2)
+ 	/* if the app is updatable-live and any related app is not then
+ 	 * degrade to the offline state */
+ 	if (priv->state == GS_APP_STATE_UPDATABLE_LIVE &&
+-	    priv2->state == GS_APP_STATE_UPDATABLE)
+-		gs_app_set_state_internal (app, priv2->state);
++	    priv2->state != GS_APP_STATE_UPDATABLE_LIVE)
++		gs_app_set_state_internal (app, GS_APP_STATE_UPDATABLE);
+ 
+ 	gs_app_list_add (priv->related, app2);
+ 
+-- 
+GitLab
+

diff --git a/gnome-software.spec b/gnome-software.spec
index 21f5f04..69ef276 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -45,6 +45,10 @@ Patch:     0001-dnf5-plugin.patch
 
 Patch:     0002-plain-package-update-notification.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=2463990
+# Fix package updates sometimes shown as online (flatpak) updates
+Patch:     0003-m2434-recognize-added-packages-in-update.patch
+
 # ostree and flatpak not on i686 for Fedora and RHEL 10
 # https://github.com/containers/composefs/pull/229#issuecomment-1838735764
 %if 0%{?fedora} || 0%{?rhel} >= 10

                 reply	other threads:[~2026-06-01  9:52 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178030755929.1.10351897201573166336.rpms-gnome-software-a584830f11df@fedoraproject.org \
    --to=mcrha@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox