diff options
| author | Patrick Griffis <tingping@tingping.se> | 2016-11-20 13:47:39 -0500 |
|---|---|---|
| committer | Igor Gnatenko <ignatenko@redhat.com> | 2016-11-20 23:01:26 +0100 |
| commit | 587a0bb3d14addcacd62282a46957b86d582f1be (patch) | |
| tree | 6a3b47bbdbe10aeaf1460c9ec25e9cbbc6ff9524 | |
| parent | c9a46fcc93461ece4ac6d83b1875cd0f5fe0c684 (diff) | |
| download | meson-587a0bb3d14addcacd62282a46957b86d582f1be.tar.gz | |
gnome: Update required version for glib-compile-resources depfile fixes
Note that this version is not yet released
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/resources/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 114114d40..7c4fb1d94 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -31,7 +31,7 @@ from .. import interpreter # # https://github.com/ninja-build/ninja/issues/1184 # https://bugzilla.gnome.org/show_bug.cgi?id=774368 -gresource_dep_needed_version = '>9.99.99' +gresource_dep_needed_version = '>= 2.52.0' native_glib_version = None girwarning_printed = False diff --git a/test cases/frameworks/7 gnome/resources/meson.build b/test cases/frameworks/7 gnome/resources/meson.build index f8c3d5876..f17e46970 100644 --- a/test cases/frameworks/7 gnome/resources/meson.build +++ b/test cases/frameworks/7 gnome/resources/meson.build @@ -11,7 +11,7 @@ simple_res_exe = executable('simple-resources-test', dependencies: gio) test('simple resource test', simple_res_exe) -if glib.version() >= '9.99.9' +if glib.version() >= '2.52.0' # This test cannot pass if GLib version is older than 9.99.9. # Meson will raise an error if the user tries to use the 'dependencies' # argument and the version of GLib is too old for generated resource |