Improve compatibility with older dependencies
This commit is contained in:
parent
1fb42e689f
commit
1577961aa2
@ -166,6 +166,10 @@ model_entry_array_new(void)
|
||||
(GDestroyNotify) fiv_io_model_entry_unref);
|
||||
}
|
||||
|
||||
#if !GLIB_CHECK_VERSION(2, 70, 0)
|
||||
#define g_pattern_spec_match g_pattern_match
|
||||
#endif
|
||||
|
||||
static gboolean
|
||||
model_supports(FivIoModel *self, const char *filename)
|
||||
{
|
||||
|
2
fiv.c
2
fiv.c
@ -1352,7 +1352,7 @@ show_preferences(void)
|
||||
if (!g_spawn_async(
|
||||
NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error)) {
|
||||
if (g_error_matches(error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT))
|
||||
g_prefix_error_literal(&error,
|
||||
g_prefix_error(&error, "%s",
|
||||
"Please install dconf-editor, or use the gsettings utility.\n");
|
||||
show_error_dialog(error);
|
||||
}
|
||||
|
@ -154,7 +154,8 @@ gresources = gnome.compile_resources('resources',
|
||||
tiff_tables = custom_target('tiff-tables.h',
|
||||
output : 'tiff-tables.h',
|
||||
input : 'tiff-tables.db',
|
||||
command : ['tiff-tables.awk', '@INPUT@'],
|
||||
# Meson 0.56 chokes on files() as well as on a relative path.
|
||||
command : [meson.current_source_dir() / 'tiff-tables.awk', '@INPUT@'],
|
||||
capture : true,
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user