[gnome-software] trivial: Bump appstream-glib dep to 0.6.7
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] trivial: Bump appstream-glib dep to 0.6.7
- Date: Wed, 18 Jan 2017 10:32:02 +0000 (UTC)
commit a66c572eb999ded463b38f33edbdd5e12c7e03b4
Author: Kalev Lember <klember redhat com>
Date: Wed Jan 18 11:24:08 2017 +0100
trivial: Bump appstream-glib dep to 0.6.7
We had an ifdef to support building with older appstream-glib releases
to avoid depending on a git version, but it was slightly wrong and broke
with appstream-glib 0.6.6. This commit removes the ifdef and just bumps
the dep to 0.6.7 as we now have an appstream-glib 0.6.7 release.
https://bugzilla.gnome.org/show_bug.cgi?id=777360
https://bugzilla.gnome.org/show_bug.cgi?id=777372
configure.ac | 2 +-
src/gs-app.h | 5 -----
src/gs-shell.c | 2 --
src/plugins/gs-appstream.c | 4 ----
4 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 26ebe84..57a12c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ dnl ---------------------------------------------------------------------------
dnl - Check library dependencies
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.20.0 gio-unix-2.0)
-PKG_CHECK_MODULES(APPSTREAM, appstream-glib >= 0.6.5)
+PKG_CHECK_MODULES(APPSTREAM, appstream-glib >= 0.6.7)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 2.31.5)
PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0 >= 1.1.1)
PKG_CHECK_MODULES(SQLITE, sqlite3)
diff --git a/src/gs-app.h b/src/gs-app.h
index e002a0f..f7a27f5 100644
--- a/src/gs-app.h
+++ b/src/gs-app.h
@@ -97,11 +97,6 @@ typedef enum {
GS_APP_QUALITY_LAST
} GsAppQuality;
-#if !AS_CHECK_VERSION(0,6,6)
-#define AS_APP_QUIRK_IS_PROXY (1 << 9)
-#define AS_APP_QUIRK_REMOVABLE_HARDWARE (1 << 10)
-#endif
-
GsApp *gs_app_new (const gchar *id);
GsApp *gs_app_new_from_unique_id (const gchar *unique_id);
gchar *gs_app_to_string (GsApp *app);
diff --git a/src/gs-shell.c b/src/gs-shell.c
index 9cd17e3..734bf2a 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -160,9 +160,7 @@ gs_shell_profile_dump (GsShell *shell)
GsShellPrivate *priv = gs_shell_get_instance_private (shell);
if (priv->profile_mode) {
AsProfile *profile = gs_plugin_loader_get_profile (priv->plugin_loader);
-#if AS_CHECK_VERSION(0,6,4)
as_profile_prune (profile, 5000);
-#endif
as_profile_dump (profile);
}
}
diff --git a/src/plugins/gs-appstream.c b/src/plugins/gs-appstream.c
index a5dc47f..dcbaccb 100644
--- a/src/plugins/gs-appstream.c
+++ b/src/plugins/gs-appstream.c
@@ -517,10 +517,8 @@ gs_appstream_refine_app (GsPlugin *plugin,
AsApp *item,
GError **error)
{
-#if AS_CHECK_VERSION(0,6,7)
AsRequire *req;
g_autoptr(GError) error_local = NULL;
-#endif
GHashTable *urls;
GPtrArray *array;
GPtrArray *pkgnames;
@@ -548,7 +546,6 @@ gs_appstream_refine_app (GsPlugin *plugin,
gs_app_set_state (app, as_app_get_state (item));
}
-#if AS_CHECK_VERSION(0,6,7)
/* is compatible */
req = as_app_get_require_by_value (item,
AS_REQUIRE_KIND_ID,
@@ -563,7 +560,6 @@ gs_appstream_refine_app (GsPlugin *plugin,
return FALSE;
}
}
-#endif
/* types we can never launch */
switch (gs_app_get_kind (app)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]