From d6fef722a00575cc0c355bc69c7334392c7c1278 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Mon, 2 Mar 2020 11:35:14 -0800 Subject: [PATCH] build: add meson subproject with libdazzle.wrap When building on older systems such as RHEL 7, it can be convenient to have access to libdazzle directly. This also has to work around a problem that RHEL 7 does not support the version of git that Meson requires for [wrap-git] by using a specific release. --- meson.build | 4 ++-- subprojects/libdazzle.wrap | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 subprojects/libdazzle.wrap diff --git a/meson.build b/meson.build index fde9b24a..a97e2cde 100644 --- a/meson.build +++ b/meson.build @@ -57,7 +57,7 @@ gio_unix_dep = dependency('gio-unix-2.0', version: glib_req_version) if get_option('enable_gtk') gtk_dep = dependency('gtk+-3.0', version: gtk_req_version) - dazzle_dep = dependency('libdazzle-1.0', version: dazzle_req_version) + dazzle_dep = dependency('libdazzle-1.0', version: dazzle_req_version, fallback: ['libdazzle', 'libdazzle_dep']) endif polkit_dep = dependency('polkit-gobject-1', version: '>= 0.114', required: false) @@ -108,7 +108,7 @@ if has_use_clockid and has_clockid config_h.set10('HAVE_PERF_CLOCKID', true) endif -add_global_arguments([ +add_project_arguments([ '-I' + meson.build_root(), # config.h ], language: 'c') diff --git a/subprojects/libdazzle.wrap b/subprojects/libdazzle.wrap new file mode 100644 index 00000000..9b578122 --- /dev/null +++ b/subprojects/libdazzle.wrap @@ -0,0 +1,5 @@ +[wrap-file] +directory=libdazzle-3.35.3 +source_url=https://download.gnome.org/sources/libdazzle/3.35/libdazzle-3.35.3.tar.xz +source_filename=libdazzle-3.35.3.tar.xz +source_hash=df67f7a68096e4b33a70ee0bad14cd8a6778425deb087879b5cd8fef8f671304