From e2c1211d4627b3f42f19d280466aa08183f671d7 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Wed, 18 Jan 2023 15:52:17 +0800 Subject: [PATCH] Fix build error --- Fix-misspelled-kwarg-name.patch | 30 ++++++++++++++++++++++++++++++ babl.spec | 6 +++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 Fix-misspelled-kwarg-name.patch diff --git a/Fix-misspelled-kwarg-name.patch b/Fix-misspelled-kwarg-name.patch new file mode 100644 index 0000000..a69dedb --- /dev/null +++ b/Fix-misspelled-kwarg-name.patch @@ -0,0 +1,30 @@ +From b05b2826365a7dbc6ca1bf0977b848055cd0cbb6 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Sun, 13 Mar 2022 20:26:05 -0400 +Subject: [PATCH] meson: fix misspelled kwarg name + +set10 doesn't have a `Description` kwarg, it does have a `description` +kwarg though. + +This caused the conf variable to not have a description when it should +have one, and newer versions of Meson with better argument validation +error out with: + +meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description" +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 55054f441..8c93be9d1 100644 +--- a/meson.build ++++ b/meson.build +@@ -55,7 +55,7 @@ lib_name = meson.project_name() + '-' + api_version + stability_version_number = (major_version != 0 ? minor_version : micro_version) + stable = (stability_version_number % 2 == 0) + +-conf.set10('BABL_UNSTABLE', not stable, Description: ++conf.set10('BABL_UNSTABLE', not stable, description: + 'Define to 1 if this is an unstable version of BABL.') + + conf.set ('BABL_MAJOR_VERSION', '@0@'.format(major_version)) diff --git a/babl.spec b/babl.spec index e713127..3b82076 100644 --- a/babl.spec +++ b/babl.spec @@ -1,6 +1,6 @@ Name: babl Version: 0.1.88 -Release: 1 +Release: 2 Summary: Dynamic Pixel Format Translation Library License: LGPL-3.0-or-later AND GPL-3.0-or-later Group: Development/Libraries/C and C++ @@ -8,6 +8,7 @@ URL: http://gegl.org/babl/ Source0: https://download.gimp.org/pub/babl/0.1/%{name}-%{version}.tar.xz Source99: baselibs.conf +Patch0: Fix-misspelled-kwarg-name.patch BuildRequires: meson BuildRequires: pkgconfig BuildRequires: vala @@ -97,6 +98,9 @@ mv %{buildroot}%{_datadir}/vala %{buildroot}%{_datadir}/vala-%{vala_version} %{_datadir}/vala-%{vala_version}/vapi/babl-0.1.vapi %changelog +* Wed Jan 18 2023 yaoxin - 0.1.88-2 +- Fix build error + * Tue Aug 24 2021 chenchen - 0.1.88-1 - update to 0.1.88