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

Update to 3.31.2

Browse Source
This commit is contained in:
Kalev Lember 2019-01-16 22:52:08 +01:00
parent 7d42b3dbe8
commit 72f4666747
5 changed files with 80 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -96,3 +96,4 @@
/gnome-software-3.30.1.tar.xz
/gnome-software-3.30.2.tar.xz
/gnome-software-3.31.1.tar.xz
/gnome-software-3.31.2.tar.xz

64
0001-Lower-as_utils_vercmp_full-version-check-for-Fedora.patch Normal file
View File

@ -0,0 +1,64 @@
From d54bdc6d6f10b0a1e30c36a38ac1d9355c9a75ec Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 24 Oct 2018 15:00:59 +0200
Subject: [PATCH] Lower as_utils_vercmp_full version check for Fedora
We have new as_utils_vercmp_full API backported to
libappstream-glib-0.7.14-2.fc29.
---
lib/gs-plugin-loader.c | 2 +-
plugins/core/gs-appstream.c | 2 +-
src/gs-update-dialog.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 68fff0e10..9055c532b 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -1389,7 +1389,7 @@ gs_plugin_loader_app_sort_prio_cb (GsApp *app1, GsApp *app2, gpointer user_data)
static gint
gs_plugin_loader_app_sort_version_cb (GsApp *app1, GsApp *app2, gpointer user_data)
{
-#if AS_CHECK_VERSION(0,7,15)
+#if AS_CHECK_VERSION(0,7,14)
return as_utils_vercmp_full (gs_app_get_version (app1),
gs_app_get_version (app2),
AS_VERSION_COMPARE_FLAG_NONE);
diff --git a/plugins/core/gs-appstream.c b/plugins/core/gs-appstream.c
index 62fef53c8..4bbf5c69a 100644
--- a/plugins/core/gs-appstream.c
+++ b/plugins/core/gs-appstream.c
@@ -665,7 +665,7 @@ gs_appstream_refine_app (GsPlugin *plugin,
"requires/id[@type='id']"
"[text()='org.gnome.Software.desktop']", NULL);
if (req != NULL) {
-#if AS_CHECK_VERSION(0,7,15)
+#if AS_CHECK_VERSION(0,7,14)
gint rc = as_utils_vercmp_full (xb_node_get_attr (req, "version"),
PACKAGE_VERSION,
AS_VERSION_COMPARE_FLAG_NONE);
diff --git a/src/gs-update-dialog.c b/src/gs-update-dialog.c
index 553cea3bc..dc19f4def 100644
--- a/src/gs-update-dialog.c
+++ b/src/gs-update-dialog.c
@@ -451,7 +451,7 @@ is_downgrade (const gchar *evr1,
* part of the semantic version */
/* check version */
-#if AS_CHECK_VERSION(0,7,15)
+#if AS_CHECK_VERSION(0,7,14)
rc = as_utils_vercmp_full (version1, version2,
AS_VERSION_COMPARE_FLAG_NONE);
#else
@@ -461,7 +461,7 @@ is_downgrade (const gchar *evr1,
return rc > 0;
/* check release */
-#if AS_CHECK_VERSION(0,7,15)
+#if AS_CHECK_VERSION(0,7,14)
rc = as_utils_vercmp_full (version1, version2,
AS_VERSION_COMPARE_FLAG_NONE);
#else
--
2.19.1

124
gnome-software-fix-offline-update-notifications.patch
View File

@ -1,124 +0,0 @@
From 6279c967a1e73ed42106ae99595c0c6b437f03a0 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 23 Oct 2018 09:41:49 +0200
Subject: [PATCH 1/2] update monitor: trivial: Rename a variable
---
src/gs-update-monitor.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c
index 5703dd9cd..31d2738b4 100644
--- a/src/gs-update-monitor.c
+++ b/src/gs-update-monitor.c
@@ -332,7 +332,7 @@ download_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
GsUpdateMonitor *monitor = GS_UPDATE_MONITOR (data);
g_autoptr(GError) error = NULL;
g_autoptr(GsAppList) list = NULL;
- g_autoptr(GsAppList) list2 = NULL;
+ g_autoptr(GsAppList) update_online = NULL;
/* get result */
list = gs_plugin_loader_job_process_finish (GS_PLUGIN_LOADER (object), res, &error);
@@ -343,18 +343,18 @@ download_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
}
/* install any apps that can be installed LIVE */
- list2 = gs_app_list_new ();
+ update_online = gs_app_list_new ();
for (guint i = 0; i < gs_app_list_length (list); i++) {
GsApp *app = gs_app_list_index (list, i);
if (_should_auto_update (app)) {
g_debug ("auto-updating %s", gs_app_get_unique_id (app));
- gs_app_list_add (list2, app);
+ gs_app_list_add (update_online, app);
}
}
- if (gs_app_list_length (list2) > 0) {
+ if (gs_app_list_length (update_online) > 0) {
g_autoptr(GsPluginJob) plugin_job = NULL;
plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_UPDATE,
- "list", list2,
+ "list", update_online,
NULL);
gs_plugin_loader_job_process_async (monitor->plugin_loader,
plugin_job,
--
2.19.1
From 12251ad2ea52035707a5149ba3532eb8096422bc Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 23 Oct 2018 10:12:25 +0200
Subject: [PATCH 2/2] update monitor: Notify about offline updates after they
are downloaded
The notification text says "updates are ready to be installed" so they'd
better be ready when we notify the user.
---
src/gs-update-monitor.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c
index 31d2738b4..3d2b80b47 100644
--- a/src/gs-update-monitor.c
+++ b/src/gs-update-monitor.c
@@ -333,6 +333,7 @@ download_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
g_autoptr(GError) error = NULL;
g_autoptr(GsAppList) list = NULL;
g_autoptr(GsAppList) update_online = NULL;
+ g_autoptr(GsAppList) update_offline = NULL;
/* get result */
list = gs_plugin_loader_job_process_finish (GS_PLUGIN_LOADER (object), res, &error);
@@ -342,15 +343,19 @@ download_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
return;
}
- /* install any apps that can be installed LIVE */
update_online = gs_app_list_new ();
+ update_offline = gs_app_list_new ();
for (guint i = 0; i < gs_app_list_length (list); i++) {
GsApp *app = gs_app_list_index (list, i);
if (_should_auto_update (app)) {
g_debug ("auto-updating %s", gs_app_get_unique_id (app));
gs_app_list_add (update_online, app);
+ } else {
+ gs_app_list_add (update_offline, app);
}
}
+
+ /* install any apps that can be installed LIVE */
if (gs_app_list_length (update_online) > 0) {
g_autoptr(GsPluginJob) plugin_job = NULL;
plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_UPDATE,
@@ -362,6 +367,14 @@ download_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
update_finished_cb,
monitor);
}
+
+ /* show a notification for offline updates */
+ if (gs_app_list_length (update_offline) > 0) {
+ if (has_important_updates (update_offline) ||
+ no_updates_for_a_week (monitor)) {
+ notify_offline_update_available (monitor);
+ }
+ }
}
static void
@@ -422,11 +435,6 @@ get_updates_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
monitor);
return;
}
-
- if (has_important_updates (apps) ||
- no_updates_for_a_week (monitor)) {
- notify_offline_update_available (monitor);
- }
}
static gboolean
--
2.19.1

24
gnome-software.spec
View File

@ -1,26 +1,25 @@
%global glib2_version 2.46.0
%global glib2_version 2.56.0
%global gtk3_version 3.22.4
%global json_glib_version 1.2.0
%global packagekit_version 1.1.1
%global appstream_glib_version 0.7.11
%global appstream_glib_version 0.7.14-3
%global libsoup_version 2.52.0
%global gsettings_desktop_schemas_version 3.12.0
%global gnome_desktop_version 3.18.0
%global fwupd_version 1.0.7
%global flatpak_version 0.9.4
%global flatpak_version 1.1.3
Name: gnome-software
Version: 3.31.1
Release: 2%{?dist}
Version: 3.31.2
Release: 1%{?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.31/%{name}-%{version}.tar.xz
# Fix offline update notifications to show up
# https://bugzilla.redhat.com/show_bug.cgi?id=1659231
Patch0: gnome-software-fix-offline-update-notifications.patch
# Lower appstream-glib version check as we have the required new API backported to
# libappstream-glib-0.7.14-3.fc29.
Patch0: 0001-Lower-as_utils_vercmp_full-version-check-for-Fedora.patch
BuildRequires: gcc
BuildRequires: gettext
@ -30,6 +29,7 @@ BuildRequires: desktop-file-utils
BuildRequires: fwupd-devel >= %{fwupd_version}
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gnome-desktop3-devel
BuildRequires: gnome-online-accounts-devel
BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
BuildRequires: gspell-devel
BuildRequires: gtk3-devel >= %{gtk3_version}
@ -37,6 +37,7 @@ BuildRequires: gtk-doc
BuildRequires: json-glib-devel >= %{json_glib_version}
BuildRequires: libappstream-glib-devel >= %{appstream_glib_version}
BuildRequires: libsoup-devel
BuildRequires: libxmlb-devel
BuildRequires: meson
BuildRequires: PackageKit-glib-devel >= %{packagekit_version}
BuildRequires: polkit-devel
@ -73,7 +74,7 @@ Requires: libsoup%{?_isa} >= %{libsoup_version}
Requires: PackageKit%{?_isa} >= %{packagekit_version}
# this is not a library version
%define gs_plugin_version 12
%define gs_plugin_version 13
%description
gnome-software is an application that makes it easy to add, remove
@ -226,6 +227,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_mandir}/man1/gnome-software-editor.1*
%changelog
* Wed Jan 16 2019 Kalev Lember <klember@redhat.com> - 3.31.2-1
- Update to 3.31.2
* Fri Dec 14 2018 Kalev Lember <klember@redhat.com> - 3.31.1-2
- Fix offline update notifications to show up (#1659231)

2
sources
View File

@ -1 +1 @@
SHA512 (gnome-software-3.31.1.tar.xz) = 91c617cfa8de00c6e336e369efeaf0180f4c26ddca9c213af4b76d65fd6653abf73ad5f86d36ec0cf94679a60e1642f8f19ac7f97b2cb1c652b58cf8a809cb6d
SHA512 (gnome-software-3.31.2.tar.xz) = ec8e4bbedf2517553abd5b5e73f12b71bf895b6169cb234c5a0d079d969d89a04ec64a828a0641394100dd5004e120d062d206f6602a70a9b28448077ce7e567