rpms/gnome-software
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport fix for RHBZ #1546893 from upstream git

Browse Source
This commit is contained in:
Adam Williamson 2018-02-19 22:26:28 -08:00
parent 096f08df0c
commit c1d15deeeb
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-Revert-Fix-first-run-dialog-racing-with-gnome-softwa.patch Normal file
View File

@ -0,0 +1,40 @@
From 4a61725ccb1a9a45d7b991c29827a238dcacd564 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 20 Feb 2018 01:25:56 +0100
Subject: [PATCH] Revert "Fix first run dialog racing with gnome-software shell
startup"
This caused the first run dialog to appear when gnome-software starts in
the background with 'gnome-software --gapplication-service'.
https://bugzilla.redhat.com/show_bug.cgi?id=1546893
This reverts commit 3516c0fc8e271c8e8fbe1cf151447c5067d260e7.
---
src/gs-application.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gs-application.c b/src/gs-application.c
index d2b18515..85b966e4 100644
--- a/src/gs-application.c
+++ b/src/gs-application.c
@@ -249,7 +249,6 @@ gs_application_shell_loaded_cb (GsShell *shell, GsApplication *app)
{
gs_shell_set_mode (app->shell, GS_SHELL_MODE_OVERVIEW);
app->shell_loaded_handler_id = 0;
- gs_application_show_first_run_dialog (app);
}
static void
@@ -959,6 +958,8 @@ gs_application_activate (GApplication *application)
gs_shell_set_mode (app->shell, GS_SHELL_MODE_OVERVIEW);
gs_shell_activate (GS_APPLICATION (application)->shell);
+
+ gs_application_show_first_run_dialog (GS_APPLICATION (application));
}
static void
--
2.16.1

8
gnome-software.spec
View File

@ -11,12 +11,15 @@
Name: gnome-software
Version: 3.27.90
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A software center for GNOME
License: GPLv2+
URL: https://wiki.gnome.org/Apps/Software
Source0: https://download.gnome.org/sources/gnome-software/3.27/%{name}-%{version}.tar.xz
# Backported fix for RHBZ #1546893. Will be in next upstream release,
# drop when bumping.
Patch0: 0001-Revert-Fix-first-run-dialog-racing-with-gnome-softwa.patch
BuildRequires: gettext
BuildRequires: libxslt
@ -211,6 +214,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_mandir}/man1/gnome-software-editor.1*
%changelog
* Mon Feb 19 2018 Adam Williamson <awilliam@redhat.com> - 3.27.90-3
- Backport fix for RHBZ #1546893 from upstream git
* Mon Feb 19 2018 Kalev Lember <klember@redhat.com> - 3.27.90-2
- Re-enable rpm-ostree plugin