From a261c2b007e0a298e6120e099c369818ce5ce540 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 10 Jan 2025 15:15:48 +0000
Subject: [PATCH] meson: Add pkg-config field next to deprecated pkgconfig

Meson 1.3.0 deprecates pkgconfig, but does not issue a warning if both
fields are set to the same value, allowing compatibility with both older
and newer Meson.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 build-aux/meson/i386.txt       | 1 +
 build-aux/meson/scout-i386.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/build-aux/meson/i386.txt b/build-aux/meson/i386.txt
index 18ed7fa9a..883c874a8 100644
--- a/build-aux/meson/i386.txt
+++ b/build-aux/meson/i386.txt
@@ -6,6 +6,7 @@ cpp = 'g++'
 ar = 'ar'
 strip = 'strip'
 pkgconfig = 'i686-linux-gnu-pkg-config'
+pkg-config = 'i686-linux-gnu-pkg-config'
 exe_wrapper = 'env'
 
 [built-in options]
diff --git a/build-aux/meson/scout-i386.txt b/build-aux/meson/scout-i386.txt
index 78733617f..df949589c 100644
--- a/build-aux/meson/scout-i386.txt
+++ b/build-aux/meson/scout-i386.txt
@@ -6,6 +6,7 @@ cpp = '/usr/bin/g++-4.8'
 ar = '/usr/bin/ar'
 strip = '/usr/bin/strip'
 pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'
+pkg-config = '/usr/bin/i686-linux-gnu-pkg-config'
 exe_wrapper = '/usr/bin/env'
 
 [built-in options]
-- 
GitLab