Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 1 | From ebcf4795f1132c5124d73a5ae2ca5c01319e584d Mon Sep 17 00:00:00 2001 |
| 2 | From: Eli Schwartz <eschwartz@archlinux.org> |
| 3 | Date: Sun, 13 Mar 2022 20:26:05 -0400 |
| 4 | Subject: [PATCH 1/2] meson: fix misspelled kwarg name |
| 5 | |
| 6 | set10 doesn't have a `Description` kwarg, it does have a `description` |
| 7 | kwarg though. |
| 8 | |
| 9 | This caused the conf variable to not have a description when it should |
| 10 | have one, and newer versions of Meson with better argument validation |
| 11 | error out with: |
| 12 | |
| 13 | meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description" |
| 14 | |
| 15 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/babl/-/commit/b05b2826365a7dbc6ca1bf0977b848055cd0cbb6] |
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 17 | --- |
| 18 | meson.build | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/meson.build b/meson.build |
| 22 | index 487e470..2623e93 100644 |
| 23 | --- a/meson.build |
| 24 | +++ b/meson.build |
| 25 | @@ -55,7 +55,7 @@ lib_name = meson.project_name() + '-' + api_version |
| 26 | stability_version_number = (major_version != 0 ? minor_version : micro_version) |
| 27 | stable = (stability_version_number % 2 == 0) |
| 28 | |
| 29 | -conf.set10('BABL_UNSTABLE', not stable, Description: |
| 30 | +conf.set10('BABL_UNSTABLE', not stable, description: |
| 31 | 'Define to 1 if this is an unstable version of BABL.') |
| 32 | |
| 33 | conf.set ('BABL_MAJOR_VERSION', '@0@'.format(major_version)) |
| 34 | -- |
| 35 | 2.36.0 |
| 36 | |