From b7aad3adb6731642045aaad89bcfd11c1cb325be Mon Sep 17 00:00:00 2001 From: peelz Date: Fri, 17 May 2024 13:09:20 -0400 Subject: [PATCH 1/3] Bump meson version requirement to >= 1.4.0 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b150c982..4d8ea2b7 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,7 @@ project( 'c_std=c99', 'cpp_std=c++17', ], - meson_version: '>= 0.63.0', + meson_version: '>= 1.4.0', ) pk_version = meson.project_version() From 96f7ac7c85ea41546bc472f9f3769701db13f509 Mon Sep 17 00:00:00 2001 From: peelz Date: Wed, 26 Jun 2024 12:53:05 -0400 Subject: [PATCH 2/3] Don't hardcode path to config.h --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 4d8ea2b7..629412c2 100644 --- a/meson.build +++ b/meson.build @@ -375,12 +375,12 @@ if gettext config_data.set('ENABLE_GETTEXT', 1) endif -configure_file( +config_h = configure_file( output: 'config.h', configuration: config_data, ) -compiler_common_flags += ['-include', 'config.h'] +compiler_common_flags += ['-include', config_h.full_path()] add_project_arguments(compiler_common_flags + compiler_c_flags, language: 'c') add_project_arguments(compiler_common_flags + compiler_cpp_flags, language: 'cpp') From 97f80e491198fbc92e04bfda2c9876e6c102595c Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 11 Feb 2025 15:21:49 +0100 Subject: [PATCH 3/3] ci: install newer meson for the CodeQL job Ubuntu 22.04 (Noble) ships meson 1.3.4 (ATTOW) but we need at least meson 1.4.0, so install a newer version via pip. --- .github/workflows/codeql.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 88ffa10c..445ab976 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -35,7 +35,12 @@ jobs: sudo apt update sudo apt build-dep -y policykit-1 # polkit in Ubuntu Jammy (ATTOW) doesn't have the latest build dependencies yet - sudo apt install -y duktape-dev meson + sudo apt install -y duktape-dev python3-pip + + # Ubuntu 22.04 ships only meson 1.3.4 (ATTOW), so install a newer one via pip + dpkg-query -W meson && sudo apt remove -y meson + sudo pip3 install 'meson>=1.4.0' + sudo meson --version - name: Initialize CodeQL uses: github/codeql-action/init@v3