babl: Fix build with meson 0.62+
PATCH 1/1 babl: Fix build with meson 0.62+
backport needed patches to get it going with newer meson
Signed-off-by Khem Raj <[email protected]>
--- ...t-run-git-rev-parse-during-configure.patch | 35 +++++ ...0001-meson-fix-misspelled-kwarg-name.patch | 36 +++++ .../babl/babl/0002-meson-Various-fixes.patch | 132 ++++++++++++++++++ meta-gnome/recipes-gimp/babl/babl_0.1.92.bb | 6 +- 4 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch create mode 100644 meta-gnome/recipes-gimp/babl/babl/0001-meson-fix-misspelled-kwarg-name.patch create mode 100644 meta-gnome/recipes-gimp/babl/babl/0002-meson-Various-fixes.patch
meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 0e41b11b23c91293d1b39a8ec4cb80c68fb26ad7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 28 Apr 2022 07:35:31 -0700 +Subject: [PATCH] meson: Do not run git rev-parse during configure + +This option will try to deduce if babl is being built from git tree or +release tarball, there should be a better way like checking for .git +directory etc. instead of doing git operations needing network + +see +https://gitlab.gnome.org/GNOME/babl/-/commit/2dc7fc403fe427a889913ef0cfb71de85b4326ec#note_1439732 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 7e7a935..649b456 100644 +--- a/meson.build ++++ b/meson.build +@@ -451,7 +451,7 @@ if git_bin.found() and run_command( + git_bin, + 'rev-parse', + '--is-inside-work-tree', +- check: true, ++ check: false, + ).returncode() == 0 + git_version_h = vcs_tag( + input : 'git-version.h.in', +-- +2.36.0 +
meta-gnome/recipes-gimp/babl/babl/0001-meson-fix-misspelled-kwarg-name.patch new file +36 -0
@@ -0,0 +1,36 @@ +From ebcf4795f1132c5124d73a5ae2ca5c01319e584d Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <[email protected]> +Date: Sun, 13 Mar 2022 20:26:05 -0400 +Subject: [PATCH 1/2] 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" + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/babl/-/commit/b05b2826365a7dbc6ca1bf0977b848055cd0cbb6] +Signed-off-by: Khem Raj <[email protected]> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 487e470..2623e93 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)) +-- +2.36.0 +
meta-gnome/recipes-gimp/babl/babl/0002-meson-Various-fixes.patch new file +132 -0
132 lines not on this page · raw message
meta-gnome/recipes-gimp/babl/babl_0.1.92.bb +5 -1
@@ -14,7 +14,11 @@ DEPENDS += "lcms" CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore " CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore " -SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" +SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz \ + file://0001-meson-fix-misspelled-kwarg-name.patch \ + file://0002-meson-Various-fixes.patch \ + file://0001-meson-Do-not-run-git-rev-parse-during-configure.patch \ +" SRC_URI[sha256sum] = "f667735028944b6375ad18f160a64ceb93f5c7dccaa9d8751de359777488a2c1" BBCLASSEXTEND = "native"
Signature · 1 line
2.36.0