Thanks for working on this. Some comments below. On Mon, 6 Nov 2023 at 03:34, qi...@fujitsu.com <qi...@fujitsu.com> wrote: > --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb > +++ b/meta/recipes-graphics/cairo/cairo_1.18.0.bb > @@ -30,47 +30,28 @@ DEPENDS = "fontconfig 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://CVE-2018-19876.patch \ > file://CVE-2019-6461.patch \ > - file://CVE-2019-6462.patch \ > - file://CVE-2020-35492.patch \
I think CVE-2019-6461.patch in particular can be dropped too: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6461 points to https://gitlab.freedesktop.org/cairo/cairo/-/issues/352 which points to https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/515 which is a part of 1.18.0. Please include the links into the revised commit message. > -SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552" > -SRC_URI[sha256sum] = > "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" > +SRC_URI[md5sum] = "3f0685fbadc530606f965b9645bb51d9" > +SRC_URI[sha256sum] = > "243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64" md5sum can be dropped, as it hasn't been used by fetcher for a long time. > -inherit autotools pkgconfig upstream-version-is-even gtk-doc multilib_script > +inherit meson pkgconfig All of the removed inherits need to be explained, or kept. Particularly, upstream-version-is-even rule still applies, and gtk-doc support should be kept as well: https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/meson_options.txt > +EXTRA_OEMESON = "-Dglib=enabled -Dpng=enabled -Dfontconfig=enabled > -Dzlib=enabled" How were these picked? Should they be PACKAGECONFIG options, enabled by default? > MULTILIB_SCRIPTS = "${PN}-perf-utils:${bindir}/cairo-trace" This implies that 'inherit multilib_script' should be kept too. > -PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" > -PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" > -PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" > -PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" > -PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" > -# trace is under GPLv3 > -PACKAGECONFIG[trace] = "--enable-trace,--disable-trace" Please mention that these options are all gone: https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/meson_options.txt Alex
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#190208): https://lists.openembedded.org/g/openembedded-core/message/190208 Mute This Topic: https://lists.openembedded.org/mt/102413265/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
