diff --git a/meta/recipes-graphics/cairo/cairo/0001-Require-C11.patch b/meta/recipes-graphics/cairo/cairo/0001-Require-C11.patch new file mode 100644 index 0000000000..0f70b66500 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/0001-Require-C11.patch @@ -0,0 +1,26 @@ +From de2452228814e804b103dfa7c2d37b3a216c6155 Mon Sep 17 00:00:00 2001 +From: Adrian Johnson +Date: Sun, 28 Apr 2024 21:31:41 +0930 +Subject: [PATCH] Require C11 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/cairo/cairo/-/commit/b60f47dfd5bbe98aec43f6c356ba3be9a1b7989e] +Signed-off-by: Martin Jansa +--- + meson.build | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 9100152..f8432fd 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,7 +1,8 @@ + project('cairo', 'c', 'cpp', +- meson_version: '>= 0.59.0', ++ meson_version: '>= 1.3.0', + version: run_command(find_program('version.py'), check: true).stdout().strip(), +- default_options: ['warning_level=2'], ++ default_options: ['c_std=gnu11,c11', ++ 'warning_level=2'], + ) + + freetype_required_version = '>= 9.7.3' diff --git a/meta/recipes-graphics/cairo/cairo/0002-Meson-Require-C-11.patch b/meta/recipes-graphics/cairo/cairo/0002-Meson-Require-C-11.patch new file mode 100644 index 0000000000..85f300e960 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/0002-Meson-Require-C-11.patch @@ -0,0 +1,23 @@ +From d9cc95b94b2bb1e67f2095cda484d4a8a63aba10 Mon Sep 17 00:00:00 2001 +From: Luca Bacci +Date: Thu, 16 Jan 2025 16:48:12 +0100 +Subject: [PATCH] Meson: Require C++11 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/cairo/cairo/-/commit/dfd06ab3884d79de3b5bac782d1e8b2a0bd791ab] +Signed-off-by: Martin Jansa +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index f8432fd..85434d2 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,6 +2,7 @@ project('cairo', 'c', 'cpp', + meson_version: '>= 1.3.0', + version: run_command(find_program('version.py'), check: true).stdout().strip(), + default_options: ['c_std=gnu11,c11', ++ 'cpp_std=gnu++11,c++11', + 'warning_level=2'], + ) + diff --git a/meta/recipes-graphics/cairo/cairo_1.18.0.bb b/meta/recipes-graphics/cairo/cairo_1.18.0.bb index 4c97e973d0..f1a87ccb3f 100644 --- a/meta/recipes-graphics/cairo/cairo_1.18.0.bb +++ b/meta/recipes-graphics/cairo/cairo_1.18.0.bb @@ -30,6 +30,8 @@ DEPENDS = "fontconfig freetype glib-2.0 libpng pixman zlib" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ + file://0001-Require-C11.patch \ + file://0002-Meson-Require-C-11.patch \ " SRC_URI[sha256sum] = "243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64"