65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
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
|
|
|