From 4ac9686950eddfa2c6986273f2425f3220bbc644 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Thu, 24 Mar 2022 15:14:54 -0400 Subject: [PATCH] Add patch to fix build with latest meson --- .../patches/build-fix-description-case.patch | 22 +++++++++++++++++++ debian/patches/series | 1 + debian/patches/tests-increase-timeout.patch | 4 ++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 debian/patches/build-fix-description-case.patch diff --git a/debian/patches/build-fix-description-case.patch b/debian/patches/build-fix-description-case.patch new file mode 100644 index 0000000..eba9023 --- /dev/null +++ b/debian/patches/build-fix-description-case.patch @@ -0,0 +1,22 @@ +From: Jeremy Bicha +Date: Thu, 24 Mar 2022 15:14:33 -0400 +Subject: build: fix description case + +https://gitlab.gnome.org/GNOME/babl/-/merge_requests/46 +--- + 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)) diff --git a/debian/patches/series b/debian/patches/series index b805e74..665260f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ tests-increase-timeout.patch +build-fix-description-case.patch diff --git a/debian/patches/tests-increase-timeout.patch b/debian/patches/tests-increase-timeout.patch index fa29ce1..5ba85d7 100644 --- a/debian/patches/tests-increase-timeout.patch +++ b/debian/patches/tests-increase-timeout.patch @@ -12,10 +12,10 @@ https://buildd.debian.org/status/logs.php?pkg=babl&arch=armel 1 file changed, 1 insertion(+) diff --git a/tests/meson.build b/tests/meson.build -index dfe7d45..c03e1a4 100644 +index eee8895..e131c14 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -50,5 +50,6 @@ foreach test_name : test_names +@@ -51,5 +51,6 @@ foreach test_name : test_names test, env: test_env, workdir: meson.current_build_dir(), -- 2.30.2