mirror of
https://git.proxmox.com/git/fwupd
synced 2025-08-15 04:15:26 +00:00
trivial: back the requirement on appstream-glib to 0.6.9
The items that 0.6.13 requires are now guarded by a version test. This should allow running fwupd master on more distros that haven't yet picked up appstream-glib 0.6.13.
This commit is contained in:
parent
e68b118044
commit
dc8c985159
@ -125,7 +125,7 @@ if polkit.version() >= '0.114'
|
|||||||
conf.set('HAVE_POLKIT_0_114', '1')
|
conf.set('HAVE_POLKIT_0_114', '1')
|
||||||
endif
|
endif
|
||||||
gudev = dependency('gudev-1.0')
|
gudev = dependency('gudev-1.0')
|
||||||
appstream_glib = dependency('appstream-glib', version : '>= 0.6.13')
|
appstream_glib = dependency('appstream-glib', version : '>= 0.6.9')
|
||||||
gusb = dependency('gusb', version : '>= 0.2.9')
|
gusb = dependency('gusb', version : '>= 0.2.9')
|
||||||
sqlite = dependency('sqlite3')
|
sqlite = dependency('sqlite3')
|
||||||
libarchive = dependency('libarchive')
|
libarchive = dependency('libarchive')
|
||||||
|
@ -2195,6 +2195,7 @@ fu_engine_plugin_set_coldplug_delay_cb (FuPlugin *plugin, guint duration, FuEngi
|
|||||||
duration, self->coldplug_delay);
|
duration, self->coldplug_delay);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if AS_CHECK_VERSION(0,6,13)
|
||||||
static gboolean
|
static gboolean
|
||||||
fu_engine_load_hwids (FuEngine *self, GError **error)
|
fu_engine_load_hwids (FuEngine *self, GError **error)
|
||||||
{
|
{
|
||||||
@ -2229,6 +2230,7 @@ fu_engine_load_hwids (FuEngine *self, GError **error)
|
|||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
fu_engine_load_plugins (FuEngine *self, GError **error)
|
fu_engine_load_plugins (FuEngine *self, GError **error)
|
||||||
@ -2388,11 +2390,13 @@ fu_engine_load (FuEngine *self, GError **error)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if AS_CHECK_VERSION(0,6,13)
|
||||||
/* load the hwids */
|
/* load the hwids */
|
||||||
if (!fu_engine_load_hwids (self, error)) {
|
if (!fu_engine_load_hwids (self, error)) {
|
||||||
g_prefix_error (error, "Failed to load hwids: ");
|
g_prefix_error (error, "Failed to load hwids: ");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* delete old data files */
|
/* delete old data files */
|
||||||
if (!fu_engine_cleanup_state (error)) {
|
if (!fu_engine_cleanup_state (error)) {
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <appstream-glib.h>
|
||||||
#include <fwupd.h>
|
#include <fwupd.h>
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include <glib/gstdio.h>
|
#include <glib/gstdio.h>
|
||||||
@ -33,6 +34,7 @@
|
|||||||
#include "fu-hwids.h"
|
#include "fu-hwids.h"
|
||||||
#include "fu-test.h"
|
#include "fu-test.h"
|
||||||
|
|
||||||
|
#if AS_CHECK_VERSION(0,6,13)
|
||||||
static void
|
static void
|
||||||
fu_hwids_func (void)
|
fu_hwids_func (void)
|
||||||
{
|
{
|
||||||
@ -93,6 +95,7 @@ fu_hwids_func (void)
|
|||||||
g_assert_cmpstr (guid, ==, guids[i].value);
|
g_assert_cmpstr (guid, ==, guids[i].value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_plugin_status_changed_cb (FuPlugin *plugin, FwupdStatus status, gpointer user_data)
|
_plugin_status_changed_cb (FuPlugin *plugin, FwupdStatus status, gpointer user_data)
|
||||||
@ -422,7 +425,9 @@ main (int argc, char **argv)
|
|||||||
g_assert_cmpint (g_mkdir_with_parents ("/tmp/fwupd-self-test/var/lib/fwupd", 0755), ==, 0);
|
g_assert_cmpint (g_mkdir_with_parents ("/tmp/fwupd-self-test/var/lib/fwupd", 0755), ==, 0);
|
||||||
|
|
||||||
/* tests go here */
|
/* tests go here */
|
||||||
|
#if AS_CHECK_VERSION(0,6,13)
|
||||||
g_test_add_func ("/fwupd/hwids", fu_hwids_func);
|
g_test_add_func ("/fwupd/hwids", fu_hwids_func);
|
||||||
|
#endif
|
||||||
g_test_add_func ("/fwupd/pending", fu_pending_func);
|
g_test_add_func ("/fwupd/pending", fu_pending_func);
|
||||||
g_test_add_func ("/fwupd/plugin{delay}", fu_plugin_delay_func);
|
g_test_add_func ("/fwupd/plugin{delay}", fu_plugin_delay_func);
|
||||||
g_test_add_func ("/fwupd/plugin{module}", fu_plugin_module_func);
|
g_test_add_func ("/fwupd/plugin{module}", fu_plugin_module_func);
|
||||||
|
@ -1635,12 +1635,14 @@ main (int argc, char *argv[])
|
|||||||
/* TRANSLATORS: command description */
|
/* TRANSLATORS: command description */
|
||||||
_("Get all devices that support firmware updates"),
|
_("Get all devices that support firmware updates"),
|
||||||
fu_util_get_devices);
|
fu_util_get_devices);
|
||||||
|
#if AS_CHECK_VERSION(0,6,13)
|
||||||
fu_util_add (priv->cmd_array,
|
fu_util_add (priv->cmd_array,
|
||||||
"hwids",
|
"hwids",
|
||||||
NULL,
|
NULL,
|
||||||
/* TRANSLATORS: command description */
|
/* TRANSLATORS: command description */
|
||||||
_("Return all the hardware IDs for the machine"),
|
_("Return all the hardware IDs for the machine"),
|
||||||
fu_util_hwids);
|
fu_util_hwids);
|
||||||
|
#endif
|
||||||
fu_util_add (priv->cmd_array,
|
fu_util_add (priv->cmd_array,
|
||||||
"install-prepared",
|
"install-prepared",
|
||||||
NULL,
|
NULL,
|
||||||
|
Loading…
Reference in New Issue
Block a user