From df9b0c93912df1208285f626cca3317b9ddbb378 Mon Sep 17 00:00:00 2001 From: Diego Escalante Urrelo Date: Sun, 27 Oct 2019 03:42:56 -0500 Subject: [PATCH 1/2] build: Require meson-0.52.0 Because of changes in meson-0.52.0 we had to change how we use link_with and link_whole in c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f. To prevent unforseen behaviors when using older versions of meson, explicitly require 0.52.0. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ea01d07a5..f80d29f26 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('gnome-builder', 'c', license: 'GPL3+', version: '3.35.0', - meson_version: '>= 0.50.0', + meson_version: '>= 0.52.0', default_options: [ 'c_std=gnu11', 'cpp_std=gnu++2a', 'warning_level=2', -- GitLab From da26dfbf78468f5ed724e022b300a07862a95833 Mon Sep 17 00:00:00 2001 From: Diego Escalante Urrelo Date: Sun, 27 Oct 2019 03:45:20 -0500 Subject: [PATCH 2/2] build: Update gtk-doc generation to meson changes After updating our use of link_with/link_whole for meson-0.52.0 we accidentally broke gtk-doc generation. Before c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f gnome_builder_deps included link_whole calls to all our libide static libraries. Because we changed those calls to link_with, libide_gtk_doc was no longer linking properly. To solve the above we now use gnome_builder_static, which is a list of all our internal libide static libraries and can be used as an argument to link_whole, just like we do in the gnome_builder target. Fixes: https://gitlab.gnome.org/GNOME/gnome-builder/issues/1063 --- doc/sdk/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sdk/meson.build b/doc/sdk/meson.build index 4bb2421b3..f6ff1a3b7 100644 --- a/doc/sdk/meson.build +++ b/doc/sdk/meson.build @@ -30,7 +30,7 @@ docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html') libide_gtk_doc = shared_library('ide-gtk-doc', c_args: libide_args + release_args, - dependencies: gnome_builder_deps, + link_whole: gnome_builder_static, ) libide_gtk_doc_dep = declare_dependency( -- GitLab