[gitg/wip/valadoc: 11/12] meson: Fix GTK shortcuts window vala flag
- From: Alberto Fanjul <albfan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/wip/valadoc: 11/12] meson: Fix GTK shortcuts window vala flag
- Date: Fri, 12 Oct 2018 10:13:16 +0000 (UTC)
commit 332099260c9349d73cf6c821dabe44f32271a34d
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Fri Oct 5 09:49:35 2018 +0200
meson: Fix GTK shortcuts window vala flag
When GTK version 3.19 or higher is used, a custom define is used for
GTK shortcuts window support. This is not working due to a bad
version comparison and the vala flag is not appended.
This has been fixed and is working properly now.
gitg/meson.build | 4 ++--
meson.build | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gitg/meson.build b/gitg/meson.build
index 782c8f3b..89582978 100644
--- a/gitg/meson.build
+++ b/gitg/meson.build
@@ -116,10 +116,10 @@ sources += gnome.compile_resources(
export: true,
)
-vala_flags = '--gresourcesdir=' + join_paths(meson.current_source_dir(), 'resources')
+vala_flags = ['--gresourcesdir=' + join_paths(meson.current_source_dir(), 'resources')]
if gtk_shortcuts_window
- vala_args += '--define GTK_SHORTCUTS_WINDOW'
+ vala_flags += '--define=GTK_SHORTCUTS_WINDOW'
endif
executable(
diff --git a/meson.build b/meson.build
index ad21f6f0..238306bc 100644
--- a/meson.build
+++ b/meson.build
@@ -154,7 +154,7 @@ assert(
)
# gtk required version is set to 3.20, so this will be always true
-gtk_shortcuts_window = gtk_dep.version().version_compare('3.19')
+gtk_shortcuts_window = gtk_dep.version().version_compare('>= 3.19')
m_dep = cc.find_library('m', required: false)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]