cairo: upgrade 1.16.0 -> 1.18.0
PATCH v3 1/1 cairo: upgrade 1.16.0 -> 1.18.0
From: qiutt <[email protected]>
Changelog for 1.18.0 [1]:
The cairo-sphinx tool has been removed
Cairo now implements Type 3 color fonts for PDF
The XML surface has been removed
The Tee surface is now automatically enabled
The Quartz surface is improved
Cairo now hides all private symbols by default on every platform Fixed multiple issues
As a part of 1.18.0, the following patches should be dropped.
CVE-2018-19876.patch : https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645
CVE-2019-6461.patch : https://gitlab.freedesktop.org/cairo/cairo/-/commit/09643ee1abdd5daacebfcb564448f29be9a79bac
CVE-2019-6462.patch : https://gitlab.freedesktop.org/cairo/cairo/-/commit/bbeaf08190d3006a80b80a77724801cd477a37b8
CVE-2020-35492.patch : https://gitlab.freedesktop.org/cairo/cairo/-/commit/c986a7310bb06582b7d8a566d5f007ba4e5e75bf
Add patch for 1.18.0.
0002-meson.build-fix-x11-build.patch [3] : Fix cross compile error
These options are all gone [2]: directfb, valgrind, egl, glesv2, opengl, trace
Build tool is changed : autotools -> meson
[1] https://www.cairographics.org/news/cairo-1.18.0/
[2] https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/meson_options.txt
[3] https://gitlab.freedesktop.org/cairo/cairo/-/issues/613
---
.../0002-meson.build-fix-x11-build.patch | 29 +++++++++
.../cairo/cairo/CVE-2018-19876.patch | 34 ----------
.../cairo/cairo/CVE-2019-6461.patch | 20 ------
.../cairo/cairo/CVE-2019-6462.patch | 40 ------------
.../cairo/cairo/CVE-2020-35492.patch | 60 -----------------
.../{cairo_1.16.0.bb => cairo_1.18.0.bb} | 64 +++++--------------
6 files changed, 46 insertions(+), 201 deletions(-)
create mode 100644 meta/recipes-graphics/cairo/cairo/0002-meson.build-fix-x11-build.patch
delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch
delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch
delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch
rename meta/recipes-graphics/cairo/{cairo_1.16.0.bb => cairo_1.18.0.bb} (51%)meta/recipes-graphics/cairo/cairo/0002-meson.build-fix-x11-build.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 840e3ad20f8536d9857876ca2f5161896b68ab9b Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt <[email protected]> +Date: Sun, 12 Nov 2023 10:44:13 +0100 +Subject: [PATCH] meson.build: fix x11 build + +../../br-test-pkg/arm-aarch64/build/cairo-1.18.0/meson.build:381:13: ERROR: Can not run test applications in this cross environment. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/cairo/cairo/-/issues/613] +Signed-off-by: Thomas Devoogdt <[email protected]> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9efe91978..9864b8699 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() + + # Can skip the run check by providing the result in a cross file or + # native file as bool property value. +- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ prop = meson.get_external_property('ipc_rmid_deferred_release', 'false') + # We don't know the type of prop (bool, string) but need to differentiate + # between a set value (bool) or the fallback value (string), so convert to + # a string and check the string value. +-- +2.34.1 +
meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch deleted +0 -34
@@ -1,34 +0,0 @@ -CVE: CVE-2018-19876 -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <[email protected]> -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.11.0 -
meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch deleted +0 -20
@@ -1,20 +0,0 @@ -There is an assertion in function _cairo_arc_in_direction(). - -CVE: CVE-2019-6461 -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1bde774a4 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -186,7 +186,8 @@ _cairo_arc_in_direction (cairo_t *cr, - if (cairo_status (cr)) - return; - -- assert (angle_max >= angle_min); -+ if (angle_max < angle_min) -+ return; - - if (angle_max - angle_min > 2 * M_PI * MAX_FULL_CIRCLES) { - angle_max = fmod (angle_max - angle_min, 2 * M_PI);
meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch deleted +0 -40
@@ -1,40 +0,0 @@ -CVE: CVE-2019-6462 -Upstream-Status: Backport -Signed-off-by: Quentin Schulz <[email protected]> - -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin <[email protected]> -Date: Sun, 1 Aug 2021 11:16:03 +0000 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 -
meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch deleted +0 -60
60 lines not on this page · raw message
meta/recipes-graphics/cairo/cairo_1.18.0.bb renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +17 -47
93 lines not on this page · raw message
Signature · 1 line
2.25.1
Patchtest results for [PATCH V3] cairo: upgrade 1.16.0 -> 1.18.0
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:
---
Testing patch /home/patchtest/share/mboxes/V3-cairo-upgrade-1.16.0---1.18.0.patch
FAIL: test CVE tag format: Missing or incorrectly formatted CVE tag in patch file. Correct or include the CVE tag in the patch with format: "CVE: CVE-YYYY-XXXX" (test_patch.TestPatch.test_cve_tag_format)
PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list)
---
Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
Quoted 2 lines · On 6 Dec 2023, at 01:04, [email protected] via lists.openembedded.org…
+- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto')
++ prop = meson.get_external_property('ipc_rmid_deferred_release', 'false’)Big NAK from me here.
This meson code _explicitly and intentionally_ doesn’t set a default. If it can’t auto-detect then it’s on the builder to provide the right answer via a cross file. I really dislike autoconf’s idiom of providing a default value and not making it clear unless you read the logs very carefully that a default was used which may be entirely incorrect: this behaviour is much better.
Running the test on my machine I discover that should be set to true, and this appears to be a Linux feature[1] instead of being specific to an architecture or libc.
So I recommend providing a cross file to Meson in target builds that sets this value to true. systemd-boot, glib-2.0, and libsoup are all examples of recipes that already do this.
Ross
[1] https://gitlab.freedesktop.org/cairo/cairo/-/commit/5041b462d084de8552336275914d30c23bf5dd35
Hi Ross
Quoted 4 lines · Ross Burton
Running the test on my machine I discover that should be set to true, and this appears to be a Linux feature[1] instead of being specific to an architecture or libc.
Thanks for your suggestion.
Which test did you do?
I had modified the patch and want to check it.
Best Regards,
Qiu Tingting