cairo: Using the snapshot version instead of the stable release
Thoughts on if its acceptable for Yocto to use a snapshot release for cairo?
current version 1.16 was released on 2018-10-19
Archlinux uses 1.17.4
Linux From Scratch recommends 1.17.2
yifan
PATCH 1/1 cairo: Update 1.16 -> 1.17.4
Drop a backported CVE patch:
* CVE-2018-19876
---
.../cairo/cairo/CVE-2018-19876.patch | 34 -------------------
.../{cairo_1.16.0.bb => cairo_1.17.4.bb} | 7 ++--
2 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
rename meta/recipes-graphics/cairo/{cairo_1.16.0.bb => cairo_1.17.4.bb} (94%)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_1.17.4.bb renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +3 -4
@@ -22,15 +22,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" DEPENDS = "fontconfig glib-2.0 libpng pixman zlib" -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ +SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.xz \ file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ - file://CVE-2018-19876.patch \ file://CVE-2019-6461.patch \ file://CVE-2019-6462.patch \ " -SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552" -SRC_URI[sha256sum] = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" +SRC_URI[md5sum] = "bf9d0d324ecbd350d0e9308125fa4ce0" +SRC_URI[sha256sum] = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705" inherit autotools pkgconfig upstream-version-is-even gtk-doc multilib_script
Signature · 1 line
2.29.2
Re: [oe-core][PATCH] cairo: Update 1.16 -> 1.17.4
As Alex said in another thread, we should wait for the 1.18 release. Thanks for looking into this Yi.
Randy
Quoted 91 lines · On Tue., Mar. 2, 2021, 01:29 Yi Fan Yu, <[email protected]> wrote:
Drop a backported CVE patch:
* CVE-2018-19876Signed-off-by Yi Fan Yu <[email protected]>--- .../cairo/cairo/CVE-2018-19876.patch | 34 ------------------- .../{cairo_1.16.0.bb => cairo_1.17.4.bb} | 7 ++-- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch rename meta/recipes-graphics/cairo/{cairo_1.16.0.bb => cairo_1.17.4.bb}(94%)
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_1.17.4.bb renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0@@ -22,15 +22,14 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
DEPENDS = "fontconfig glib-2.0 libpng pixman zlib"
meta/recipes-graphics/cairo/cairo_1.17.4.bb renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +1
-4-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ +SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.xz \ file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ - file://CVE-2018-19876.patch \ file://CVE-2019-6461.patch \ file://CVE-2019-6462.patch \ " -SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552" -SRC_URI[sha256sum] ="
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"meta/recipes-graphics/cairo/cairo_1.17.4.bb renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +2
-0+SRC_URI[md5sum] = "bf9d0d324ecbd350d0e9308125fa4ce0" +SRC_URI[sha256sum] ="
74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705"inherit autotools pkgconfig upstream-version-is-even gtk-doc
multilib_script--
2.29.2
Quoted 9 lines · Yi Fan Yu
Thoughts on if its acceptable for Yocto to use a snapshot release for cairo?
current version 1.16 was released on 2018-10-19
Archlinux uses 1.17.4
Linux From Scratch recommends 1.17.2
Fedora, Debian, Ubuntu, opensuse all use 1.16.0.
The 1.17.4 was released in end of November, so with a little patience 1.18 should show up soon enough.
If you need the new features, you can supply the new version from a separate layer?
Alex