boost: correct upstream version check
PATCH 1/61 boost: correct upstream version check
--- meta/recipes-support/boost/boost-1.76.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/boost/boost-1.76.0.inc +1 -1
@@ -15,6 +15,6 @@ SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.b SRC_URI[sha256sum] = "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" -UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" +UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" S = "${WORKDIR}/${BOOST_P}"
Signature · 1 line
2.31.1
PATCH 2/61 go: correct upstream version check
--- meta/recipes-devtools/go/go-common.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/go/go-common.inc +1 -0
@@ -17,6 +17,7 @@ inherit goarch SRC_URI = "https://dl.google.com/go/go${PV}.src.tar.gz;name=main" S = "${WORKDIR}/go" B = "${S}" +UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.src\.tar" INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 02/61] go: correct upstream version check
Quoted 10 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/go/go-common.inc | 1 + 1 file changed, 1 insertion(+)meta/recipes-devtools/go/go-common.inc +0
-0
meta/recipes-devtools/go/go-common.inc inherit goarch · line 20
Quoted 4 lines
meta/recipes-devtools/go/go-common.inc +1
-0@@ -17,6 +17,7 @@ inherit goarch SRC_URI = "https://dl.google.com/go/go${PV}.src.tar.gz;name=main" S = "${WORKDIR}/go" B = "${S}" +UPSTREAM_CHECK_URI = "https://golang.org/dl/"
I think we should revert
https://git.openembedded.org/openembedded-core/commit/?id=8470e38ac1d9f9bb6d8a4ee43724af452d080057
instead. That fix was unnessary, the problem was in AB download mirror which has been fixed.
Quoted 8 lines
meta/recipes-devtools/go/go-common.inc +0
-0UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.src\.tar" INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
Re: [OE-core] [PATCH 02/61] go: correct upstream version check
Quoted 9 lines · Khem Raj
Quoted 1 line
+UPSTREAM_CHECK_URI = "https://golang.org/dl/"
I think we should revert
https://git.openembedded.org/openembedded-core/commit/?id=8470e38ac1d9f9bb6d8a4ee43724af452d080057
instead. That fix was unnessary, the problem was in AB download mirror which has been fixed.
I did that, will send in an updated/rebased set.
Alex
PATCH 3/61 vte: use tarballs again
In reply to Alexander Kanavin--- meta/recipes-support/vte/vte_0.64.0.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
meta/recipes-support/vte/vte_0.64.0.bb +1 -4
@@ -18,12 +18,9 @@ GIR_MESON_OPTION = 'gir' inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection -SRCREV = "2520d6b6785646ceb5f501f9c37a1a0307fa4486" -SRC_URI = "git://gitlab.gnome.org/GNOME/vte.git;protocol=https;branch=vte-0-64" # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" - -S = "${WORKDIR}/git" +SRC_URI[archive.sha256sum] = "c0c60b8dc343167437c86d984b0cf134df86034180ed70513f683006ada3ec41" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
Signature · 1 line
2.31.1
PATCH 4/61 gdk-pixbuf: update 2.40.0 -> 2.42.6
In reply to Alexander KanavinNote: jpg/png loaders are now builtin and no longer provided as separate packages.
Drop backport missing-test-data.patch.
Drop no longer needed 0004-Do-not-run-tests-when-building.patch
Rebase 0004-Do-not-run-tests-when-building.patch
Rework 0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch so that it can be applied to both native and target builds.
---
...bnailer-and-pixdata-cross-compile-fa.patch | 95 +++++++++++++++++++
...-around-thumbnailer-cross-compile-fa.patch | 94 ------------------
.../0004-Do-not-run-tests-when-building.patch | 39 --------
...ailer-and-tests-also-in-cross-builds.patch | 9 +-
.../gdk-pixbuf/CVE-2020-29385.patch | 55 -----------
.../gdk-pixbuf/missing-test-data.patch | 30 ------
...-pixbuf_2.40.0.bb => gdk-pixbuf_2.42.6.bb} | 21 +---
7 files changed, 105 insertions(+), 238 deletions(-)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.40.0.bb => gdk-pixbuf_2.42.6.bb} (85%)meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +95 -0
@@ -0,0 +1,95 @@ +From dcaf3106e2cca27f728a8bd26127430500a1136e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 22 Feb 2019 13:22:06 +0100 +Subject: [PATCH] Work-around thumbnailer and pixdata cross-compile failure + +Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata +when generating the thumbnail metadata and resources. + +This works but the mime types will come from native +loader.cache (which will only contain in-tree loaders), not from the +target loader.cache. + +The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 + +Upstream-Status: Inappropriate [workaround] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + tests/meson.build | 11 +++++++++-- + thumbnailer/meson.build | 23 ++++++++++++++++++++++- + 2 files changed, 31 insertions(+), 3 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 7c6cb11..07121f1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -8,13 +8,20 @@ if enabled_loaders.contains('png') and host_system != 'windows' + # Resources; we cannot use gnome.compile_resources() here, because we need to + # override the environment in order to use the utilities we just built instead + # of the system ones ++ ++ if not meson.is_cross_build() ++ pixdata_binary = gdk_pixbuf_pixdata.full_path() ++ else ++ pixdata_binary = 'gdk-pixbuf-pixdata' ++ endif ++ + resources_c = custom_target('resources.c', + input: 'resources.gresource.xml', + output: 'resources.c', + command: [ + gen_resources, + '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()), +- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--pixdata=@0@'.format(pixdata_binary), + '--loaders=@0@'.format(loaders_cache.full_path()), + '--sourcedir=@0@'.format(meson.current_source_dir()), + '--source', +@@ -33,7 +40,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' + command: [ + gen_resources, + '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()), +- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--pixdata=@0@'.format(pixdata_binary), + '--loaders=@0@'.format(loaders_cache.full_path()), + '--sourcedir=@0@'.format(meson.current_source_dir()), + '--header', +diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build +index 8c741e0..5a3b52a 100644 +--- a/thumbnailer/meson.build ++++ b/thumbnailer/meson.build +@@ -14,7 +14,27 @@ gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types', + install: true, + dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ]) + +-custom_target('thumbnailer', ++if meson.is_cross_build() ++ custom_target('thumbnailer', ++ input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', ++ output: 'gdk-pixbuf-thumbnailer.thumbnailer', ++ command: [ ++ gen_thumbnailer, ++ '--printer=gdk-pixbuf-print-mime-types', ++ '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--loaders=@0@'.format(loaders_cache.full_path()), ++ '--bindir=@0@'.format(gdk_pixbuf_bindir), ++ '@INPUT@', ++ '@OUTPUT@', ++ ], ++ depends: [ ++ gdk_pixbuf_print_mime_types, ++ gdk_pixbuf_pixdata, ++ ], ++ install: true, ++ install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) ++else ++ custom_target('thumbnailer', + input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', + output: 'gdk-pixbuf-thumbnailer.thumbnailer', + command: [ +@@ -33,3 +53,4 @@ custom_target('thumbnailer', + ], + install: true, + install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) ++endif
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch deleted +0 -94
94 lines not on this page · raw message
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 3c4a6c147ae8a0962ba9194373d8a41d14eed44f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 22 Feb 2019 13:23:55 +0100 -Subject: [PATCH] Do not run tests when building - -Upstream-Status: Inappropriate [cross-compile specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - tests/meson.build | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index 4fa3fbc..6ef7884 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -138,23 +138,6 @@ foreach t: installed_tests - install_dir: installed_test_bindir, - ) - -- # Two particularly slow tests -- if test_suites.contains('slow') -- timeout = 300 -- else -- timeout = 30 -- endif -- -- test(test_name, test_bin, -- suite: test_suites, -- args: [ '-k', '--tap' ], -- env: [ -- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), -- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), -- 'GDK_PIXBUF_MODULE_FILE=@0@'.format(loaders_cache.full_path()), -- ], -- timeout: timeout, -- ) - endforeach - - executable('pixbuf-read',
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch +5 -4
@@ -1,19 +1,20 @@ -From 1a532e090c558a830de9503f56e23414e880bb95 Mon Sep 17 00:00:00 2001 +From d02a8e202d2fe5caf3449683e0ccdf84a482a325 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 5 Jun 2019 14:17:55 +0200 Subject: [PATCH] Build thumbnailer and tests also in cross builds. Upstream-Status: Inappropriate [relies on oe-core specific hacks] Signed-off-by: Alexander Kanavin <[email protected]> + --- meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build -index d104cea..7acb88a 100644 +index 73034d1..d114016 100644 --- a/meson.build +++ b/meson.build -@@ -397,10 +397,8 @@ endif +@@ -378,10 +378,8 @@ subdir('gdk-pixbuf') # i18n subdir('po')
@@ -25,4 +26,4 @@ index d104cea..7acb88a 100644 +subdir('thumbnailer') # Documentation - subdir('docs') + build_docs = get_option('gtk_doc') or get_option('docs')
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0 -55
55 lines not on this page · raw message
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From d8d231c01ef2e59856da8a5c26ace955e5f29370 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Mon, 25 Nov 2019 17:05:46 +0000 -Subject: [PATCH] tests: install circular-table.gif - -This test data was added for the pixbuf-gif-circular-table test (added October -2018 in 0b9d004) but because the file was never actually installed the installed -test suite never passes. ---- - tests/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/meson.build b/tests/meson.build -index 5116fc2b9..80ed3e8b2 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -97,6 +97,7 @@ test_data = [ - 'bug775693.pixdata', - 'bug775229.pixdata', - 'aero.gif', -+ 'circular-table.gif' - ] - - installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name()) --- -2.20.1 -
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +5 -16
@@ -22,41 +22,30 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://fatal-loader.patch \ file://0001-Work-around-thumbnailer-cross-compile-failure.patch \ file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \ - file://0004-Do-not-run-tests-when-building.patch \ file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ - file://missing-test-data.patch \ - file://CVE-2020-29385.patch \ + file://0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch \ " -SRC_URI_append_class-target = " \ - file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ - " -SRC_URI_append_class-nativesdk = " \ - file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ - " - -SRC_URI[md5sum] = "05eb1ebc258ba905f1c8644ef49de064" -SRC_URI[sha256sum] = "1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6" +SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f" inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package -GIR_MESON_OPTION = 'gir' +GIR_MESON_OPTION = 'introspection' +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" LIBV = "2.10.0" GDK_PIXBUF_LOADERS ?= "png jpeg" PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng" PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg" PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff" -PACKAGECONFIG[jpeg2000] = "-Djasper=true,-Djasper=false,jasper" PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" -PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,virtual/libx11" PACKAGES =+ "${PN}-xlib"
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 04/61] gdk-pixbuf: update 2.40.0 -> 2.42.6
seeing failures on meta-oe builds
https://errors.yoctoproject.org/Errors/Details/580243/
Quoted 467 lines · Alexander Kanavin
Note: jpg/png loaders are now builtin and no longer provided as separate packages.
Drop backport missing-test-data.patch.
Drop no longer needed 0004-Do-not-run-tests-when-building.patch
Rebase 0004-Do-not-run-tests-when-building.patch
Rework 0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch so that it can be applied to both native and target builds.
Signed-off-by Alexander Kanavin <[email protected]>--- ...bnailer-and-pixdata-cross-compile-fa.patch | 95 +++++++++++++++++++ ...-around-thumbnailer-cross-compile-fa.patch | 94 ------------------ .../0004-Do-not-run-tests-when-building.patch | 39 -------- ...ailer-and-tests-also-in-cross-builds.patch | 9 +- .../gdk-pixbuf/CVE-2020-29385.patch | 55 ----------- .../gdk-pixbuf/missing-test-data.patch | 30 ------ ...-pixbuf_2.40.0.bb => gdk-pixbuf_2.42.6.bb} | 21 +--- 7 files changed, 105 insertions(+), 238 deletions(-) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.40.0.bb => gdk-pixbuf_2.42.6.bb} (85%)meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +95
-0@@ -0,0 +1,95 @@ +From dcaf3106e2cca27f728a8bd26127430500a1136e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 22 Feb 2019 13:22:06 +0100 +Subject: [PATCH] Work-around thumbnailer and pixdata cross-compile failure + +Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata +when generating the thumbnail metadata and resources. + +This works but the mime types will come from native +loader.cache (which will only contain in-tree loaders), not from the +target loader.cache. + +The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 + +Upstream-Status: Inappropriate [workaround] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + tests/meson.build | 11 +++++++++-- + thumbnailer/meson.build | 23 ++++++++++++++++++++++- + 2 files changed, 31 insertions(+), 3 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 7c6cb11..07121f1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -8,13 +8,20 @@ if enabled_loaders.contains('png') and host_system != 'windows' + # Resources; we cannot use gnome.compile_resources() here, because we need to + # override the environment in order to use the utilities we just built instead + # of the system ones ++ ++ if not meson.is_cross_build() ++ pixdata_binary = gdk_pixbuf_pixdata.full_path() ++ else ++ pixdata_binary = 'gdk-pixbuf-pixdata' ++ endif ++ + resources_c = custom_target('resources.c', + input: 'resources.gresource.xml', + output: 'resources.c', + command: [ + gen_resources, + '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()), +- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--pixdata=@0@'.format(pixdata_binary), + '--loaders=@0@'.format(loaders_cache.full_path()), + '--sourcedir=@0@'.format(meson.current_source_dir()), + '--source', +@@ -33,7 +40,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' + command: [ + gen_resources, + '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()), +- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--pixdata=@0@'.format(pixdata_binary), + '--loaders=@0@'.format(loaders_cache.full_path()), + '--sourcedir=@0@'.format(meson.current_source_dir()), + '--header', +diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build +index 8c741e0..5a3b52a 100644 +--- a/thumbnailer/meson.build ++++ b/thumbnailer/meson.build +@@ -14,7 +14,27 @@ gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types', + install: true, + dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ]) + +-custom_target('thumbnailer', ++if meson.is_cross_build() ++ custom_target('thumbnailer', ++ input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', ++ output: 'gdk-pixbuf-thumbnailer.thumbnailer', ++ command: [ ++ gen_thumbnailer, ++ '--printer=gdk-pixbuf-print-mime-types', ++ '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--loaders=@0@'.format(loaders_cache.full_path()), ++ '--bindir=@0@'.format(gdk_pixbuf_bindir), ++ '@INPUT@', ++ '@OUTPUT@', ++ ], ++ depends: [ ++ gdk_pixbuf_print_mime_types, ++ gdk_pixbuf_pixdata, ++ ], ++ install: true, ++ install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) ++else ++ custom_target('thumbnailer', + input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', + output: 'gdk-pixbuf-thumbnailer.thumbnailer', + command: [ +@@ -33,3 +53,4 @@ custom_target('thumbnailer', + ], + install: true, + install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) ++endifmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch deleted +0
-94@@ -1,94 +0,0 @@ -From 2d1b65bd1272ad63b7fbd4babd9a8e8c296d15b5 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 22 Feb 2019 13:22:06 +0100 -Subject: [PATCH] (target only) Work-around thumbnailer and pixdata - cross-compile failure - -Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata -when generating the thumbnail metadata and resources. - -This works but the mime types will come from native -loader.cache (which will only contain in-tree loaders), not from the -target loader.cache. - -The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 - -Upstream-Status: Inappropriate [workaround] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - build-aux/gen-thumbnailer.py | 2 -- - tests/meson.build | 11 +++++++++-- - thumbnailer/meson.build | 5 +---- - 3 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/build-aux/gen-thumbnailer.py b/build-aux/gen-thumbnailer.py -index 05ac821..c5b99ab 100644 ---- a/build-aux/gen-thumbnailer.py -+++ b/build-aux/gen-thumbnailer.py -@@ -20,8 +20,6 @@ argparser.add_argument('output', help='Output file') - args = argparser.parse_args() - - newenv = os.environ.copy() --newenv['GDK_PIXBUF_PIXDATA'] = args.pixdata --newenv['GDK_PIXBUF_MODULE_FILE'] = args.loaders - # 'nt': NT-based Windows, see https://docs.python.org/3/library/os.html - if os.name == 'nt': - gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata) -diff --git a/tests/meson.build b/tests/meson.build -index 8ed7cc1..e011b77 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,12 +1,19 @@ - # Resources; we cannot use gnome.compile_resources() here, because we need to - # override the environment in order to use the utilities we just built instead - # of the system ones -+ -+if not meson.is_cross_build() -+pixdata_binary = gdk_pixbuf_pixdata.full_path() -+else -+pixdata_binary = 'gdk-pixbuf-pixdata' -+endif -+ - resources_c = custom_target('resources.c', - input: 'resources.gresource.xml', - output: 'resources.c', - command: [ - gen_resources, -- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), -+ '--pixdata=@0@'.format(pixdata_binary), - '--loaders=@0@'.format(loaders_cache.full_path()), - '--sourcedir=@0@'.format(meson.current_source_dir()), - '--source', -@@ -24,7 +31,7 @@ resources_h = custom_target('resources.h', - output: 'resources.h', - command: [ - gen_resources, -- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), -+ '--pixdata=@0@'.format(pixdata_binary), - '--loaders=@0@'.format(loaders_cache.full_path()), - '--sourcedir=@0@'.format(meson.current_source_dir()), - '--header', -diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build -index aaafec8..71bd61b 100644 ---- a/thumbnailer/meson.build -+++ b/thumbnailer/meson.build -@@ -18,9 +18,7 @@ custom_target('thumbnailer', - output: 'gdk-pixbuf-thumbnailer.thumbnailer', - command: [ - gen_thumbnailer, -- '--printer=@0@'.format(gdk_pixbuf_print_mime_types.full_path()), -- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), -- '--loaders=@0@'.format(loaders_cache.full_path()), -+ '--printer=gdk-pixbuf-print-mime-types', - '--bindir=@0@'.format(gdk_pixbuf_bindir), - '@INPUT@', - '@OUTPUT@', -@@ -28,7 +26,6 @@ custom_target('thumbnailer', - depends: [ - gdk_pixbuf_print_mime_types, - gdk_pixbuf_pixdata, -- loaders_cache, - ], - install: true, - install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers'))meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch deleted +0
-39@@ -1,39 +0,0 @@ -From 3c4a6c147ae8a0962ba9194373d8a41d14eed44f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 22 Feb 2019 13:23:55 +0100 -Subject: [PATCH] Do not run tests when building - -Upstream-Status: Inappropriate [cross-compile specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - tests/meson.build | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index 4fa3fbc..6ef7884 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -138,23 +138,6 @@ foreach t: installed_tests - install_dir: installed_test_bindir, - ) - -- # Two particularly slow tests -- if test_suites.contains('slow') -- timeout = 300 -- else -- timeout = 30 -- endif -- -- test(test_name, test_bin, -- suite: test_suites, -- args: [ '-k', '--tap' ], -- env: [ -- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), -- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), -- 'GDK_PIXBUF_MODULE_FILE=@0@'.format(loaders_cache.full_path()), -- ], -- timeout: timeout, -- ) - endforeach - - executable('pixbuf-read',meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch +5
-4@@ -1,19 +1,20 @@ -From 1a532e090c558a830de9503f56e23414e880bb95 Mon Sep 17 00:00:00 2001 +From d02a8e202d2fe5caf3449683e0ccdf84a482a325 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 5 Jun 2019 14:17:55 +0200 Subject: [PATCH] Build thumbnailer and tests also in cross builds. Upstream-Status: Inappropriate [relies on oe-core specific hacks] Signed-off-by: Alexander Kanavin <[email protected]> + --- meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build -index d104cea..7acb88a 100644 +index 73034d1..d114016 100644 --- a/meson.build +++ b/meson.build -@@ -397,10 +397,8 @@ endif +@@ -378,10 +378,8 @@ subdir('gdk-pixbuf') # i18n subdir('po')@@ -25,4 +26,4 @@ index d104cea..7acb88a 100644 +subdir('thumbnailer') # Documentation - subdir('docs') + build_docs = get_option('gtk_doc') or get_option('docs')meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-55@@ -1,55 +0,0 @@ -From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 -From: Robert Ancell <[email protected]> -Date: Mon, 30 Nov 2020 12:26:12 +1300 -Subject: [PATCH 02/13] gif: Fix LZW decoder accepting invalid LZW code. - -The code value after a reset wasn't being validated, which means we would -accept invalid codes. This could cause an infinite loop in the decoder. - -Fixes CVE-2020-29385 - -Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81] -CVE: CVE-2020-29385 -Signed-off-by: Chee Yang Lee <[email protected]> - ---- - gdk-pixbuf/lzw.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - create mode 100644 tests/test-images/fail/hang_114.gif - -diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c -index 9e052a6f7..105daf2b1 100644 ---- a/gdk-pixbuf/lzw.c -+++ b/gdk-pixbuf/lzw.c -@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, - if (self->last_code != self->clear_code && self->code_table_size < MAX_CODES) { - if (self->code < self->code_table_size) - add_code (self, self->code); -- else if (self->code == self->code_table_size) -+ else - add_code (self, self->last_code); -- else { -- /* Invalid code received - just stop here */ -- self->last_code = self->eoi_code; -- return output_length; -- } - - /* When table is full increase code size */ - if (self->code_table_size == (1 << self->code_size) && self->code_size < LZW_CODE_MAX) - self->code_size++; - } - -+ /* Invalid code received - just stop here */ -+ if (self->code >= self->code_table_size) { -+ self->last_code = self->eoi_code; -+ return output_length; -+ } -+ - /* Convert codeword into indexes */ - n_written += write_indexes (self, output + n_written, output_length - n_written); - } --- -2.25.1 -meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch deleted +0
-30@@ -1,30 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From d8d231c01ef2e59856da8a5c26ace955e5f29370 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Mon, 25 Nov 2019 17:05:46 +0000 -Subject: [PATCH] tests: install circular-table.gif - -This test data was added for the pixbuf-gif-circular-table test (added October -2018 in 0b9d004) but because the file was never actually installed the installed -test suite never passes. ---- - tests/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/meson.build b/tests/meson.build -index 5116fc2b9..80ed3e8b2 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -97,6 +97,7 @@ test_data = [ - 'bug775693.pixdata', - 'bug775229.pixdata', - 'aero.gif', -+ 'circular-table.gif' - ] - - installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name()) --- -2.20.1 -meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +5
-17@@ -22,41 +22,30 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://fatal-loader.patch \ file://0001-Work-around-thumbnailer-cross-compile-failure.patch \ file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \ - file://0004-Do-not-run-tests-when-building.patch \ file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ - file://missing-test-data.patch \ - file://CVE-2020-29385.patch \ + file://0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch \ " -SRC_URI_append_class-target = " \ - file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ - " -SRC_URI_append_class-nativesdk = " \ - file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ - " - -SRC_URI[md5sum] = "05eb1ebc258ba905f1c8644ef49de064" -SRC_URI[sha256sum] = "1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6" +SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f" inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package -GIR_MESON_OPTION = 'gir' +GIR_MESON_OPTION = 'introspection' +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" LIBV = "2.10.0" GDK_PIXBUF_LOADERS ?= "png jpeg" PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng" PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg" PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff" -PACKAGECONFIG[jpeg2000] = "-Djasper=true,-Djasper=false,jasper" PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" -PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,virtual/libx11" PACKAGES =+ "${PN}-xlib" --2.31.1
Re: [OE-core] [PATCH 04/61] gdk-pixbuf: update 2.40.0 -> 2.42.6
No package 'gdk-pixbuf-xlib-2.0' found
gdk-pixbuf has fully removed support for this:
https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/38
Alex
Quoted 546 lines · Khem Raj
seeing failures on meta-oe builds
https://errors.yoctoproject.org/Errors/Details/580243/
Quoted 14 lines · Alexander Kanavin
Note: jpg/png loaders are now builtin and no longer provided as separate packages.
Drop backport missing-test-data.patch.
Drop no longer needed 0004-Do-not-run-tests-when-building.patch
Rebase 0004-Do-not-run-tests-when-building.patch
Rework 0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch so that it can be applied to both native and target builds.
Signed-off-by Alexander Kanavin <[email protected]>Quoted 10 lines
--- ...bnailer-and-pixdata-cross-compile-fa.patch | 95 +++++++++++++++++++ ...-around-thumbnailer-cross-compile-fa.patch | 94 ------------------ .../0004-Do-not-run-tests-when-building.patch | 39 -------- ...ailer-and-tests-also-in-cross-builds.patch | 9 +- .../gdk-pixbuf/CVE-2020-29385.patch | 55 ----------- .../gdk-pixbuf/missing-test-data.patch | 30 ------ ...-pixbuf_2.40.0.bb => gdk-pixbuf_2.42.6.bb} | 21 +--- 7 files changed, 105 insertions(+), 238 deletions(-) create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patchQuoted 1 line
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patchQuoted 1 line
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patchQuoted 1 line
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patchQuoted 1 line
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patchQuoted 1 line
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.40.0.bb =>gdk-pixbuf_2.42.6.bb} (85%)
Quoted 2 lines
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patchb/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patchQuoted 4 lines
new file mode 100644
index 0000000000..2aa9164750
---/dev/null
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patchmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch line 4
Quoted 5 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +4
-0@@ -0,0 +1,95 @@ +From dcaf3106e2cca27f728a8bd26127430500a1136e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 22 Feb 2019 13:22:06 +0100 +Subject: [PATCH] Work-around thumbnailer and pixdata cross-compilefailure
Quoted 13 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +13
-0+ +Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata +when generating the thumbnail metadata and resources. + +This works but the mime types will come from native +loader.cache (which will only contain in-tree loaders), not from the +target loader.cache. + +The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 + +Upstream-Status: Inappropriate [workaround] +Signed-off-by: Alexander Kanavin <[email protected]> +meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
Quoted 10 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +10
-0+--- + tests/meson.build | 11 +++++++++-- + thumbnailer/meson.build | 23 ++++++++++++++++++++++- + 2 files changed, 31 insertions(+), 3 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 7c6cb11..07121f1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -8,13 +8,20 @@ if enabled_loaders.contains('png') and host_system !='windows'
Review line 28
Quoted 1 line
(quoted diff) +1
-0+ # Resources; we cannot use gnome.compile_resources() here, becausewe need to
Review line 29
Quoted 1 line
(quoted diff) +1
-0+ # override the environment in order to use the utilities we justbuilt instead
Quoted 4 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +4
-0+ # of the system ones ++ ++ if not meson.is_cross_build() ++ pixdata_binary = gdk_pixbuf_pixdata.full_path()meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
Quoted 10 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +10
-0++ else ++ pixdata_binary = 'gdk-pixbuf-pixdata' ++ endif ++ + resources_c = custom_target('resources.c', + input: 'resources.gresource.xml', + output: 'resources.c', + command: [ + gen_resources, + '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()),
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
Quoted 6 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +6
-0+- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--pixdata=@0@'.format(pixdata_binary), + '--loaders=@0@'.format(loaders_cache.full_path()), + '--sourcedir=@0@'.format(meson.current_source_dir()), + '--source', +@@ -33,7 +40,7 @@ if enabled_loaders.contains('png') and host_system !='windows'
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
Quoted 3 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +3
-0+ command: [ + gen_resources, + '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()),
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
Quoted 10 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +10
-0+- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--pixdata=@0@'.format(pixdata_binary), + '--loaders=@0@'.format(loaders_cache.full_path()), + '--sourcedir=@0@'.format(meson.current_source_dir()), + '--header', +diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build +index 8c741e0..5a3b52a 100644 +--- a/thumbnailer/meson.build ++++ b/thumbnailer/meson.build +@@ -14,7 +14,27 @@ gdk_pixbuf_print_mime_types =executable('gdk-pixbuf-print-mime-types',
Review line 64
Quoted 2 lines
(quoted diff) +2
-0+ install: true, + dependencies: gdk_pixbuf_deps+ [
gdkpixbuf_dep])meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
Quoted 10 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +10
-0+ +-custom_target('thumbnailer', ++if meson.is_cross_build() ++ custom_target('thumbnailer', ++ input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', ++ output: 'gdk-pixbuf-thumbnailer.thumbnailer', ++ command: [ ++ gen_thumbnailer, ++ '--printer=gdk-pixbuf-print-mime-types', ++ '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
Quoted 11 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +11
-0++ '--loaders=@0@'.format(loaders_cache.full_path()), ++ '--bindir=@0@'.format(gdk_pixbuf_bindir), ++ '@INPUT@', ++ '@OUTPUT@', ++ ], ++ depends: [ ++ gdk_pixbuf_print_mime_types, ++ gdk_pixbuf_pixdata, ++ ], ++ install: true, ++ install_dir: join_paths(gdk_pixbuf_datadir,'thumbnailers'))
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
Quoted 9 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +9
-0++else ++ custom_target('thumbnailer', + input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', + output: 'gdk-pixbuf-thumbnailer.thumbnailer', + command: [ +@@ -33,3 +53,4 @@ custom_target('thumbnailer', + ], + install: true, + install_dir: join_paths(gdk_pixbuf_datadir,'thumbnailers'))
Quoted 2 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +1
-0++endifdiff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patchb/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patchQuoted 3 lines
deleted file mode 100644
index a9c7600eb3..0000000000
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patchQuoted 27 lines
+++
/dev/nullmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch deleted +0
-25@@ -1,94 +0,0 @@ -From 2d1b65bd1272ad63b7fbd4babd9a8e8c296d15b5 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 22 Feb 2019 13:22:06 +0100 -Subject: [PATCH] (target only) Work-around thumbnailer and pixdata - cross-compile failure - -Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata -when generating the thumbnail metadata and resources. - -This works but the mime types will come from native -loader.cache (which will only contain in-tree loaders), not from the -target loader.cache. - -The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 - -Upstream-Status: Inappropriate [workaround] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - build-aux/gen-thumbnailer.py | 2 -- - tests/meson.build | 11 +++++++++-- - thumbnailer/meson.build | 5 +---- - 3 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/build-aux/gen-thumbnailer.py b/build-aux/gen-thumbnailer.pymeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch line 35
Quoted 10 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch deleted +0
-10-index 05ac821..c5b99ab 100644 ---- a/build-aux/gen-thumbnailer.py -+++ b/build-aux/gen-thumbnailer.py -@@ -20,8 +20,6 @@ argparser.add_argument('output', help='Output file') - args = argparser.parse_args() - - newenv = os.environ.copy() --newenv['GDK_PIXBUF_PIXDATA'] = args.pixdata --newenv['GDK_PIXBUF_MODULE_FILE'] = args.loaders - # 'nt': NT-based Windows, seemeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
Quoted 8 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch deleted +0
-8- if os.name == 'nt': - gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata) -diff --git a/tests/meson.build b/tests/meson.build -index 8ed7cc1..e011b77 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,12 +1,19 @@ - # Resources; we cannot use gnome.compile_resources() here, because weneed to
Review line 44
Quoted 1 line
(quoted diff) +0
-1- # override the environment in order to use the utilities we just builtinstead
Quoted 26 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch deleted +0
-26- # of the system ones -+ -+if not meson.is_cross_build() -+pixdata_binary = gdk_pixbuf_pixdata.full_path() -+else -+pixdata_binary = 'gdk-pixbuf-pixdata' -+endif -+ - resources_c = custom_target('resources.c', - input: 'resources.gresource.xml', - output: 'resources.c', - command: [ - gen_resources, -- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), -+ '--pixdata=@0@'.format(pixdata_binary), - '--loaders=@0@'.format(loaders_cache.full_path()), - '--sourcedir=@0@'.format(meson.current_source_dir()), - '--source', -@@ -24,7 +31,7 @@ resources_h = custom_target('resources.h', - output: 'resources.h', - command: [ - gen_resources, -- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), -+ '--pixdata=@0@'.format(pixdata_binary), - '--loaders=@0@'.format(loaders_cache.full_path()), - '--sourcedir=@0@'.format(meson.current_source_dir()),meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
Quoted 10 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch deleted +0
-10- '--header', -diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build -index aaafec8..71bd61b 100644 ---- a/thumbnailer/meson.build -+++ b/thumbnailer/meson.build -@@ -18,9 +18,7 @@ custom_target('thumbnailer', - output: 'gdk-pixbuf-thumbnailer.thumbnailer', - command: [ - gen_thumbnailer, -- '--printer=@0@'.format(gdk_pixbuf_print_mime_types.full_path()),
Review line 81
Quoted 1 line
(quoted diff) +0
-1-- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
Quoted 13 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch deleted +0
-13-- '--loaders=@0@'.format(loaders_cache.full_path()), -+ '--printer=gdk-pixbuf-print-mime-types', - '--bindir=@0@'.format(gdk_pixbuf_bindir), - '@INPUT@', - '@OUTPUT@', -@@ -28,7 +26,6 @@ custom_target('thumbnailer', - depends: [ - gdk_pixbuf_print_mime_types, - gdk_pixbuf_pixdata, -- loaders_cache, - ], - install: true, - install_dir: join_paths(gdk_pixbuf_datadir,'thumbnailers'))
Quoted 1 line
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patchb/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patchQuoted 3 lines
deleted file mode 100644
index 96c546f271..0000000000
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patchQuoted 41 lines
+++
/dev/nullmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch deleted +0
-39@@ -1,39 +0,0 @@ -From 3c4a6c147ae8a0962ba9194373d8a41d14eed44f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 22 Feb 2019 13:23:55 +0100 -Subject: [PATCH] Do not run tests when building - -Upstream-Status: Inappropriate [cross-compile specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - tests/meson.build | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index 4fa3fbc..6ef7884 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -138,23 +138,6 @@ foreach t: installed_tests - install_dir: installed_test_bindir, - ) - -- # Two particularly slow tests -- if test_suites.contains('slow') -- timeout = 300 -- else -- timeout = 30 -- endif -- -- test(test_name, test_bin, -- suite: test_suites, -- args: [ '-k', '--tap' ], -- env: [ -- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), -- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), -- 'GDK_PIXBUF_MODULE_FILE=@0@'.format(loaders_cache.full_path()), -- ], -- timeout: timeout, -- ) - endforeach - - executable('pixbuf-read',Quoted 1 line
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patchb/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patchQuoted 2 lines
index
0fe13a387a..cd9f88befc100644
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patchQuoted 1 line
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patchQuoted 30 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch +5
-4@@ -1,19 +1,20 @@ -From 1a532e090c558a830de9503f56e23414e880bb95 Mon Sep 17 00:00:00 2001 +From d02a8e202d2fe5caf3449683e0ccdf84a482a325 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 5 Jun 2019 14:17:55 +0200 Subject: [PATCH] Build thumbnailer and tests also in cross builds. Upstream-Status: Inappropriate [relies on oe-core specific hacks] Signed-off-by: Alexander Kanavin <[email protected]> + --- meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build -index d104cea..7acb88a 100644 +index 73034d1..d114016 100644 --- a/meson.build +++ b/meson.build -@@ -397,10 +397,8 @@ endif +@@ -378,10 +378,8 @@ subdir('gdk-pixbuf') # i18n subdir('po')@@ -25,4 +26,4 @@ index d104cea..7acb88a 100644 +subdir('thumbnailer') # Documentation - subdir('docs') + build_docs = get_option('gtk_doc') or get_option('docs')Quoted 1 line
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patchb/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patchmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 6
Quoted 11 lines
deleted file mode 100644
index 3fef2bc1eb..0000000000meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-6@@ -1,55 +0,0 @@ -From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 -From: Robert Ancell <[email protected]> -Date: Mon, 30 Nov 2020 12:26:12 +1300 -Subject: [PATCH 02/13] gif: Fix LZW decoder accepting invalid LZW code. - -The code value after a reset wasn't being validated, which means wewould
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch
Quoted 7 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-7-accept invalid codes. This could cause an infinite loop in the decoder. - -Fixes CVE-2020-29385 - -Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81
]Quoted 4 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-4-CVE: CVE-2020-29385 -Signed-off-by: Chee Yang Lee <[email protected]> - ----meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch
Quoted 10 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-10- gdk-pixbuf/lzw.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - create mode 100644 tests/test-images/fail/hang_114.gif - -diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c -index 9e052a6f7..105daf2b1 100644 ---- a/gdk-pixbuf/lzw.c -+++ b/gdk-pixbuf/lzw.c -@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, - if (self->last_code !=
self->clear_code&&self->code_table_size<MAX_CODES) {meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 28
Quoted 1 line
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-1- if (self->code <
self->code_table_size)meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 29
Quoted 1 line
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-1- add_code (self,
self->code);meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 30
Quoted 1 line
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-1-- else if (self->code ==
self->code_table_size)meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 32
Quoted 2 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-2-+ else - add_code (self,
self->last_code);meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 34
Quoted 2 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-2-- else { -- /* Invalid codereceived - just stop here */
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 35
Quoted 1 line
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-1-- self->last_code =
self->eoi_code;meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch
Quoted 4 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-4-- return output_length; -- } - - /* When table is full increasecode size */
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 40
Quoted 1 line
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-1- if (self->code_table_size ==(1 <<
self->code_size) &&self->code_size<LZW_CODE_MAX)meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch
Quoted 4 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-4- self->code_size++; - } - -+ /* Invalid code received - just stophere */
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 45
Quoted 1 line
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-1-+ if (self->code >=
self->code_table_size) {meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch line 46
Quoted 1 line
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-1-+ self->last_code =
self->eoi_code;meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch
Quoted 5 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-5-+ return output_length; -+ } -+ - /* Convert codeword into indexes */ - n_written += write_indexes (self,output +
n_written,output_length-n_written);Quoted 5 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-4- } --- -2.25.1 -diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patchb/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patchQuoted 5 lines
deleted file mode 100644
index 6c758fd61c..0000000000meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch line 9
Quoted 9 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch deleted +0
-9@@ -1,30 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From d8d231c01ef2e59856da8a5c26ace955e5f29370 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Mon, 25 Nov 2019 17:05:46 +0000 -Subject: [PATCH] tests: install circular-table.gif - -This test data was added for the pixbuf-gif-circular-table test (addedOctober
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch line 10
Quoted 1 line
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch deleted +0
-1-2018 in 0b9d004) but because the file was never actually installed theinstalled
Quoted 7 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch deleted +0
-7-test suite never passes. ---- - tests/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/meson.build b/tests/meson.build -index 5116fc2b9..80ed3e8b2 100644meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch
Quoted 10 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch deleted +0
-10---- a/tests/meson.build -+++ b/tests/meson.build -@@ -97,6 +97,7 @@ test_data = [ - 'bug775693.pixdata', - 'bug775229.pixdata', - 'aero.gif', -+ 'circular-table.gif' - ] - - installed_test_bindir = join_paths(gdk_pixbuf_libexecdir,'installed-tests',
meson.project_name())Review
Quoted 4 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch deleted +0
-3--- -2.20.1 -(quoted diff) +0
-0b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb SRC_URI =
Quoted 7 lines
similarity index 85%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb index226e1c7b89..2734a11f96100644meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +0
-0@@ -22,41 +22,30 @@ SRC_URI ="${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ · line 28
Quoted 2 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +0
-0file://fatal-loader.patch \file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
Quoted 1 line
file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \
Quoted 2 lines
- file://0004-Do-not-run-tests-when-building.patch \
file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
Quoted 3 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +1
-2- file://missing-test-data.patch \ - file://CVE-2020-29385.patch \ +file://0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch \
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ · line 37
Quoted 4 lines
"meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +0
-2-SRC_URI_append_class-target = " \ -file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ · line 37
Quoted 3 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +0
-3- " -SRC_URI_append_class-nativesdk = " \ -file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
Quoted 4 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +0
-4- " - -SRC_URI[md5sum] = "05eb1ebc258ba905f1c8644ef49de064" -SRC_URI[sha256sum] ="
1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6"Quoted 1 line
+SRC_URI[sha256sum] =
"
c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f"Quoted 2 lines
inherit meson pkgconfig gettext pixbufcache ptest-gnome
upstream-version-is-even gobject-introspection gtk-doc
lib_packagemeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
Quoted 13 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +3
-2-GIR_MESON_OPTION = 'gir' +GIR_MESON_OPTION = 'introspection' +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" LIBV = "2.10.0" GDK_PIXBUF_LOADERS ?= "png jpeg" PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests','', d)}"
Quoted 17 lines
PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}"
PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng" PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg" PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff"
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +0
-3-PACKAGECONFIG[jpeg2000] = "-Djasper=true,-Djasper=false,jasper" PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" -PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,virtual/libx11" PACKAGES =+ "${PN}-xlib" --2.31.1
Re: [OE-core] [PATCH 04/61] gdk-pixbuf: update 2.40.0 -> 2.42.6
Quoted 6 lines · Alexander Kanavin
No package 'gdk-pixbuf-xlib-2.0' found
gdk-pixbuf has fully removed support for this:
https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/38
in this pull they talk about soft API break, have we understood the breadth of it?
For icewm, I guess forcing iceWM to upgrade to latest will fix this build break.
Quoted 477 lines
Alex
Quoted 473 lines · Khem Raj
seeing failures on meta-oe builds
https://errors.yoctoproject.org/Errors/Details/580243/
Quoted 467 lines · Alexander Kanavin
Note: jpg/png loaders are now builtin and no longer provided as separate packages.
Drop backport missing-test-data.patch.
Drop no longer needed 0004-Do-not-run-tests-when-building.patch
Rebase 0004-Do-not-run-tests-when-building.patch
Rework 0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch so that it can be applied to both native and target builds.
Signed-off-by Alexander Kanavin <[email protected]>--- ...bnailer-and-pixdata-cross-compile-fa.patch | 95 +++++++++++++++++++ ...-around-thumbnailer-cross-compile-fa.patch | 94 ------------------ .../0004-Do-not-run-tests-when-building.patch | 39 -------- ...ailer-and-tests-also-in-cross-builds.patch | 9 +- .../gdk-pixbuf/CVE-2020-29385.patch | 55 ----------- .../gdk-pixbuf/missing-test-data.patch | 30 ------ ...-pixbuf_2.40.0.bb => gdk-pixbuf_2.42.6.bb} | 21 +--- 7 files changed, 105 insertions(+), 238 deletions(-) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.40.0.bb => gdk-pixbuf_2.42.6.bb} (85%)meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file +95
-0@@ -0,0 +1,95 @@ +From dcaf3106e2cca27f728a8bd26127430500a1136e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 22 Feb 2019 13:22:06 +0100 +Subject: [PATCH] Work-around thumbnailer and pixdata cross-compile failure + +Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata +when generating the thumbnail metadata and resources. + +This works but the mime types will come from native +loader.cache (which will only contain in-tree loaders), not from the +target loader.cache. + +The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 + +Upstream-Status: Inappropriate [workaround] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + tests/meson.build | 11 +++++++++-- + thumbnailer/meson.build | 23 ++++++++++++++++++++++- + 2 files changed, 31 insertions(+), 3 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 7c6cb11..07121f1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -8,13 +8,20 @@ if enabled_loaders.contains('png') and host_system != 'windows' + # Resources; we cannot use gnome.compile_resources() here, because we need to + # override the environment in order to use the utilities we just built instead + # of the system ones ++ ++ if not meson.is_cross_build() ++ pixdata_binary = gdk_pixbuf_pixdata.full_path() ++ else ++ pixdata_binary = 'gdk-pixbuf-pixdata' ++ endif ++ + resources_c = custom_target('resources.c', + input: 'resources.gresource.xml', + output: 'resources.c', + command: [ + gen_resources, + '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()), +- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--pixdata=@0@'.format(pixdata_binary), + '--loaders=@0@'.format(loaders_cache.full_path()), + '--sourcedir=@0@'.format(meson.current_source_dir()), + '--source', +@@ -33,7 +40,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' + command: [ + gen_resources, + '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()), +- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--pixdata=@0@'.format(pixdata_binary), + '--loaders=@0@'.format(loaders_cache.full_path()), + '--sourcedir=@0@'.format(meson.current_source_dir()), + '--header', +diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build +index 8c741e0..5a3b52a 100644 +--- a/thumbnailer/meson.build ++++ b/thumbnailer/meson.build +@@ -14,7 +14,27 @@ gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types', + install: true, + dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ]) + +-custom_target('thumbnailer', ++if meson.is_cross_build() ++ custom_target('thumbnailer', ++ input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', ++ output: 'gdk-pixbuf-thumbnailer.thumbnailer', ++ command: [ ++ gen_thumbnailer, ++ '--printer=gdk-pixbuf-print-mime-types', ++ '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), ++ '--loaders=@0@'.format(loaders_cache.full_path()), ++ '--bindir=@0@'.format(gdk_pixbuf_bindir), ++ '@INPUT@', ++ '@OUTPUT@', ++ ], ++ depends: [ ++ gdk_pixbuf_print_mime_types, ++ gdk_pixbuf_pixdata, ++ ], ++ install: true, ++ install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) ++else ++ custom_target('thumbnailer', + input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', + output: 'gdk-pixbuf-thumbnailer.thumbnailer', + command: [ +@@ -33,3 +53,4 @@ custom_target('thumbnailer', + ], + install: true, + install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) ++endifmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch deleted +0
-94@@ -1,94 +0,0 @@ -From 2d1b65bd1272ad63b7fbd4babd9a8e8c296d15b5 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 22 Feb 2019 13:22:06 +0100 -Subject: [PATCH] (target only) Work-around thumbnailer and pixdata - cross-compile failure - -Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata -when generating the thumbnail metadata and resources. - -This works but the mime types will come from native -loader.cache (which will only contain in-tree loaders), not from the -target loader.cache. - -The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 - -Upstream-Status: Inappropriate [workaround] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - build-aux/gen-thumbnailer.py | 2 -- - tests/meson.build | 11 +++++++++-- - thumbnailer/meson.build | 5 +---- - 3 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/build-aux/gen-thumbnailer.py b/build-aux/gen-thumbnailer.py -index 05ac821..c5b99ab 100644 ---- a/build-aux/gen-thumbnailer.py -+++ b/build-aux/gen-thumbnailer.py -@@ -20,8 +20,6 @@ argparser.add_argument('output', help='Output file') - args = argparser.parse_args() - - newenv = os.environ.copy() --newenv['GDK_PIXBUF_PIXDATA'] = args.pixdata --newenv['GDK_PIXBUF_MODULE_FILE'] = args.loaders - # 'nt': NT-based Windows, see https://docs.python.org/3/library/os.html - if os.name == 'nt': - gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata) -diff --git a/tests/meson.build b/tests/meson.build -index 8ed7cc1..e011b77 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,12 +1,19 @@ - # Resources; we cannot use gnome.compile_resources() here, because we need to - # override the environment in order to use the utilities we just built instead - # of the system ones -+ -+if not meson.is_cross_build() -+pixdata_binary = gdk_pixbuf_pixdata.full_path() -+else -+pixdata_binary = 'gdk-pixbuf-pixdata' -+endif -+ - resources_c = custom_target('resources.c', - input: 'resources.gresource.xml', - output: 'resources.c', - command: [ - gen_resources, -- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), -+ '--pixdata=@0@'.format(pixdata_binary), - '--loaders=@0@'.format(loaders_cache.full_path()), - '--sourcedir=@0@'.format(meson.current_source_dir()), - '--source', -@@ -24,7 +31,7 @@ resources_h = custom_target('resources.h', - output: 'resources.h', - command: [ - gen_resources, -- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), -+ '--pixdata=@0@'.format(pixdata_binary), - '--loaders=@0@'.format(loaders_cache.full_path()), - '--sourcedir=@0@'.format(meson.current_source_dir()), - '--header', -diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build -index aaafec8..71bd61b 100644 ---- a/thumbnailer/meson.build -+++ b/thumbnailer/meson.build -@@ -18,9 +18,7 @@ custom_target('thumbnailer', - output: 'gdk-pixbuf-thumbnailer.thumbnailer', - command: [ - gen_thumbnailer, -- '--printer=@0@'.format(gdk_pixbuf_print_mime_types.full_path()), -- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), -- '--loaders=@0@'.format(loaders_cache.full_path()), -+ '--printer=gdk-pixbuf-print-mime-types', - '--bindir=@0@'.format(gdk_pixbuf_bindir), - '@INPUT@', - '@OUTPUT@', -@@ -28,7 +26,6 @@ custom_target('thumbnailer', - depends: [ - gdk_pixbuf_print_mime_types, - gdk_pixbuf_pixdata, -- loaders_cache, - ], - install: true, - install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers'))meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch deleted +0
-39@@ -1,39 +0,0 @@ -From 3c4a6c147ae8a0962ba9194373d8a41d14eed44f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 22 Feb 2019 13:23:55 +0100 -Subject: [PATCH] Do not run tests when building - -Upstream-Status: Inappropriate [cross-compile specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - tests/meson.build | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index 4fa3fbc..6ef7884 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -138,23 +138,6 @@ foreach t: installed_tests - install_dir: installed_test_bindir, - ) - -- # Two particularly slow tests -- if test_suites.contains('slow') -- timeout = 300 -- else -- timeout = 30 -- endif -- -- test(test_name, test_bin, -- suite: test_suites, -- args: [ '-k', '--tap' ], -- env: [ -- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), -- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), -- 'GDK_PIXBUF_MODULE_FILE=@0@'.format(loaders_cache.full_path()), -- ], -- timeout: timeout, -- ) - endforeach - - executable('pixbuf-read',meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch +5
-4@@ -1,19 +1,20 @@ -From 1a532e090c558a830de9503f56e23414e880bb95 Mon Sep 17 00:00:00 2001 +From d02a8e202d2fe5caf3449683e0ccdf84a482a325 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 5 Jun 2019 14:17:55 +0200 Subject: [PATCH] Build thumbnailer and tests also in cross builds. Upstream-Status: Inappropriate [relies on oe-core specific hacks] Signed-off-by: Alexander Kanavin <[email protected]> + --- meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build -index d104cea..7acb88a 100644 +index 73034d1..d114016 100644 --- a/meson.build +++ b/meson.build -@@ -397,10 +397,8 @@ endif +@@ -378,10 +378,8 @@ subdir('gdk-pixbuf') # i18n subdir('po')@@ -25,4 +26,4 @@ index d104cea..7acb88a 100644 +subdir('thumbnailer') # Documentation - subdir('docs') + build_docs = get_option('gtk_doc') or get_option('docs')meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted +0
-55@@ -1,55 +0,0 @@ -From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 -From: Robert Ancell <[email protected]> -Date: Mon, 30 Nov 2020 12:26:12 +1300 -Subject: [PATCH 02/13] gif: Fix LZW decoder accepting invalid LZW code. - -The code value after a reset wasn't being validated, which means we would -accept invalid codes. This could cause an infinite loop in the decoder. - -Fixes CVE-2020-29385 - -Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81] -CVE: CVE-2020-29385 -Signed-off-by: Chee Yang Lee <[email protected]> - ---- - gdk-pixbuf/lzw.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - create mode 100644 tests/test-images/fail/hang_114.gif - -diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c -index 9e052a6f7..105daf2b1 100644 ---- a/gdk-pixbuf/lzw.c -+++ b/gdk-pixbuf/lzw.c -@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, - if (self->last_code != self->clear_code && self->code_table_size < MAX_CODES) { - if (self->code < self->code_table_size) - add_code (self, self->code); -- else if (self->code == self->code_table_size) -+ else - add_code (self, self->last_code); -- else { -- /* Invalid code received - just stop here */ -- self->last_code = self->eoi_code; -- return output_length; -- } - - /* When table is full increase code size */ - if (self->code_table_size == (1 << self->code_size) && self->code_size < LZW_CODE_MAX) - self->code_size++; - } - -+ /* Invalid code received - just stop here */ -+ if (self->code >= self->code_table_size) { -+ self->last_code = self->eoi_code; -+ return output_length; -+ } -+ - /* Convert codeword into indexes */ - n_written += write_indexes (self, output + n_written, output_length - n_written); - } --- -2.25.1 -meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch deleted +0
-30@@ -1,30 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From d8d231c01ef2e59856da8a5c26ace955e5f29370 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Mon, 25 Nov 2019 17:05:46 +0000 -Subject: [PATCH] tests: install circular-table.gif - -This test data was added for the pixbuf-gif-circular-table test (added October -2018 in 0b9d004) but because the file was never actually installed the installed -test suite never passes. ---- - tests/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/meson.build b/tests/meson.build -index 5116fc2b9..80ed3e8b2 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -97,6 +97,7 @@ test_data = [ - 'bug775693.pixdata', - 'bug775229.pixdata', - 'aero.gif', -+ 'circular-table.gif' - ] - - installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name()) --- -2.20.1 -meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +5
-17@@ -22,41 +22,30 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://fatal-loader.patch \ file://0001-Work-around-thumbnailer-cross-compile-failure.patch \ file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \ - file://0004-Do-not-run-tests-when-building.patch \ file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ - file://missing-test-data.patch \ - file://CVE-2020-29385.patch \ + file://0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch \ " -SRC_URI_append_class-target = " \ - file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ - " -SRC_URI_append_class-nativesdk = " \ - file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ - " - -SRC_URI[md5sum] = "05eb1ebc258ba905f1c8644ef49de064" -SRC_URI[sha256sum] = "1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6" +SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f" inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package -GIR_MESON_OPTION = 'gir' +GIR_MESON_OPTION = 'introspection' +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" LIBV = "2.10.0" GDK_PIXBUF_LOADERS ?= "png jpeg" PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng" PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg" PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff" -PACKAGECONFIG[jpeg2000] = "-Djasper=true,-Djasper=false,jasper" PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" -PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,virtual/libx11" PACKAGES =+ "${PN}-xlib" --2.31.1
PATCH 5/61 u-boot: upgrade 2021.01 -> 2021.04
In reply to Alexander Kanavin---
.../files/0001-add-valid-fdt-check.patch | 36 --
.../u-boot/files/CVE-2021-27097-1.patch | 71 ---
.../u-boot/files/CVE-2021-27097-2.patch | 419 ------------------
.../u-boot/files/CVE-2021-27097-3.patch | 105 -----
.../u-boot/files/CVE-2021-27097-4.patch | 73 ---
.../u-boot/files/CVE-2021-27138-1.patch | 245 ----------
.../u-boot/files/CVE-2021-27138-2.patch | 109 -----
meta/recipes-bsp/u-boot/u-boot-common.inc | 9 +-
...ols_2021.01.bb => u-boot-tools_2021.04.bb} | 0
.../{u-boot_2021.01.bb => u-boot_2021.04.bb} | 0
10 files changed, 1 insertion(+), 1066 deletions(-)
delete mode 100644 meta/recipes-bsp/u-boot/files/0001-add-valid-fdt-check.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2021-27097-1.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2021-27097-2.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2021-27097-3.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2021-27097-4.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2021-27138-1.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2021-27138-2.patch
rename meta/recipes-bsp/u-boot/{u-boot-tools_2021.01.bb => u-boot-tools_2021.04.bb} (100%)
rename meta/recipes-bsp/u-boot/{u-boot_2021.01.bb => u-boot_2021.04.bb} (100%)meta/recipes-bsp/u-boot/files/0001-add-valid-fdt-check.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From ea1a9ec5f430359720d9a0621ed1acfbba6a142a Mon Sep 17 00:00:00 2001 -From: Heinrich Schuchardt <[email protected]> -Date: Wed, 13 Jan 2021 02:09:12 +0100 -Subject: [PATCH] image-fit: fit_check_format check for valid FDT - -fit_check_format() must check that the buffer contains a flattened device -tree before calling any device tree library functions. - -Failure to do may cause segmentation faults. - -Signed-off-by: Heinrich Schuchardt <[email protected]> - -Upstream-Status: Backport[https://github.com/u-boot/u-boot/commit/ea1a9ec5f430359720d9a0621ed1acfbba6a142a] -Signed-off-by: Scott Murray <[email protected]> - ---- - common/image-fit.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/common/image-fit.c b/common/image-fit.c -index 6a8787ca0a..21c44bdf69 100644 ---- a/common/image-fit.c -+++ b/common/image-fit.c -@@ -1553,6 +1553,12 @@ int fit_image_check_comp(const void *fit, int noffset, uint8_t comp) - */ - int fit_check_format(const void *fit) - { -+ /* A FIT image must be a valid FDT */ -+ if (fdt_check_header(fit)) { -+ debug("Wrong FIT format: not a flattened device tree\n"); -+ return 0; -+ } -+ - /* mandatory / node 'description' property */ - if (fdt_getprop(fit, 0, FIT_DESC_PROP, NULL) == NULL) { - debug("Wrong FIT format: no description\n");
meta/recipes-bsp/u-boot/files/CVE-2021-27097-1.patch deleted +0 -71
71 lines not on this page · raw message
meta/recipes-bsp/u-boot/files/CVE-2021-27097-2.patch deleted +0 -419
419 lines not on this page · raw message
meta/recipes-bsp/u-boot/files/CVE-2021-27097-3.patch deleted +0 -105
105 lines not on this page · raw message
meta/recipes-bsp/u-boot/files/CVE-2021-27097-4.patch deleted +0 -73
73 lines not on this page · raw message
meta/recipes-bsp/u-boot/files/CVE-2021-27138-1.patch deleted +0 -245
245 lines not on this page · raw message
meta/recipes-bsp/u-boot/files/CVE-2021-27138-2.patch deleted +0 -109
109 lines not on this page · raw message
meta/recipes-bsp/u-boot/u-boot-common.inc +1 -8
@@ -12,16 +12,9 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "c4fddedc48f336eabc4ce3f74940e6aa372de18c" +SRCREV = "b46dd116ce03e235f2a7d4843c6278e1da44b5e1" SRC_URI = "git://git.denx.de/u-boot.git \ - file://0001-add-valid-fdt-check.patch \ - file://CVE-2021-27097-1.patch \ - file://CVE-2021-27097-2.patch \ - file://CVE-2021-27097-3.patch \ - file://CVE-2021-27097-4.patch \ - file://CVE-2021-27138-1.patch \ - file://CVE-2021-27138-2.patch \ " S = "${WORKDIR}/git"
meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb renamed from meta/recipes-bsp/u-boot/u-boot-tools_2021.01.bb +0 -0
meta/recipes-bsp/u-boot/u-boot_2021.04.bb renamed from meta/recipes-bsp/u-boot/u-boot_2021.01.bb +0 -0
Signature · 1 line
2.31.1
PATCH 6/61 expat: upgrade 2.2.10 -> 2.3.0
In reply to Alexander KanavinDrop 0001-Add-output-of-tests-result.patch
(difficult to rebase).
---
.../0001-Add-output-of-tests-result.patch | 83 -------------------
.../expat/{expat_2.2.10.bb => expat_2.3.0.bb} | 7 +-
2 files changed, 3 insertions(+), 87 deletions(-)
delete mode 100644 meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch
rename meta/recipes-core/expat/{expat_2.2.10.bb => expat_2.3.0.bb} (81%)meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch deleted +0 -83
@@ -1,83 +0,0 @@ -From aa84835a00bfd65e784d58411e76f60658e939dc Mon Sep 17 00:00:00 2001 -From: Oleksandr Popovych <[email protected]> -Date: Tue, 18 Feb 2020 19:04:55 +0200 -Subject: [PATCH] Add output of tests result - -Added console output of testing results in form 'RESULT: TEST_NAME'. - -Changed verbose mode of test application set by '-v' ('--verbose') -argument to CK_NORMAL. -Added new supported argument '-vv' ('--extra-verbose') that changes -verbose mode of test application to CK_VERBOSE. Results of each test -are shown in output only if this mode is set. - -Upstream-Status: Denied - -This patch changes potentially deprecated feature that shoud be changed -in upstream. [https://github.com/libexpat/libexpat/issues/382] - -Signed-off-by: Oleksandr Popovych <[email protected]> ---- - tests/minicheck.c | 10 +++++++++- - tests/runtests.c | 4 +++- - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c -index a5a1efb..94fa412 100644 ---- a/tests/minicheck.c -+++ b/tests/minicheck.c -@@ -164,6 +164,8 @@ srunner_run_all(SRunner *runner, int verbosity) { - if (tc->setup != NULL) { - /* setup */ - if (setjmp(env)) { -+ if (verbosity >= CK_VERBOSE) -+ printf("SKIP: %s\n", _check_current_function); - add_failure(runner, verbosity); - continue; - } -@@ -171,6 +173,8 @@ srunner_run_all(SRunner *runner, int verbosity) { - } - /* test */ - if (setjmp(env)) { -+ if (verbosity >= CK_VERBOSE) -+ printf("FAIL: %s\n", _check_current_function); - add_failure(runner, verbosity); - continue; - } -@@ -178,12 +182,16 @@ srunner_run_all(SRunner *runner, int verbosity) { - - /* teardown */ - if (tc->teardown != NULL) { -- if (setjmp(env)) { -+ if (setjmp(env)) { -+ if (verbosity >= CK_VERBOSE) -+ printf("PASS: %s\n", _check_current_function); - add_failure(runner, verbosity); - continue; - } - tc->teardown(); - } -+ if (verbosity >= CK_VERBOSE) -+ printf("PASS: %s\n", _check_current_function); - } - tc = tc->next_tcase; - } -diff --git a/tests/runtests.c b/expat/tests/runtests.c -index 7791fe0..75724e5 100644 ---- a/tests/runtests.c -+++ b/tests/runtests.c -@@ -11619,9 +11619,11 @@ main(int argc, char *argv[]) { - for (i = 1; i < argc; ++i) { - char *opt = argv[i]; - if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0) -- verbosity = CK_VERBOSE; -+ verbosity = CK_NORMAL; - else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0) - verbosity = CK_SILENT; -+ else if (strcmp(opt, "-vv") == 0 || strcmp(opt, "--extra-verbose") == 0) -+ verbosity = CK_VERBOSE; - else { - fprintf(stderr, "runtests: unknown option '%s'\n", opt); - return 2; --- -2.17.1
meta/recipes-core/expat/expat_2.3.0.bb renamed from meta/recipes-core/expat/expat_2.2.10.bb +3 -4
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ - file://run-ptest \ - file://0001-Add-output-of-tests-result.patch \ - " + file://run-ptest \ + " -SRC_URI[sha256sum] = "b2c160f1b60e92da69de8e12333096aeb0c3bf692d41c60794de278af72135a5" +SRC_URI[sha256sum] = "f122a20eada303f904d5e0513326c5b821248f2d4d2afbf5c6f1339e511c0586" EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF"
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 06/61] expat: upgrade 2.2.10 -> 2.3.0
Quoted 25 lines · Alexander Kanavin
Drop 0001-Add-output-of-tests-result.patch
(difficult to rebase).Signed-off-by Alexander Kanavin <[email protected]>---
.../0001-Add-output-of-tests-result.patch | 83 -------------------
.../expat/{expat_2.2.10.bb => expat_2.3.0.bb} | 7 +-2 files changed, 3 insertions(+), 87 deletions(-)delete mode 100644
meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patchrename meta/recipes-core/expat/{expat_2.2.10.bb => expat_2.3.0.bb} (81%)meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch deleted +0
-8@@ -1,83 +0,0 @@ -From aa84835a00bfd65e784d58411e76f60658e939dc Mon Sep 17 00:00:00 2001 -From: Oleksandr Popovych <[email protected]> -Date: Tue, 18 Feb 2020 19:04:55 +0200 -Subject: [PATCH] Add output of tests result - -Added console output of testing results in form 'RESULT: TEST_NAME'. - -Changed verbose mode of test application set by '-v' ('--verbose')
meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch line 18
Quoted 10 lines
meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch deleted +0
-10-argument to CK_NORMAL. -Added new supported argument '-vv' ('--extra-verbose') that changes -verbose mode of test application to CK_VERBOSE. Results of each test -are shown in output only if this mode is set. - -Upstream-Status: Denied - -This patch changes potentially deprecated feature that shoud be changed -in upstream. [https://github.com/libexpat/libexpat/issues/382] -
Doesn't removing this degrade the accuracy of the ptest reporting?
Cheers,
Richard
Re: [OE-core] [PATCH 06/61] expat: upgrade 2.2.10 -> 2.3.0
Quoted 2 lines · Richard Purdie
Doesn't removing this degrade the accuracy of the ptest reporting?
I'll check the outputs before and after.
Alex
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core] [PATCH 06/61] expat: upgrade 2.2.10 -> 2.3.0
Quoted 8 lines · Alexander Kanavin via lists.openembedded.org
Quoted 2 lines · Richard Purdie
Doesn't removing this degrade the accuracy of the ptest reporting?
I'll check the outputs before and after.
Right. There are no outputs either before or after: ptest support was added to the recipe, but never included into either fast or slow set in ptests-packagelists.inc.
http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=master-next&id=147db377
So it's unknown if it even works at all or ever did. I've CCd the author, so that he can complete the work, and rebase any needed patches, until then I guess we can take the update as is?
Alex
PATCH 7/61 glib-2.0: update 2.68.0 -> 2.68.1
In reply to Alexander Kanavin---
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 6 ++----
.../glib-2.0/{glib-2.0_2.68.0.bb => glib-2.0_2.68.1.bb} | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.68.0.bb => glib-2.0_2.68.1.bb} (96%)meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +2 -4
@@ -1,4 +1,4 @@ -From 011c9f024b6475d31e7d5432a38d00fb67eaea40 Mon Sep 17 00:00:00 2001 +From ff790dd7086e28896f8e7630135f756cc6f06c80 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -13,6 +13,7 @@ Signed-off-by: Ross Burton <[email protected]> Port patch to 2.48 Signed-off-by: Jussi Kukkonen <[email protected]> + --- gio/giomodule.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
@@ -47,6 +48,3 @@ index ca1daf2..954a250 100644 #endif } --- -2.25.1 -
meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.68.0.bb +1 -1
@@ -20,7 +20,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea" +SRC_URI[sha256sum] = "241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON.
Signature · 1 line
2.31.1
PATCH 8/61 gnu-config: update to latest revision
In reply to Alexander Kanavin--- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config_git.bb +2 -2
@@ -9,8 +9,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "6faca61810d335c7837f320733fe8e15a1431fc2" -PV = "20210125+git${SRCPV}" +SRCREV = "277b4ed1776f721145b2649d888f1deb445fecc5" +PV = "20210424+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in"
Signature · 1 line
2.31.1
PATCH 9/61 dpkg: update 1.20.7.1 -> 1.20.9
In reply to Alexander Kanavin---
.../dpkg/{dpkg_1.20.7.1.bb => dpkg_1.20.9.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/dpkg/{dpkg_1.20.7.1.bb => dpkg_1.20.9.bb} (93%)meta/recipes-devtools/dpkg/dpkg_1.20.9.bb renamed from meta/recipes-devtools/dpkg/dpkg_1.20.7.1.bb +2 -2
@@ -1,7 +1,7 @@ require dpkg.inc LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=sid \ +SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20.x \ file://noman.patch \ file://remove-tar-no-timestamp.patch \ file://arch_pm.patch \
@@ -19,6 +19,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=sid \ SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "667bf0aeb92e0e7bb225ee273569c5e2389083bd" +SRCREV = "2177b782b16e77e97c9643961a5ae3c639bcc4a3" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 10/61 cmake: update 3.19.5 -> 3.20.1
In reply to Alexander KanavinRemove 0002-cmake-Prevent-the-detection-of-Qt5.patch (patch purpose and failing scenarios unclear; disabling is better done through configuration options which are available for all of these items).
License-Update: copyright years
---
...ative_3.19.5.bb => cmake-native_3.20.1.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 5 +-
...stem-use-oe-environment-vars-to-load.patch | 2 +-
...2-cmake-Prevent-the-detection-of-Qt5.patch | 122 ------------------
.../{cmake_3.19.5.bb => cmake_3.20.1.bb} | 0
5 files changed, 3 insertions(+), 126 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.19.5.bb => cmake-native_3.20.1.bb} (100%)
delete mode 100644 meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
rename meta/recipes-devtools/cmake/{cmake_3.19.5.bb => cmake_3.20.1.bb} (100%)meta/recipes-devtools/cmake/cmake-native_3.20.1.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.19.5.bb +0 -0
meta/recipes-devtools/cmake/cmake.inc +2 -3
@@ -10,19 +10,18 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=31023e1d3f51ca90a58f55bcee8e2339 \ file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ " CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ - file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce" +SRC_URI[sha256sum] = "3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +1 -1
@@ -1,4 +1,4 @@ -From 66d5b27dc37ef6243f6549e16d0285ba6c064a6e Mon Sep 17 00:00:00 2001 +From ac9b8d316ff3e013bc9d3c063db99aa1f064ce6a Mon Sep 17 00:00:00 2001 From: Cody P Schafer <[email protected]> Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch deleted +0 -122
122 lines not on this page · raw message
meta/recipes-devtools/cmake/cmake_3.20.1.bb renamed from meta/recipes-devtools/cmake/cmake_3.19.5.bb +0 -0
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 10/61] cmake: update 3.19.5 -> 3.20.1
before we remove it, lets hear a Review from Otavio and perhaps he has better history with this patch
Quoted 198 lines · Alexander Kanavin
Remove 0002-cmake-Prevent-the-detection-of-Qt5.patch (patch purpose and failing scenarios unclear; disabling is better done through configuration options which are available for all of these items).
License-Update: copyright years
Signed-off-by Alexander Kanavin <[email protected]>--- ...ative_3.19.5.bb => cmake-native_3.20.1.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 5 +- ...stem-use-oe-environment-vars-to-load.patch | 2 +- ...2-cmake-Prevent-the-detection-of-Qt5.patch | 122 ------------------ .../{cmake_3.19.5.bb => cmake_3.20.1.bb} | 0 5 files changed, 3 insertions(+), 126 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.19.5.bb => cmake-native_3.20.1.bb} (100%) delete mode 100644 meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch rename meta/recipes-devtools/cmake/{cmake_3.19.5.bb => cmake_3.20.1.bb} (100%)meta/recipes-devtools/cmake/cmake-native_3.20.1.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.19.5.bb +0
-0meta/recipes-devtools/cmake/cmake.inc +2
-3@@ -10,19 +10,18 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=31023e1d3f51ca90a58f55bcee8e2339 \ file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ " CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ - file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce" +SRC_URI[sha256sum] = "3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +1
-1@@ -1,4 +1,4 @@ -From 66d5b27dc37ef6243f6549e16d0285ba6c064a6e Mon Sep 17 00:00:00 2001 +From ac9b8d316ff3e013bc9d3c063db99aa1f064ce6a Mon Sep 17 00:00:00 2001 From: Cody P Schafer <[email protected]> Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load defaultmeta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch deleted +0
-122@@ -1,122 +0,0 @@ -From 98abade8cc119e076e4c5f1461c5188f6d49c1d8 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <[email protected]> -Date: Wed, 17 Jan 2018 10:02:14 -0200 -Subject: [PATCH] cmake: Prevent the detection of Qt5 - -Organization: O.S. Systems Software LTDA. - -CMake doesn't have dependency on qt4/qt5, so these tests usually fail -but still can cause undeterministic results or build failures (when -OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed -while running the test in cmake) - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Otavio Salvador <[email protected]> - ---- - Source/QtDialog/CMakeLists.txt | 2 +- - Tests/CMakeLists.txt | 2 +- - Tests/Qt4And5Automoc/CMakeLists.txt | 4 ++-- - Tests/QtAutogen/AutogenGuiTest.cmake | 3 +-- - Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +- - Tests/RunCMake/CMakeLists.txt | 2 +- - Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +- - 7 files changed, 8 insertions(+), 9 deletions(-) - -diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt -index 452a303..d0a9fb4 100644 ---- a/Source/QtDialog/CMakeLists.txt -+++ b/Source/QtDialog/CMakeLists.txt -@@ -3,7 +3,7 @@ - - project(QtDialog) - CMake_OPTIONAL_COMPONENT(cmake-gui) --find_package(Qt5Widgets REQUIRED) -+#find_package(Qt5Widgets REQUIRED) - - set(CMake_QT_EXTRA_LIBRARIES) - -diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index 1fb47cb..e022229 100644 ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -251,7 +251,7 @@ if(BUILD_TESTING) - set(CMake_TEST_Qt5 1) - endif() - if(CMake_TEST_Qt5) -- find_package(Qt5Widgets QUIET NO_MODULE) -+ #find_package(Qt5Widgets QUIET NO_MODULE) - endif() - - if(NOT CMake_TEST_EXTERNAL_CMAKE) -diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt -index ad74961..a9dd74b 100644 ---- a/Tests/Qt4And5Automoc/CMakeLists.txt -+++ b/Tests/Qt4And5Automoc/CMakeLists.txt -@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12) - project(Qt4And5Automoc) - - if (QT_REVERSE_FIND_ORDER) -- find_package(Qt5Core REQUIRED) -+ #find_package(Qt5Core REQUIRED) - find_package(Qt4 REQUIRED) - else() - find_package(Qt4 REQUIRED) -- find_package(Qt5Core REQUIRED) -+ #find_package(Qt5Core REQUIRED) - endif() - - set(CMAKE_AUTOMOC ON) -diff --git a/Tests/QtAutogen/AutogenGuiTest.cmake b/Tests/QtAutogen/AutogenGuiTest.cmake -index b76d341..a6e0acb 100644 ---- a/Tests/QtAutogen/AutogenGuiTest.cmake -+++ b/Tests/QtAutogen/AutogenGuiTest.cmake -@@ -22,8 +22,7 @@ if (QT_TEST_VERSION EQUAL 4) - endmacro() - - elseif(QT_TEST_VERSION EQUAL 5) -- -- find_package(Qt5Widgets REQUIRED) -+ #find_package(Qt5Widgets REQUIRED) - - set(QT_QTCORE_TARGET Qt5::Core) - set(QT_LIBRARIES Qt5::Widgets) -diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt -index c08efc4..87e25d9 100644 ---- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt -+++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt -@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) - project(MacOsFW) - include("../AutogenGuiTest.cmake") - --find_package(Qt5Test REQUIRED) -+#find_package(Qt5Test REQUIRED) - - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) -diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt -index 370dd76..6bacbff 100644 ---- a/Tests/RunCMake/CMakeLists.txt -+++ b/Tests/RunCMake/CMakeLists.txt -@@ -473,7 +473,7 @@ if(NOT WIN32) - endif () - - find_package(Qt4 QUIET) --find_package(Qt5Core QUIET) -+#find_package(Qt5Core QUIET) - if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) - add_RunCMake_test(IncompatibleQt) - endif() -diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake -index 4fccdc4..b76e1e5 100644 ---- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake -+++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake -@@ -1,6 +1,6 @@ - - find_package(Qt4 REQUIRED) --find_package(Qt5Core REQUIRED) -+#find_package(Qt5Core REQUIRED) - - add_executable(mainexe main.cpp) - target_link_libraries(mainexe Qt4::QtCore Qt5::Core)meta/recipes-devtools/cmake/cmake_3.20.1.bb renamed from meta/recipes-devtools/cmake/cmake_3.19.5.bb +0
-1--2.31.1
Re: [OE-core] [PATCH 10/61] cmake: update 3.19.5 -> 3.20.1
Hello,
Em qua., 5 de mai. de 2021 às 15:35, Khem Raj <[email protected]> escreveu:
Quoted 10 lines
before we remove it, lets hear a Review from Otavio and perhaps he has better history with this patch
Quoted 5 lines · Alexander Kanavin
Remove 0002-cmake-Prevent-the-detection-of-Qt5.patch (patch purpose and failing scenarios unclear; disabling is better done through configuration options which are available for all of these items).
Try build it on a host with Qt to see if it fails. This is what comes to my mind. I don't recall the details as it was done in 2018 ... gosh, I am getting old.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Re: [OE-core] [PATCH 10/61] cmake: update 3.19.5 -> 3.20.1
It's actually from 2013, see:
https://github.com/meta-qt5/meta-qt5/commit/671313d0b5e09e0b49a90ed944cd33fb3d6457b0
it had couple iterations in meta-qt5 before it was moved to oe-core in:
https://github.com/meta-qt5/meta-qt5/commit/17f240df
http://git.openembedded.org/openembedded-core/commit/?h=daisy&id=4f2dee0d8c2c3f60cb8f8021343e973cae31fc50
as bunch of sed calls which were later changed to a .patch in 2018
http://git.openembedded.org/openembedded-core/commit/?id=9e58926f1cea9d5cb18cb923855d1ae98f88a8ac
Now with RSS this shouldn't be so big issue, that rebuilding cmake-native after qtbase-native won't suddenly detect Qt support for CMake, but it should be tested on host with Qt5 installed to make sure it's not detected from host and stays explicitly disabled (maybe there is a flag for that nowadays - I didn't check in last 8 years :)).
Quoted 28 lines · Otavio Salvador
Hello,
Em qua., 5 de mai. de 2021 às 15:35, Khem Raj <[email protected]> escreveu:
Quoted 5 lines
before we remove it, lets hear a Review from Otavio and perhaps he has better history with this patch
On Wed, May 5, 2021 at 8:19 AM Alexander Kanavin <[email protected]>
Quoted 5 lines · wrote:
Quoted 5 lines
Remove 0002-cmake-Prevent-the-detection-of-Qt5.patch (patch purpose and failing scenarios unclear; disabling is better done through configuration options which are available for all of these items).
Try build it on a host with Qt to see if it fails. This is what comes to my mind. I don't recall the details as it was done in 2018 ... gosh, I am getting old.
--
Otavio SalvadorO.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Re: [OE-core] [PATCH 10/61] cmake: update 3.19.5 -> 3.20.1
Quoted 10 lines · Martin Jansa
It's actually from 2013, see:
https://github.com/meta-qt5/meta-qt5/commit/671313d0b5e09e0b49a90ed944cd33fb3d6457b0
it had couple iterations in meta-qt5 before it was moved to oe-core in:
https://github.com/meta-qt5/meta-qt5/commit/17f240dfhttp://git.openembedded.org/openembedded-core/commit/?h=daisy&id=4f2dee0d8c2c3f60cb8f8021343e973cae31fc50
as bunch of sed calls which were later changed to a .patch in 2018
Quoted 8 lines
http://git.openembedded.org/openembedded-core/commit/?id=9e58926f1cea9d5cb18cb923855d1ae98f88a8ac
Now with RSS this shouldn't be so big issue, that rebuilding cmake-native after qtbase-native won't suddenly detect Qt support for CMake, but it should be tested on host with Qt5 installed to make sure it's not detected from host and stays explicitly disabled (maybe there is a flag for that nowadays - I didn't check in last 8 years :)).
Thanks for the context Martin I think host intrusion is a valid point although perhaps less of a chance
Quoted 31 lines
Quoted 28 lines · Otavio Salvador
Hello,
Em qua., 5 de mai. de 2021 às 15:35, Khem Raj <[email protected]> escreveu:
Quoted 5 lines
before we remove it, lets hear a Review from Otavio and perhaps he has better history with this patch
On Wed, May 5, 2021 at 8:19 AM Alexander Kanavin <
Quoted 5 lines · [email protected]> wrote:
Quoted 5 lines
Remove 0002-cmake-Prevent-the-detection-of-Qt5.patch (patch purpose and failing scenarios unclear; disabling is better done through configuration options which are available for all of these items).
Try build it on a host with Qt to see if it fails. This is what comes to my mind. I don't recall the details as it was done in 2018 ... gosh, I am getting old.
--
Otavio SalvadorO.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
PATCH 11/61 meson: update 0.57.1 -> 0.57.2
In reply to Alexander Kanavin---
meta/recipes-devtools/meson/meson.inc | 4 +--
.../0001-Make-CPU-family-warnings-fatal.patch | 2 +-
...ectly-set-uid-gid-of-installed-files.patch | 28 -------------------
...pport-building-allarch-recipes-again.patch | 2 +-
.../{meson_0.57.1.bb => meson_0.57.2.bb} | 0
...on_0.57.1.bb => nativesdk-meson_0.57.2.bb} | 0
6 files changed, 3 insertions(+), 33 deletions(-)
delete mode 100644 meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch
rename meta/recipes-devtools/meson/{meson_0.57.1.bb => meson_0.57.2.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.57.1.bb => nativesdk-meson_0.57.2.bb} (100%)meta/recipes-devtools/meson/meson.inc +1 -3
@@ -14,10 +14,9 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://disable-rpath-handling.patch \ file://cross-prop-default.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ - file://0001-minstall-Correctly-set-uid-gid-of-installed-files.patch \ file://gi-target-dep.patch \ " -SRC_URI[sha256sum] = "72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6" +SRC_URI[sha256sum] = "3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \
@@ -25,7 +24,6 @@ SRC_URI_append_class-native = " \ " # remove at next version upgrade or when output changes -PR = "r1" HASHEQUIV_HASH_VERSION .= ".1" UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +1 -1
@@ -1,4 +1,4 @@ -From 76934bcbf2cfa7304e8864e28c51f58adda0392f Mon Sep 17 00:00:00 2001 +From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal
meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 3f6f4964dc79ae986f44afe1687922381f237edd Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <[email protected]> -Date: Wed, 3 Mar 2021 12:47:28 +0100 -Subject: [PATCH] minstall: Correctly set uid/gid of installed files - -In commit caab4d3d, the uid and gid arguments passed to os.chown() by -set_chown() were accidentally swapped, causing files to end up with -incorrect owner/group if the owner and group are not the same. - -Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/6226ac26ef63335bfb817db02b3f295c78214a82] -Signed-off-by: Peter Kjellerstedt <[email protected]> ---- - mesonbuild/minstall.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 785ff5869..07da408aa 100644 ---- a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -148,7 +148,7 @@ def set_chown(path: str, user: T.Optional[str] = None, group: T.Optional[str] = - Use a real function rather than a lambda to help mypy out. Also real - functions are faster. - """ -- real_os_chown(path, gid, uid, dir_fd=dir_fd, follow_symlinks=follow_symlinks) -+ real_os_chown(path, uid, gid, dir_fd=dir_fd, follow_symlinks=follow_symlinks) - - try: - os.chown = chown
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
@@ -1,4 +1,4 @@ -From 6efb6114836fd4a1e012aa03b37f3beeeb22b466 Mon Sep 17 00:00:00 2001 +From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <[email protected]> Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again
meta/recipes-devtools/meson/meson_0.57.2.bb renamed from meta/recipes-devtools/meson/meson_0.57.1.bb +0 -0
meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb +0 -0
Signature · 1 line
2.31.1
PATCH 12/61 systemd: backport a patch to avoid unnecessary rsync dependency with latest meson
In reply to Alexander Kanavin--- ...d25119a495009ea62f79e5daec34cc464628.patch | 53 +++++++++++++++++++ meta/recipes-core/systemd/systemd.inc | 4 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch
meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch new file +53 -0
@@ -0,0 +1,53 @@ +From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]> +Date: Mon, 12 Apr 2021 14:03:32 +0200 +Subject: [PATCH] meson: do not fail if rsync is not installed with meson + 0.57.2 + +https://github.com/mesonbuild/meson/issues/8641 + +Our CI started to fail. Even if the change is reverted in meson, +we need a quick workaround here. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + man/meson.build | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/man/meson.build b/man/meson.build +index 3cae8446cda..f9c4b83dc81 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -184,17 +184,20 @@ html = custom_target( + depends : html_pages, + command : ['echo']) + +-run_target( +- 'doc-sync', +- depends : man_pages + html_pages, +- command : ['rsync', '-rlv', +- '--delete-excluded', +- '--include=man', +- '--include=*.html', +- '--exclude=*', +- '--omit-dir-times', +- meson.current_build_dir(), +- get_option('www-target')]) ++rsync = find_program('rsync', required : false) ++if rsync.found() ++ run_target( ++ 'doc-sync', ++ depends : man_pages + html_pages, ++ command : [rsync, '-rlv', ++ '--delete-excluded', ++ '--include=man', ++ '--include=*.html', ++ '--exclude=*', ++ '--omit-dir-times', ++ meson.current_build_dir(), ++ get_option('www-target')]) ++endif + + ############################################################ +
meta/recipes-core/systemd/systemd.inc +3 -1
@@ -16,6 +16,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ SRCREV = "17472dca0160cbe7b807ca648475fd70d0d62fe5" SRCBRANCH = "v247-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ + file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ +" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 12/61] systemd: backport a patch to avoid unnecessary rsync dependency with latest meson
Quoted 72 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...d25119a495009ea62f79e5daec34cc464628.patch | 53 +++++++++++++++++++ meta/recipes-core/systemd/systemd.inc | 4 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patchmeta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch new file +53
-0@@ -0,0 +1,53 @@ +From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]> +Date: Mon, 12 Apr 2021 14:03:32 +0200 +Subject: [PATCH] meson: do not fail if rsync is not installed with meson + 0.57.2 + +https://github.com/mesonbuild/meson/issues/8641 + +Our CI started to fail. Even if the change is reverted in meson, +we need a quick workaround here. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + man/meson.build | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/man/meson.build b/man/meson.build +index 3cae8446cda..f9c4b83dc81 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -184,17 +184,20 @@ html = custom_target( + depends : html_pages, + command : ['echo']) + +-run_target( +- 'doc-sync', +- depends : man_pages + html_pages, +- command : ['rsync', '-rlv', +- '--delete-excluded', +- '--include=man', +- '--include=*.html', +- '--exclude=*', +- '--omit-dir-times', +- meson.current_build_dir(), +- get_option('www-target')]) ++rsync = find_program('rsync', required : false) ++if rsync.found() ++ run_target( ++ 'doc-sync', ++ depends : man_pages + html_pages, ++ command : [rsync, '-rlv', ++ '--delete-excluded', ++ '--include=man', ++ '--include=*.html', ++ '--exclude=*', ++ '--omit-dir-times', ++ meson.current_build_dir(), ++ get_option('www-target')]) ++endif + + ############################################################ +meta/recipes-core/systemd/systemd.inc +0
-0
meta/recipes-core/systemd/systemd.inc LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ · line 21
Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +3
-1@@ -16,6 +16,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ SRCREV = "17472dca0160cbe7b807ca648475fd70d0d62fe5" SRCBRANCH = "v247-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ + file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ +"
the patch should be added in systemd_247.6.bb
Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0
-1S = "${WORKDIR}/git" --2.31.1
PATCH 13/61 pulseaudio: unbreak build with latest meson
In reply to Alexander Kanavin--- ...ild-remove-dependency-on-doxygen-bin.patch | 26 +++++++++++++++++++ .../pulseaudio/pulseaudio_14.2.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch
meta/recipes-multimedia/pulseaudio/pulseaudio/0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 4ee244d0824e772ab35abb0f9df5e8088e16fc5d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 26 Apr 2021 19:30:40 +0200 +Subject: [PATCH] doxygen/meson.build: remove dependency on doxygen binary + +New meson refuses to complete confuguration if doxygen is absent +even if this target is never actually run. As we never run it, +let's remove it, until upstream and/or meson figure out that it's +optional and should be treated as such. + +Upstream-Status: Inappropriate [needs proper upstream fix] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + doxygen/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/doxygen/meson.build b/doxygen/meson.build +index afc0e49..df55c83 100644 +--- a/doxygen/meson.build ++++ b/doxygen/meson.build +@@ -6,5 +6,3 @@ doxygen_conf = configure_file( + configuration : cdata, + ) + +-run_target('doxygen', +- command : ['doxygen', doxygen_conf])
meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb +1 -0
@@ -6,6 +6,7 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch \ file://0001-meson-Check-for-__get_cpuid.patch \ file://volatiles.04_pulse \ + file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ " SRC_URI[md5sum] = "1efc916251910f1e9d4df7810e3e69f8" SRC_URI[sha256sum] = "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1"
Signature · 1 line
2.31.1
PATCH 14/61 libdnf: upgrade 0.58.0 -> 0.62.0
In reply to Alexander Kanavin---
...h-avoid-the-use-of-non-portable-__WORD.patch | 17 ++++++++++-------
.../{libdnf_0.58.0.bb => libdnf_0.62.0.bb} | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
rename meta/recipes-devtools/libdnf/{libdnf_0.58.0.bb => libdnf_0.62.0.bb} (97%)meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch +10 -7
@@ -1,23 +1,26 @@ -From 8aa5402393fabaf4fff51be3af4868e8dfab6da7 Mon Sep 17 00:00:00 2001 +From fc0b81bb717db3f41513f09f6661676a7aea6dd4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 9 Mar 2021 19:30:42 +0000 Subject: [PATCH] libdnf/config.h: avoid the use of non-portable __WORDSIZE Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1159] Signed-off-by: Alexander Kanavin <[email protected]> + --- - libdnf/config.h | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) + libdnf/config.h | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libdnf/config.h b/libdnf/config.h -index 16121f6f..2925923e 100644 +index 01b330b4..dbd53f5e 100644 --- a/libdnf/config.h +++ b/libdnf/config.h -@@ -18,12 +18,10 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ +@@ -20,14 +20,11 @@ + #ifdef __APPLE__ + #include <stdint.h> +-#else -#include <bits/wordsize.h> + #endif +#include <limits.h> -#if __WORDSIZE == 32
meta/recipes-devtools/libdnf/libdnf_0.62.0.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.58.0.bb +1 -1
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \ " -SRCREV = "85278894f21bc1957dc47a2a09ddacf59bc3cda8" +SRCREV = "9a0e17562b19586b3ffa70fa93eb961b558794c7" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 15/61 bluez5: upgrade 5.56 -> 5.58
In reply to Alexander Kanavin---
meta/recipes-connectivity/bluez5/bluez5.inc | 1 +
....am-add-missing-mkdir-for-ell-shared.patch | 25 +++++++++++++++++++
.../bluez5/{bluez5_5.56.bb => bluez5_5.58.bb} | 3 +--
3 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch
rename meta/recipes-connectivity/bluez5/{bluez5_5.56.bb => bluez5_5.58.bb} (91%)meta/recipes-connectivity/bluez5/bluez5.inc +1 -0
@@ -53,6 +53,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ file://0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch \ + file://0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch \ " S = "${WORKDIR}/bluez-${PV}"
meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch new file +25 -0
@@ -0,0 +1,25 @@ +From d341ba650af1b7068d9ad034732b4f41b91bb2c1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Sun, 25 Apr 2021 18:56:41 +0200 +Subject: [PATCH] Makefile.am: add missing mkdir for ell/shared + +This addresses build errors out of source tree. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index be5d5c7..72ad425 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -623,6 +623,7 @@ lib/bluetooth/%.h: lib/%.h + $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@ + + ell/shared: Makefile ++ $(AM_V_at)$(MKDIR_P) ell + $(AM_V_GEN)for f in $(ell_shared) ; do \ + if [ ! -f $$f ] ; then \ + $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
meta/recipes-connectivity/bluez5/bluez5_5.58.bb renamed from meta/recipes-connectivity/bluez5/bluez5_5.56.bb +1 -2
@@ -1,7 +1,6 @@ require bluez5.inc -SRC_URI[md5sum] = "e6c51b2aefa7c56ff072819a78611fa5" -SRC_URI[sha256sum] = "59c4dba9fc8aae2a6a5f8f12f19bc1b0c2dc27355c7ca3123eed3fe6bd7d0b9d" +SRC_URI[sha256sum] = "c8065e75a5eb67236849ef68a354b1700540305a8c88ef0a0fd6288f19daf1f1" # noinst programs in Makefile.tools that are conditional on READLINE # support
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 15/61] bluez5: upgrade 5.56 -> 5.58
Quoted 5 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-connectivity/bluez5/bluez5.inc | 1 + ....am-add-missing-mkdir-for-ell-shared.patch | 25 +++++++++++++++++++
see this https://lists.01.org/hyperkitty/list/[email protected]/message/SYX6Z7SUQHU7UWM6ECZTTJ6SPODIS6KB/
Quoted 70 lines
.../bluez5/{bluez5_5.56.bb => bluez5_5.58.bb} | 3 +-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch rename meta/recipes-connectivity/bluez5/{bluez5_5.56.bb => bluez5_5.58.bb} (91%)meta/recipes-connectivity/bluez5/bluez5.inc +1
-0@@ -53,6 +53,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ file://0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch \ + file://0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch \ " S = "${WORKDIR}/bluez-${PV}"meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch new file +25
-0@@ -0,0 +1,25 @@ +From d341ba650af1b7068d9ad034732b4f41b91bb2c1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Sun, 25 Apr 2021 18:56:41 +0200 +Subject: [PATCH] Makefile.am: add missing mkdir for ell/shared + +This addresses build errors out of source tree. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index be5d5c7..72ad425 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -623,6 +623,7 @@ lib/bluetooth/%.h: lib/%.h + $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@ + + ell/shared: Makefile ++ $(AM_V_at)$(MKDIR_P) ell + $(AM_V_GEN)for f in $(ell_shared) ; do \ + if [ ! -f $$f ] ; then \ + $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \meta/recipes-connectivity/bluez5/bluez5_5.58.bb renamed from meta/recipes-connectivity/bluez5/bluez5_5.56.bb +1
-3@@ -1,7 +1,6 @@ require bluez5.inc -SRC_URI[md5sum] = "e6c51b2aefa7c56ff072819a78611fa5" -SRC_URI[sha256sum] = "59c4dba9fc8aae2a6a5f8f12f19bc1b0c2dc27355c7ca3123eed3fe6bd7d0b9d" +SRC_URI[sha256sum] = "c8065e75a5eb67236849ef68a354b1700540305a8c88ef0a0fd6288f19daf1f1" # noinst programs in Makefile.tools that are conditional on READLINE # support --2.31.1
PATCH 16/61 libxkbcommon: update 1.0.3 -> 1.2.1
In reply to Alexander Kanavin---
.../xorg-lib/{libxkbcommon_1.0.3.bb => libxkbcommon_1.2.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/xorg-lib/{libxkbcommon_1.0.3.bb => libxkbcommon_1.2.1.bb} (92%)meta/recipes-graphics/xorg-lib/libxkbcommon_1.2.1.bb renamed from meta/recipes-graphics/xorg-lib/libxkbcommon_1.0.3.bb +1 -1
@@ -9,7 +9,7 @@ DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "a2202f851e072b84e64a395212cbd976ee18a8ee602008b0bad02a13247dbc52" +SRC_URI[sha256sum] = "e833a7d3024c9bb9d5eb2b20f6d5de08865541f21bb7ba227c83cbd236691fb3" UPSTREAM_CHECK_URI = "http://xkbcommon.org/"
Signature · 1 line
2.31.1
PATCH 17/61 libgudev: update 234 -> 236
In reply to Alexander KanavinConvert to meson.
---
...01-gudevenumtypes-make-deterministic.patch | 44 +++++++++++++++++++
.../{libgudev_234.bb => libgudev_236.bb} | 12 +++--
2 files changed, 53 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch
rename meta/recipes-gnome/libgudev/{libgudev_234.bb => libgudev_236.bb} (70%)meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch new file +44 -0
@@ -0,0 +1,44 @@ +From 078c0db2bc3adf7c665190ee7a9263d7fd1ec618 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 29 Apr 2021 13:06:12 +0200 +Subject: [PATCH] gudevenumtypes: make deterministic + +@filename@ writes the full path to the generated file, +which can vary in CI systems and make outputs non-reproducible. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/15] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + gudev/gudevenumtypes.c.template | 2 +- + gudev/gudevenumtypes.h.template | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gudev/gudevenumtypes.c.template b/gudev/gudevenumtypes.c.template +index fc30b39..4918f7e 100644 +--- a/gudev/gudevenumtypes.c.template ++++ b/gudev/gudevenumtypes.c.template +@@ -4,7 +4,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/gudev/gudevenumtypes.h.template b/gudev/gudevenumtypes.h.template +index d0ab339..79bf7c4 100644 +--- a/gudev/gudevenumtypes.h.template ++++ b/gudev/gudevenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.30.2 +
meta/recipes-gnome/libgudev/libgudev_236.bb renamed from meta/recipes-gnome/libgudev/libgudev_234.bb +9 -3
@@ -5,18 +5,24 @@ other programming languages, such as Javascript, because of GObject \ introspection support." HOMEPAGE = "https://wiki.gnome.org/Projects/libgudev" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libgudev/issues" -SRC_URI[archive.sha256sum] = "1baeacacf0db42fa073ad5183d1decce9317857416a2b0f82ce3370d711a2e37" +SRC_URI[archive.sha256sum] = "e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524" -DEPENDS = "glib-2.0 udev" +SRC_URI_append = " file://0001-gudevenumtypes-make-deterministic.patch" -EXTRA_OECONF = "--disable-umockdev" +DEPENDS = "glib-2.0 udev" RCONFLICTS_${PN} = "systemd (<= 220)" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +GTKDOC_MESON_OPTION = "gtk_doc" + UPSTREAM_CHECK_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgudev/" UPSTREAM_CHECK_REGEX = "(?P<pver>(\d+))"
Signature · 1 line
2.31.1
PATCH 18/61 puzzes: update to latest revision
In reply to Alexander KanavinConvert to cmake, drop all the unneeded cruft from the recipe.
License-Update: additional contributors
--- ...rmat-overflow-if-the-compiler-suppor.patch | 32 ---------------- meta/recipes-sato/puzzles/puzzles_git.bb | 38 +++---------------- 2 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch
meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 337799e40350b3db2441cc98f65ec36a74dfb356 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 21 Apr 2017 12:18:08 -0700 -Subject: [PATCH] Use -Wno-error=format-overflow= if the compiler supports it - -we need this warning to be suppressed with gcc7+ -however older compilers dont support it so we need -a way to disble it only if compiler supports it - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3a38c95..bb9035e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -42,7 +42,7 @@ fi - if test "x$GCC" = "xyes"; then - AC_MSG_CHECKING([for usable gcc warning flags]) - gccwarningflags= -- for flag in -Wall -Werror -std=c89 -pedantic; do -+ for flag in -Wall -Werror -std=c89 -pedantic -Wno-error=format-overflow=; do - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS" --- -2.12.2 -
meta/recipes-sato/puzzles/puzzles_git.bb +5 -33
@@ -2,17 +2,14 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection" DESCRIPTION = "Collection of small computer programs which implement one-player puzzle games." HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=6099f4981f9461d7f411091e69a7f07a" +LIC_FILES_CHKSUM = "file://LICENCE;md5=93c2525113e094a4a744cf14d4de07e2" -DEPENDS = "libxt" - -# The libxt requires x11 in DISTRO_FEATURES +# gtk support includes a bunch of x11 headers REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ file://fix-compiling-failure-with-option-g-O.patch \ file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ - file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ file://0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch \ file://fix-ki-uninitialized.patch \ file://0001-malloc-Check-for-excessive-values-to-malloc.patch \
@@ -20,27 +17,15 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "84cb4c6701e027090ff3fd955ce08065e20121b2" +SRCREV = "c0da615a933a6676e2c6b957368067ca1bc10abd" PE = "2" PV = "0.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit autotools features_check pkgconfig - -PACKAGECONFIG ??= "gtk3" -PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+," -PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3," - -CFLAGS_append = " -Wno-deprecated-declarations" - -ASNEEDED = "" +inherit cmake features_check pkgconfig -do_configure_prepend () { - cd ${S} - ./mkfiles.pl - cd ${B} -} +DEPENDS += "gtk+3" do_install_append () { # net conflicts with Samba, so rename it
@@ -68,16 +53,3 @@ STOP done } -PACKAGES += "${PN}-extra" - -FILES_${PN} = "" -FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications" - -python __anonymous () { - var = d.expand("FILES_${PN}") - data = d.getVar(var, False) - for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"): - data = data + " ${bindir}/%s" % name - data = data + " ${datadir}/applications/%s.desktop" % name - d.setVar(var, data) -}
Signature · 1 line
2.31.1
PATCH 19/61 vulkan-samples: update to latest revision
In reply to Alexander Kanavin--- meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "55cebd9e7cc4153a3a7b3a45d42274c0e2a17815" +SRCREV = "a2c02a074ba3f71ea89a53fb2e2d189c87cc4af8" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 20/61 gnupg: upgrade 2.2.27 -> 2.3.1
In reply to Alexander KanavinRemove 0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch as upstream has removed the .m4 files.
Rebase other patches.
---
...ig-to-find-pth-instead-of-pth-config.patch | 105 ------------------
...-a-custom-value-for-the-location-of-.patch | 6 +-
...use-pkgconfig-instead-of-npth-config.patch | 73 +++++++-----
.../0003-dirmngr-uses-libgpg-error.patch | 17 +--
.../gnupg/gnupg/relocate.patch | 20 ++--
.../gnupg/{gnupg_2.2.27.bb => gnupg_2.3.1.bb} | 3 +-
6 files changed, 68 insertions(+), 156 deletions(-)
delete mode 100644 meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch
rename meta/recipes-support/gnupg/{gnupg_2.2.27.bb => gnupg_2.3.1.bb} (94%)meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch deleted +0 -105
@@ -1,105 +0,0 @@ -From 59a3c76d4016ffc615f1c45184f4c6820061d69c Mon Sep 17 00:00:00 2001 -From: Richard Purdie <[email protected]> -Date: Wed, 16 Aug 2017 11:14:12 +0800 -Subject: [PATCH 1/4] Use pkg-config to find pth instead of pth-config. - -Upstream-Status: Denied -[not submitted but they've been clear they don't want a pkg-config -dependency] - -RP 2014/5/22 - -Signed-off-by: Richard Purdie <[email protected]> - -Rebase to 2.1.23 -Signed-off-by: Hongxu Jia <[email protected]> ---- - m4/gnupg-pth.m4 | 53 ++++++++--------------------------------------------- - 1 file changed, 8 insertions(+), 45 deletions(-) - -diff --git a/m4/gnupg-pth.m4 b/m4/gnupg-pth.m4 -index 6dc9e0e..5892531 100644 ---- a/m4/gnupg-pth.m4 -+++ b/m4/gnupg-pth.m4 -@@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - # Taken and modified from the m4 macros which come with Pth. - AC_DEFUN([GNUPG_PTH_VERSION_CHECK], - [ -- _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'` - _req_version="ifelse([$1],,1.2.0,$1)" -+ PKG_CHECK_MODULES(PTH, [pth >= $_req_version], [have_pth=yes], [have_pth=no]) - -- AC_MSG_CHECKING(for PTH - version >= $_req_version) -- for _var in _pth_version _req_version; do -- eval "_val=\"\$${_var}\"" -- _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'` -- _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'` -- _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'` -- _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'` -- case $_rtype in -- "a" ) _rtype=0 ;; -- "b" ) _rtype=1 ;; -- "." ) _rtype=2 ;; -- esac -- _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \ -- "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"` -- eval "${_var}_hex=\"\$_hex\"" -- done -- have_pth=no -- if test ".$_pth_version_hex" != .; then -- if test ".$_req_version_hex" != .; then -- if test $_pth_version_hex -ge $_req_version_hex; then -- have_pth=yes -- fi -- fi -- fi - if test $have_pth = yes; then - AC_MSG_RESULT(yes) - AC_MSG_CHECKING([whether PTH installation is sane]) -@@ -51,9 +27,9 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], - _gnupg_pth_save_cflags=$CFLAGS - _gnupg_pth_save_ldflags=$LDFLAGS - _gnupg_pth_save_libs=$LIBS -- CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`" -- LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`" -- LIBS="$LIBS `$PTH_CONFIG --libs --all`" -+ CFLAGS="$CFLAGS $PTH_CFLAGS" -+ LDFLAGS="$LDFLAGS $PTH_LDFLAGS" -+ LIBS="$LIBS $PTH_LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h> - ], - [[ pth_init ();]])], -@@ -80,26 +56,13 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], - # PTH_CLFAGS and PTH_LIBS are AS_SUBST. - # - AC_DEFUN([GNUPG_PATH_PTH], --[ AC_ARG_WITH(pth-prefix, -- AC_HELP_STRING([--with-pth-prefix=PFX], -- [prefix where GNU Pth is installed (optional)]), -- pth_config_prefix="$withval", pth_config_prefix="") -- if test x$pth_config_prefix != x ; then -- PTH_CONFIG="$pth_config_prefix/bin/pth-config" -- fi -- AC_PATH_PROG(PTH_CONFIG, pth-config, no) -+[ - tmp=ifelse([$1], ,1.3.7,$1) -- if test "$PTH_CONFIG" != "no"; then -- GNUPG_PTH_VERSION_CHECK($tmp) -- if test $have_pth = yes; then -- PTH_CFLAGS=`$PTH_CONFIG --cflags` -- PTH_LIBS=`$PTH_CONFIG --ldflags` -- PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`" -- AC_DEFINE(HAVE_PTH, 1, -+ GNUPG_PTH_VERSION_CHECK($tmp) -+ if test $have_pth = yes; then -+ AC_DEFINE(HAVE_PTH, 1, - [Defined if the GNU Pth is available]) -- fi - fi - AC_SUBST(PTH_CFLAGS) - AC_SUBST(PTH_LIBS) - ]) -- --- -1.8.3.1 -
meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +3 -3
@@ -1,4 +1,4 @@ -From abc5c396aaddaef2e6811362e3e0cc0da28c2b34 Mon Sep 17 00:00:00 2001 +From 52ba9d34cd9317145ee8a93afd5d73dd0cbf3182 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 64cb8c6..3fe9027 100644 +index 7a2d410..14a7203 100644 --- a/configure.ac +++ b/configure.ac -@@ -1824,7 +1824,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch +45 -28
123 lines not on this page · raw message
meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch +9 -8
@@ -1,4 +1,4 @@ -From 6c75656b68cb6e38b039ae532bd39437cd6daec5 Mon Sep 17 00:00:00 2001 +From 9ace8f1b68ab708c44dce4c0152b975fbceb0398 Mon Sep 17 00:00:00 2001 From: Saul Wold <[email protected]> Date: Wed, 16 Aug 2017 11:18:01 +0800 Subject: [PATCH] dirmngr uses libgpg error
@@ -11,18 +11,19 @@ Rebase to 2.1.23 Signed-off-by: Hongxu Jia <[email protected]> --- - dirmngr/Makefile.am | 1 + - 1 file changed, 1 insertion(+) + dirmngr/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am -index 00d3c42..450d873 100644 +index 77ca3f5..1446775 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am -@@ -101,6 +101,7 @@ dirmngr_LDADD = $(libcommonpth) \ +@@ -86,7 +86,7 @@ endif + dirmngr_LDADD = $(libcommonpth) \ $(DNSLIBS) $(LIBASSUAN_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \ -+ $(GPG_ERROR_LIBS) \ - $(dirmngr_robj) +- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) ++ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) $(GPG_ERROR_LIBS) if USE_LDAP dirmngr_LDADD += $(ldaplibs) + endif
meta/recipes-support/gnupg/gnupg/relocate.patch +10 -10
@@ -1,4 +1,4 @@ -From bd66af2ac7bb6d9294ac8055a55462ba7c4f9c9b Mon Sep 17 00:00:00 2001 +From d6992692d1c36983b709fe1ff049cc91ef2c408a Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]> 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 4b6e46e..58989b4 100644 +index 85e09c4..e1410e2 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -763,7 +763,7 @@ gnupg_socketdir (void) +@@ -788,7 +788,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy;
@@ -24,7 +24,7 @@ index 4b6e46e..58989b4 100644 } return name; -@@ -789,7 +789,7 @@ gnupg_sysconfdir (void) +@@ -814,7 +814,7 @@ gnupg_sysconfdir (void) } return name; #else /*!HAVE_W32_SYSTEM*/
@@ -33,7 +33,7 @@ index 4b6e46e..58989b4 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -818,7 +818,7 @@ gnupg_bindir (void) +@@ -843,7 +843,7 @@ gnupg_bindir (void) else return rdir; #else /*!HAVE_W32_SYSTEM*/
@@ -42,7 +42,7 @@ index 4b6e46e..58989b4 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -831,7 +831,7 @@ gnupg_libexecdir (void) +@@ -856,7 +856,7 @@ gnupg_libexecdir (void) #ifdef HAVE_W32_SYSTEM return gnupg_bindir (); #else /*!HAVE_W32_SYSTEM*/
@@ -51,7 +51,7 @@ index 4b6e46e..58989b4 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -845,7 +845,7 @@ gnupg_libdir (void) +@@ -870,7 +870,7 @@ gnupg_libdir (void) name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); return name; #else /*!HAVE_W32_SYSTEM*/
@@ -60,7 +60,7 @@ index 4b6e46e..58989b4 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -859,7 +859,7 @@ gnupg_datadir (void) +@@ -884,7 +884,7 @@ gnupg_datadir (void) name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); return name; #else /*!HAVE_W32_SYSTEM*/
@@ -69,7 +69,7 @@ index 4b6e46e..58989b4 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -875,7 +875,7 @@ gnupg_localedir (void) +@@ -900,7 +900,7 @@ gnupg_localedir (void) NULL); return name; #else /*!HAVE_W32_SYSTEM*/
@@ -78,7 +78,7 @@ index 4b6e46e..58989b4 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -943,7 +943,7 @@ gnupg_cachedir (void) +@@ -971,7 +971,7 @@ gnupg_cachedir (void) } return dir; #else /*!HAVE_W32_SYSTEM*/
meta/recipes-support/gnupg/gnupg_2.3.1.bb renamed from meta/recipes-support/gnupg/gnupg_2.2.27.bb +1 -2
@@ -15,7 +15,6 @@ inherit autotools gettext texinfo pkgconfig UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch \ file://0002-use-pkgconfig-instead-of-npth-config.patch \ file://0003-dirmngr-uses-libgpg-error.patch \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
@@ -25,7 +24,7 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI_append_class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399" +SRC_URI[sha256sum] = "c498db346a9b9a4b399e514c8f56dfc0a888ce8f327f10376ff984452cd154ec" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \
Signature · 1 line
2.31.1
PATCH 21/61 virglrenderer: update 0.8.2 -> 0.9.1
In reply to Alexander KanavinDrop 0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch, issue fixed upstream.
---
...d-libc-check-to-be-platform-OS-check.patch | 36 -------------------
...nderer_0.8.2.bb => virglrenderer_0.9.1.bb} | 5 ++-
2 files changed, 2 insertions(+), 39 deletions(-)
delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch
rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.8.2.bb => virglrenderer_0.9.1.bb} (78%)meta/recipes-graphics/virglrenderer/virglrenderer/0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 3d30df8d8ccb919733b5339b2a82474305b83998 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 6 Aug 2019 01:19:48 +0000 -Subject: [PATCH] gallium: Expand libc check to be platform OS check - -endianness on musl based systems can also be detected in same way as -glibc, therefore check for __linux__ define instead of __GLIBC__ - -Fixes build on musl/mips - -| ../../../../git/src/gallium/include/pipe/p_config.h:171:2: error: #error Unknown Endianness -| #error Unknown Endianness -| ^~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - src/gallium/include/pipe/p_config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h -index d603681..71cdf49 100644 ---- a/src/gallium/include/pipe/p_config.h -+++ b/src/gallium/include/pipe/p_config.h -@@ -130,7 +130,7 @@ - * Endian detection. - */ - --#ifdef __GLIBC__ -+#ifdef __linux__ - #include <endian.h> - - #if __BYTE_ORDER == __LITTLE_ENDIAN --- -2.17.1 -
meta/recipes-graphics/virglrenderer/virglrenderer_0.9.1.bb renamed from meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb +2 -3
@@ -9,9 +9,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm virtual/libgl libepoxy" -SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" -SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ - file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ +SRCREV = "363915595e05fb252e70d6514be2f0c0b5ca312b" +SRC_URI = "git://anongit.freedesktop.org/virglrenderer;branch=branch-0.9.1 \ file://0001-meson.build-use-python3-directly-for-python.patch \ "
Signature · 1 line
2.31.1
PATCH 22/61 ffmpeg: update 4.3.2 -> 4.4
In reply to Alexander KanavinDrop mips64_cpu_detection.patch as upstream
has changed the code in a way that's difficult
to rebase.
---
.../ffmpeg/ffmpeg/mips64_cpu_detection.patch | 32 -------------------
.../ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} | 3 +-
2 files changed, 1 insertion(+), 34 deletions(-)
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} (98%)meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch deleted +0 -32
@@ -1,32 +0,0 @@ -It will add -mips64r6 and -mips64r2 to cmdline which will -cause conflicts - -in OE we user mips32r2 and mips64r2 for mips arch versions -so there is no benefit of detecting it automatically by -poking at tools especially in cross env - -Fixes errors like - -linking -mnan=2008 module with previous -mnan=legacy modules -failed to merge target specific data of file - --Khem -Upstream-Status: Inappropriate [OE-Specific] - -Index: ffmpeg-3.1.1/configure -=================================================================== ---- ffmpeg-3.1.1.orig/configure -+++ ffmpeg-3.1.1/configure -@@ -5220,12 +5220,9 @@ elif enabled mips; then - - # Enable minimum ISA based on selected options - if enabled mips64; then -- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6' - enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2' - disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64' - else -- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6' -- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5' - enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2' - disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' - fi
meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb +1 -2
@@ -24,10 +24,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ - file://mips64_cpu_detection.patch \ file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \ " -SRC_URI[sha256sum] = "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb" +SRC_URI[sha256sum] = "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 ARM_INSTRUCTION_SET_armv4 = "arm"
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 22/61] ffmpeg: update 4.3.2 -> 4.4
Quoted 5 lines · Alexander Kanavin
Drop mips64_cpu_detection.patch as upstream
has changed the code in a way that's difficult
to rebase.
Trevor was working on it and he has being trying to fix it for mips case as well. So lets leave this to him
Quoted 71 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../ffmpeg/ffmpeg/mips64_cpu_detection.patch | 32 ------------------- .../ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} | 3 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} (98%)meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch deleted +0
-32@@ -1,32 +0,0 @@ -It will add -mips64r6 and -mips64r2 to cmdline which will -cause conflicts - -in OE we user mips32r2 and mips64r2 for mips arch versions -so there is no benefit of detecting it automatically by -poking at tools especially in cross env - -Fixes errors like - -linking -mnan=2008 module with previous -mnan=legacy modules -failed to merge target specific data of file - --Khem -Upstream-Status: Inappropriate [OE-Specific] - -Index: ffmpeg-3.1.1/configure -=================================================================== ---- ffmpeg-3.1.1.orig/configure -+++ ffmpeg-3.1.1/configure -@@ -5220,12 +5220,9 @@ elif enabled mips; then - - # Enable minimum ISA based on selected options - if enabled mips64; then -- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6' - enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2' - disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64' - else -- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6' -- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5' - enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2' - disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' - fimeta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb +1
-3@@ -24,10 +24,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ - file://mips64_cpu_detection.patch \ file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \ " -SRC_URI[sha256sum] = "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb" +SRC_URI[sha256sum] = "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 ARM_INSTRUCTION_SET_armv4 = "arm" --2.31.1
Re: [OE-core] [PATCH 22/61] ffmpeg: update 4.3.2 -> 4.4
Quoted 9 lines · Khem Raj
Quoted 5 lines
Drop mips64_cpu_detection.patch as upstream
has changed the code in a way that's difficult
to rebase.Trevor was working on it and he has being trying to fix it for mips case as well. So lets leave this to him
The new version builds fine on qemumip64 (I will adjust the commit message to mention that), so unless there is a specific way to reproduce the failure that this patch was aiming to address, I don't think this should be held. It's master, not a release branch.
Alex
Re: [OE-core] [PATCH 22/61] ffmpeg: update 4.3.2 -> 4.4
Quoted 11 lines · Alexander Kanavin
**[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 5 lines · On Wed, 5 May 2021 at 20:25, Khem Raj <[email protected]…
Drop mips64_cpu_detection.patch as upstream
has changed the code in a way that's difficult
to rebase.
Quoted 5 lines
Trevor was working on it and he has being trying to fix it for mips case as well. So lets leave this to him
The new version builds fine on qemumip64 (I will adjust the commit message to mention that), so unless there is a specific way to reproduce the failure that this patch was aiming to address, I don't think this should be held. It's master, not a release branch.
It's been a bit since I've had a chance to look at it anyway, so if this change works then I'm fine with using it instead.
- Trevor
Quoted 3 lines
Alex
PATCH 23/61 powertop: update 2.13 -> 2.14
In reply to Alexander KanavinDrop awful ncurses hack; please make a proper patch with a configure option and PACKAGECONFIG.
Adjust LDFLAGS as somehow -pthread isn't there --> link failures.
---
.../{powertop_2.13.bb => powertop_2.14.bb} | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
rename meta/recipes-kernel/powertop/{powertop_2.13.bb => powertop_2.14.bb} (64%)meta/recipes-kernel/powertop/powertop_2.14.bb renamed from meta/recipes-kernel/powertop/powertop_2.13.bb +3 -11
@@ -9,21 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \ file://0001-wakeup_xxx.h-include-limits.h.patch \ " -SRCREV = "184cee06b2d64679bae5f806fe0a218827fdde99" +SRCREV = "52f022f9bbe6e060fba11701d657a8d9762702ba" S = "${WORKDIR}/git" -inherit autotools gettext pkgconfig bash-completion +LDFLAGS_append = " -pthread" -# we do not want libncursesw if we can -do_configure_prepend() { - # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one - sed -i -e "s/ncursesw//g" ${S}/configure.ac - mkdir -p ${B}/src/tuning/ - echo "${PV}" > ${S}/version-long - echo "${PV}" > ${S}/version-short - cp ${STAGING_DATADIR}/aclocal/ax_require_defined.m4 ${S}/m4/ -} +inherit autotools gettext pkgconfig bash-completion inherit update-alternatives ALTERNATIVE_${PN} = "powertop"
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 23/61] powertop: update 2.13 -> 2.14
Quoted 4 lines · Alexander Kanavin
Drop awful ncurses hack; please make a proper patch with a configure option and PACKAGECONFIG.
Lets not delete this unless its causing trouble as it will break existing functionality that users might be depending upon. if there is better fix please propose that instead
Quoted 46 lines
Adjust LDFLAGS as somehow -pthread isn't there --> link failures.
Signed-off-by Alexander Kanavin <[email protected]>--- .../{powertop_2.13.bb => powertop_2.14.bb} | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) rename meta/recipes-kernel/powertop/{powertop_2.13.bb => powertop_2.14.bb} (64%)meta/recipes-kernel/powertop/powertop_2.14.bb renamed from meta/recipes-kernel/powertop/powertop_2.13.bb +3
-12@@ -9,21 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \ file://0001-wakeup_xxx.h-include-limits.h.patch \ " -SRCREV = "184cee06b2d64679bae5f806fe0a218827fdde99" +SRCREV = "52f022f9bbe6e060fba11701d657a8d9762702ba" S = "${WORKDIR}/git" -inherit autotools gettext pkgconfig bash-completion +LDFLAGS_append = " -pthread" -# we do not want libncursesw if we can -do_configure_prepend() { - # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one - sed -i -e "s/ncursesw//g" ${S}/configure.ac - mkdir -p ${B}/src/tuning/ - echo "${PV}" > ${S}/version-long - echo "${PV}" > ${S}/version-short - cp ${STAGING_DATADIR}/aclocal/ax_require_defined.m4 ${S}/m4/ -} +inherit autotools gettext pkgconfig bash-completion inherit update-alternatives ALTERNATIVE_${PN} = "powertop" --2.31.1
Re: [OE-core] [PATCH 23/61] powertop: update 2.13 -> 2.14
Quoted 11 lines · Khem Raj
Quoted 4 lines · Alexander Kanavin
Drop awful ncurses hack; please make a proper patch with a configure option and PACKAGECONFIG.
Lets not delete this unless its causing trouble as it will break existing functionality that users might be depending upon. if there is better fix please propose that instead
Sorry, no. If I do not understand what it does, the version update is incompatible with it,
and there is no trouble detected by the AB from dropping it, then it has to go.
Alex
Re: [OE-core] [PATCH 23/61] powertop: update 2.13 -> 2.14
Quoted 9 lines · Alexander Kanavin
On Wed, 5 May 2021 at 20:13, Khem Raj <[email protected] <mailto:[email protected]>> wrote:
On Wed, May 5, 2021 at 8:20 AM Alexander Kanavin <[email protected] <mailto:[email protected]>> wrote:
>
> Drop awful ncurses hack; please make a proper patch with a configure > option and PACKAGECONFIG.
>
Quoted 7 lines
Lets not delete this unless its causing trouble as it will break existing functionality that users might be depending upon. if there is better fix please propose that instead
Sorry, no. If I do not understand what it does, the version update is incompatible with it, and there is no trouble detected by the AB from dropping it, then it has to go.
OK thats fair, no one knows everything so drop this patch from your v2 series and let someone else handle it.
Quoted 2 lines
Alex
Re: [OE-core] [PATCH 23/61] powertop: update 2.13 -> 2.14
Quoted 8 lines · Khem Raj
Quoted 4 lines
Sorry, no. If I do not understand what it does, the version update is incompatible with it,
and there is no trouble detected by the AB from dropping it, then it has to go.OK thats fair, no one knows everything so drop this patch from your v2 series and let someone else handle it.
I assure you, nobody else will do it. I regularly drop poorly written things that are a maintenance headache, if you have specific objections or use cases or issue reproducers, please state them, but saying 'don't remove because it might be useful to somebody, somewhere' is far too vague.
Alex
Re: [OE-core] [PATCH 23/61] powertop: update 2.13 -> 2.14
Quoted 8 lines · Alexander Kanavin
Quoted 6 lines · Khem Raj
Quoted 5 lines
Sorry, no. If I do not understand what it does, the version update is incompatible with it,
and there is no trouble detected by the AB from dropping it, then it has to go.
Quoted 5 lines
Quoted 2 lines
OK thats fair, no one knows everything so drop this patch from your v2 series and let someone else handle it.
I assure you, nobody else will do it. I regularly drop poorly written things that are a maintenance headache, if you have specific objections or use cases or issue reproducers, please state them, but saying 'don't remove because it might be useful to somebody, somewhere' is far too vague.
I went through the history and some of these changes were added by you, so I hope you know why they were needed
188862de64b meta/recipes-kernel/powertop/powertop_2.3.bb (Marcin
Juszkiewicz 2013-04-11 16:05:14 +0200 19) do_configure_prepend() {188862de64b meta/recipes-kernel/powertop/powertop_2.3.bb (Marcin
Juszkiewicz 2013-04-11 16:05:14 +0200 20) # configure.ac checks
for delwin() in "ncursesw ncurses" so let's drop first one188862de64b meta/recipes-kernel/powertop/powertop_2.3.bb (Marcin
Juszkiewicz 2013-04-11 16:05:14 +0200 21) sed -i -e
"s/ncursesw//g" ${S}/configure.ac6612c5e48c9 meta/recipes-kernel/powertop/powertop_2.6.1.bb (Richard
Purdie 2014-07-16 10:58:34 +0000 22) mkdir -p
${B}/src/tuning/bcd6475928d meta/recipes-kernel/powertop/powertop_2.10.bb (Alexander
Kanavin 2020-05-05 15:01:21 +0200 23) echo "${PV}" >
${S}/version-longbcd6475928d meta/recipes-kernel/powertop/powertop_2.10.bb (Alexander
Kanavin 2020-05-05 15:01:21 +0200 24) echo "${PV}" >
${S}/version-shortf1cb1f5b29a meta/recipes-kernel/powertop/powertop_2.12.bb (Alexander
Kanavin 2020-05-31 17:52:20 +0200 25) cp
${STAGING_DATADIR}/aclocal/ax_require_defined.m4 ${S}/m4/188862de64b meta/recipes-kernel/powertop/powertop_2.3.bb (Marcin
Juszkiewicz 2013-04-11 16:05:14 +0200 26) }
besidest, I think we still need
# we do not want libncursesw if we can
do_configure_prepend() {
# configure.ac checks for delwin() in "ncursesw ncurses" so let's
drop first one
sed -i -e "s/ncursesw//g" ${S}/configure.ac
}since we control enabling widechar support in ncurses via ENABLE_WIDEC, its better to either check for that here perhaps via a DISTRO_FEATURE or just disable the widechar support
like it is doing.
other perhaps are fine to drop.
Quoted 2 lines
Alex
Re: [OE-core] [PATCH 23/61] powertop: update 2.13 -> 2.14
Quoted 2 lines · Khem Raj
I went through the history and some of these changes were added by you, so I hope you know why they were needed
None of them are needed to build the new version and therefore none should be kept. Sorry, but I do have a strong view on this: the experience with various recipes I had to rewrite from scratch because of all the intractable, undocumented cruft they accumulated over the years taught me this.
Quoted 7 lines
# we do not want libncursesw if we can
do_configure_prepend() {
# configure.ac checks for delwin() in "ncursesw ncurses" so let's
drop first one
sed -i -e "s/ncursesw//g" ${S}/configure.ac
}Quoted 5 lines
since we control enabling widechar support in ncurses via
ENABLE_WIDEC, its better to either check for that here perhaps via aDISTRO_FEATUREor just disable the widechar support
like it is doing.
It's doing:
PKG_CHECK_MODULES([NCURSES], [ncursesw ncurses], [LIBS="$LIBS $ncurses_LIBS" ], [
AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], [ AC_MSG_ERROR([ncurses is required but was not found])
], [])
]
Unless you explain why the above is wrong (even though it builds without any problem), I'd say you're veering too much towards bikeshedding here.
Alex
Re: [OE-core] [PATCH 23/61] powertop: update 2.13 -> 2.14
Quoted 35 lines · Alexander Kanavin
Quoted 2 lines · Khem Raj
I went through the history and some of these changes were added by you, so I hope you know why they were needed
None of them are needed to build the new version and therefore none should be kept. Sorry, but I do have a strong view on this: the experience with various recipes I had to rewrite from scratch because of all the intractable, undocumented cruft they accumulated over the years taught me this.
Quoted 7 lines
# we do not want libncursesw if we can do_configure_prepend() { # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one sed -i -e "s/ncursesw//g" ${S}/configure.ac }Quoted 5 lines
since we control enabling widechar support in ncurses via
ENABLE_WIDEC, its better to either check for that here perhaps via aDISTRO_FEATUREor just disable the widechar support
like it is doing.It's doing:
PKG_CHECK_MODULES([NCURSES], [ncursesw ncurses], [LIBS="$LIBS $ncurses_LIBS"], [
AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], [ AC_MSG_ERROR([ncurses is required but was not found]) ], [])
]
Quoted 4 lines
Unless you explain why the above is wrong (even though it builds without any problem), I'd say you're veering too much towards bikeshedding here.
order is, look for ncursesw first so this sed operation removes ncursesw from search paths.
and this commits mentions this change was intentional
https://git.openembedded.org/openembedded-core/commit/?id=188862de64b
so why should it be dropped without understanding the repercussions of it?
Alex
Quoted 1 line
Re: [OE-core] [PATCH 23/61] powertop: update 2.13 -> 2.14
Quoted 9 lines · Khem Raj
order is, look for ncursesw first so this sed operation removes ncursesw from search paths.
and this commits mentions this change was intentionalhttps://git.openembedded.org/openembedded-core/commit/?id=188862de64b
so why should it be dropped without understanding the repercussions of it?
PKG_CHECK_MODULES does not check for things in order listed (first second or whatever), it checks for all of them as a set, or it errors out otherwise if anything in the set is not available.
Besides, you're asking the question backwards. It should be: why should we change the upstream choice if we don't understand the repercussions of doing that?
Alex
Re: [OE-core] [PATCH 23/61] powertop: update 2.13 -> 2.14
Quoted 7 lines · Alexander Kanavin
Quoted 5 lines · Khem Raj
order is, look for ncursesw first so this sed operation removes ncursesw from search paths.
and this commits mentions this change was intentional
Quoted 9 lines
Quoted 4 lines
https://git.openembedded.org/openembedded-core/commit/?id=188862de64b
so why should it be dropped without understanding the repercussions of it?
PKG_CHECK_MODULESdoes not check for things in order listed (first second or whatever), it checks for all of them as a set, or it errors out otherwise if anything in the set is not available.
Right and it means if widechars support in ncurses is disabled then it won’t build I know that defaults is to enable it in ncurses so autobuilder won’t see such failures but many minimal distro did explicitly disable it in past
Quoted 10 lines
Besides, you're asking the question backwards. It should be: why should we change the upstream choice if we don't understand the repercussions of doing that?
Alex
PATCH 24/61 webkitgtk: update 2.30.6 -> 2.32.0
In reply to Alexander KanavinDrop 0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch (merged upstream).
Rebase other patches.
---
...1-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 14 +-
...ics-check-to-include-1-byte-CAS-test.patch | 77 ---------
...9c49c6de8af74e521f36cb43e6c1ec2e391c.patch | 155 ++++++++++++++++++
.../webkit/webkitgtk/include_xutil.patch | 18 +-
.../webkitgtk/musl-lower-stack-usage.patch | 24 ++-
.../webkitgtk/reduce-memory-overheads.patch | 20 ++-
...ebkitgtk_2.30.6.bb => webkitgtk_2.32.0.bb} | 5 +-
7 files changed, 210 insertions(+), 103 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch
create mode 100644 meta/recipes-sato/webkit/webkitgtk/49a19c49c6de8af74e521f36cb43e6c1ec2e391c.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.30.6.bb => webkitgtk_2.32.0.bb} (97%)meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch +7 -7
@@ -1,4 +1,4 @@ -From b145ab4273c59f4f908cdaff9e267241bd970e93 Mon Sep 17 00:00:00 2001 +From 3ab2b8aa49c92a68610eef14be1fbf535109b0fb Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 3 Feb 2020 17:06:27 -0800 Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
@@ -20,19 +20,19 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 2 insertions(+) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 8732e935..9b4fbae7 100644 +index 9eb44f1c..a24fdd0d 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake -@@ -32,6 +32,7 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") - if (USER_AGENT_BRANDING) - add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}") - endif () +@@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN() + SET_PROJECT_VERSION(2 32 0) + + set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") +set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Cairo 1.14.0 REQUIRED) find_package(Fontconfig 2.8.0 REQUIRED) diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake -index 316c6240..2f712602 100644 +index 10664400..d9aca95a 100644 --- a/Source/cmake/OptionsJSCOnly.cmake +++ b/Source/cmake/OptionsJSCOnly.cmake @@ -1,3 +1,4 @@
meta/recipes-sato/webkit/webkitgtk/0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch deleted +0 -77
77 lines not on this page · raw message
meta/recipes-sato/webkit/webkitgtk/49a19c49c6de8af74e521f36cb43e6c1ec2e391c.patch new file +155 -0
155 lines not on this page · raw message
meta/recipes-sato/webkit/webkitgtk/include_xutil.patch +14 -4
@@ -1,3 +1,8 @@ +From d95f46e149226f634830e76cc1f4f8e3ee04ff5a Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Fri, 6 Nov 2020 04:38:13 +0100 +Subject: [PATCH] webkitgtk: fix build with x11 enabled + Since https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4 it uses XVisualInfo which is defined in Xutil.h
@@ -11,9 +16,14 @@ webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132 Upstream-Status: Pending Signed-off-by: Martin Jansa <[email protected]> -diff -uNr webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp ---- webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-08-12 09:17:55.000000000 +0000 -+++ webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-11-06 03:11:40.379913528 +0000 +--- + Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp +index 2d66b9cd..424fb5a1 100644 +--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp ++++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp @@ -30,6 +30,7 @@ #if PLATFORM(X11)
@@ -21,4 +31,4 @@ diff -uNr webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDis +#include <X11/Xutil.h> #include <X11/extensions/Xcomposite.h> #if PLATFORM(GTK) - #include <X11/extensions/Xdamage.h> + #include <X11/Xutil.h>
meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch +18 -6
@@ -1,4 +1,7 @@ -reduce thread stack and heap usage for javascriptcore on musl +From 5c82d20a00749e9106db78cdd23a09609dd3511c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 17 Mar 2021 13:24:57 -0700 +Subject: [PATCH] reduce thread stack and heap usage for javascriptcore on musl default sizes for musl are smaller compared to glibc, this matches to musl defaults, avoid stack overflow crashes in jscore
@@ -16,9 +19,16 @@ glibc in OE remains same Upstream-Status: Accepted Signed-off-by: Khem Raj <[email protected]> +--- + Source/JavaScriptCore/runtime/OptionsList.h | 20 ++++++++++++++++---- + Source/WTF/wtf/Threading.h | 4 ++++ + 2 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h +index bc1cedb9..a6209742 100644 --- a/Source/JavaScriptCore/runtime/OptionsList.h +++ b/Source/JavaScriptCore/runtime/OptionsList.h -@@ -75,6 +75,18 @@ constexpr bool enableWebAssemblyStreamin +@@ -71,6 +71,18 @@ JS_EXPORT_PRIVATE bool canUseJITCage(); // On instantiation of the first VM instance, the Options will be write protected // and cannot be modified thereafter.
@@ -37,7 +47,7 @@ Signed-off-by: Khem Raj <[email protected]> #define FOR_EACH_JSC_OPTION(v) \ v(Bool, useKernTCSM, defaultTCSMValue(), Normal, "Note: this needs to go before other options since they depend on this value.") \ v(Bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \ -@@ -90,9 +102,9 @@ constexpr bool enableWebAssemblyStreamin +@@ -86,9 +98,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage(); \ v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ \
@@ -50,7 +60,7 @@ Signed-off-by: Khem Raj <[email protected]> \ v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \ v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ -@@ -601,7 +613,7 @@ public: +@@ -608,7 +620,7 @@ public: bool init(const char*); bool isInRange(unsigned); const char* rangeString() const { return (m_state > InitError) ? m_rangeString : s_nullRangeStr; }
@@ -59,10 +69,12 @@ Signed-off-by: Khem Raj <[email protected]> void dump(PrintStream& out) const; private: +diff --git a/Source/WTF/wtf/Threading.h b/Source/WTF/wtf/Threading.h +index 9495d6c1..190b3811 100644 --- a/Source/WTF/wtf/Threading.h +++ b/Source/WTF/wtf/Threading.h -@@ -56,6 +56,10 @@ - #include <array> +@@ -60,6 +60,10 @@ + #include <dispatch/dispatch.h> #endif +#if OS(LINUX) && !defined(__GLIBC__)
meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch +13 -7
@@ -1,22 +1,28 @@ +From ec6045fcf5a46123b54029a675d08d89a5e30f21 Mon Sep 17 00:00:00 2001 From: Alberto Garcia <[email protected]> -Subject: Reduce memory usage when not using the Gold linker -Bug-Debian: https://bugs.debian.org/949621 -Forwarded: no +Date: Sun, 25 Apr 2021 18:45:13 +0000 +Subject: [PATCH] Reduce memory usage when not using the Gold linker Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> + +--- + Source/cmake/OptionsCommon.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake +index dd4da682..71ad6106 100644 --- a/Source/cmake/OptionsCommon.cmake +++ b/Source/cmake/OptionsCommon.cmake -@@ -95,6 +95,12 @@ option(GCC_OFFLINEASM_SOURCE_MAP - "Produce debug line information for offlineasm-generated code" +@@ -101,6 +101,11 @@ option(GCC_OFFLINEASM_SOURCE_MAP ${GCC_OFFLINEASM_SOURCE_MAP_DEFAULT}) + option(USE_APPLE_ICU "Use Apple's internal ICU" ${APPLE}) +# Pass --reduce-memory-overheads to the bfd linker in order to save memory +if (NOT USE_LD_GOLD) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads") +endif () -+ + # Enable the usage of OpenMP. # - At this moment, OpenMP is only used as an alternative implementation - # to native threads for the parallelization of the SVG filters.
meta/recipes-sato/webkit/webkitgtk_2.32.0.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.30.6.bb +3 -2
@@ -18,12 +18,12 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-build-with-musl.patch \ file://include_xutil.patch \ file://reduce-memory-overheads.patch \ - file://0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch \ file://musl-lower-stack-usage.patch \ file://0001-MiniBrowser-Fix-reproduciblity.patch \ + file://49a19c49c6de8af74e521f36cb43e6c1ec2e391c.patch \ " -SRC_URI[sha256sum] = "50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e" +SRC_URI[sha256sum] = "9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
@@ -76,6 +76,7 @@ EXTRA_OECMAKE = " \ -DENABLE_MINIBROWSER=ON \ -DPYTHON_EXECUTABLE=`which python3` \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ + -DENABLE_GAMEPAD=OFF \ " # Javascript JIT is not supported on ARC
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 24/61] webkitgtk: update 2.30.6 -> 2.32.0
Quoted 5 lines · Alexander Kanavin
Drop 0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch (merged upstream).
Rebase other patches.
This version fails to build in default oe-core setup (with x11 and without opengl in DISTRO_FEATURES), see:
http://errors.yoctoproject.org/Errors/Details/581086/
In file included from TOPDIR/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.32.0-r0/webkitgtk-2.32.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:32,
from
DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-35.cpp:5:TOPDIR/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.32.0-r0/webkitgtk-2.32.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:216:13:
error: no declaration matches 'bool
WebKit::LayerTreeHost::forceRepaintAsync(WTF::CompletionHandler<void()>&)'
216 | inline bool
LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&) { return
false; }
| ^~~~~~~~~~~~~
TOPDIR/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.32.0-r0/webkitgtk-2.32.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:82:10:
note: candidate is: 'void
WebKit::LayerTreeHost::forceRepaintAsync(WTF::CompletionHandler<void()>&&)'
82 | void forceRepaintAsync(CompletionHandler<void()>&&);
| ^~~~~~~~~~~~~~~~~
TOPDIR/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.32.0-r0/webkitgtk-2.32.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:61:7:
note: 'class WebKit::LayerTreeHost' defined here
61 | class LayerTreeHost
| ^~~~~~~~~~~~~This upstream change should probably fix that:
commit 834f335bb3e63e0bf78eed0520df33d5c55e5e8a
Author: [email protected] <[email protected] @268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Apr 10 22:02:50 2021 +0000
Properly use CompletionHandler when USE_OPENGL_OR_ES is set to OFF
https://bugs.webkit.org/show_bug.cgi?id=224149
Patch by Charlène Wendling <[email protected]> on 2021-04-10 Reviewed by Fujii Hironori.
* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
(WebKit::LayerTreeHost::forceRepaintAsync):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@275802
268f45cc-cd09-0410-ab3c-d52691b4dbfc
There is 2.32.1 which might contain this fix but it's not explicitly mentioned in https://webkitgtk.org/2021/05/10/webkitgtk2.32.1-released.html
Re: [OE-core] [PATCH 24/61] webkitgtk: update 2.30.6 -> 2.32.0
Quoted 11 lines · Martin Jansa
Quoted 5 lines · Alexander Kanavin
Drop 0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch (merged upstream).
Rebase other patches.
This version fails to build in default oe-core setup (with x11 and without opengl in
DISTRO_FEATURES), see:
http://errors.yoctoproject.org/Errors/Details/581086/
I think there still are a plenty of products which don't use OpenGL capable h/w but need some display ( fbdev ), I Wonder if there are users who are using such
a combination maybe with X or without but without openGL
Quoted 34 lines
In file included from TOPDIR/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.32.0-r0/webkitgtk-2.32.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:32,
from DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-35.cpp:5:TOPDIR/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.32.0-r0/webkitgtk-2.32.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:216:13: error: no declaration matches 'bool WebKit::LayerTreeHost::forceRepaintAsync(WTF::CompletionHandler<void()>&)'
216 | inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&) { return false; }| ^~~~~~~~~~~~~ TOPDIR/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.32.0-r0/webkitgtk-2.32.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:82:10: note: candidate is: 'void WebKit::LayerTreeHost::forceRepaintAsync(WTF::CompletionHandler<void()>&&)' 82 | void forceRepaintAsync(CompletionHandler<void()>&&); | ^~~~~~~~~~~~~~~~~ TOPDIR/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.32.0-r0/webkitgtk-2.32.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:61:7: note: 'class WebKit::LayerTreeHost' defined here 61 | class LayerTreeHost | ^~~~~~~~~~~~~This upstream change should probably fix that:
commit
834f335bb3e63e0bf78eed0520df33d5c55e5e8aAuthor: [email protected] <[email protected]@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Date: Sat Apr 10 22:02:50 2021 +0000Properly use CompletionHandler when
USE_OPENGL_OR_ESis set to OFF
https://bugs.webkit.org/show_bug.cgi?id=224149Patch by Charlène Wendling <[email protected]> on 2021-04-10 Reviewed by Fujii Hironori.
*
WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
(WebKit::LayerTreeHost::forceRepaintAsync):git-svn-id: http://svn.webkit.org/repository/webkit/trunk@275802 268f45cc-cd09-0410-ab3c-d52691b4dbfc
There is 2.32.1 which might contain this fix but it's not explicitly mentioned in https://webkitgtk.org/2021/05/10/webkitgtk2.32.1-released.html
PATCH 25/61 acl: upgrade 2.2.53 -> 2.3.1
In reply to Alexander Kanavin---
meta/recipes-support/attr/{acl_2.2.53.bb => acl_2.3.1.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-support/attr/{acl_2.2.53.bb => acl_2.3.1.bb} (94%)meta/recipes-support/attr/acl_2.3.1.bb renamed from meta/recipes-support/attr/acl_2.2.53.bb +1 -2
@@ -21,8 +21,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \ file://0001-test-patch-out-failing-bits.patch \ " -SRC_URI[md5sum] = "007aabf1dbb550bcddde52a244cd1070" -SRC_URI[sha256sum] = "06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7" +SRC_URI[sha256sum] = "760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af" inherit autotools gettext ptest
Signature · 1 line
2.31.1
PATCH 26/61 bind: upgrade 9.16.12 -> 9.16.13
In reply to Alexander Kanavin---
.../0001-avoid-start-failure-with-bind-user.patch | 0
.../0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0
.../bind-ensure-searching-for-json-headers-searches-sysr.patch | 0
.../bind/{bind-9.16.12 => bind-9.16.13}/bind9 | 0
.../bind/{bind-9.16.12 => bind-9.16.13}/conf.patch | 0
.../bind/{bind-9.16.12 => bind-9.16.13}/generate-rndc-key.sh | 0
.../init.d-add-support-for-read-only-rootfs.patch | 0
.../make-etc-initd-bind-stop-work.patch | 0
.../bind/{bind-9.16.12 => bind-9.16.13}/named.service | 0
.../bind/{bind_9.16.12.bb => bind_9.16.13.bb} | 2 +-
10 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/bind/{bind-9.16.12 => bind-9.16.13}/0001-avoid-start-failure-with-bind-user.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.12 => bind-9.16.13}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.12 => bind-9.16.13}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.12 => bind-9.16.13}/bind9 (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.12 => bind-9.16.13}/conf.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.12 => bind-9.16.13}/generate-rndc-key.sh (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.12 => bind-9.16.13}/init.d-add-support-for-read-only-rootfs.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.12 => bind-9.16.13}/make-etc-initd-bind-stop-work.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.12 => bind-9.16.13}/named.service (100%)
rename meta/recipes-connectivity/bind/{bind_9.16.12.bb => bind_9.16.13.bb} (98%)meta/recipes-connectivity/bind/bind-9.16.13/0001-avoid-start-failure-with-bind-user.patch renamed from meta/recipes-connectivity/bind/bind-9.16.12/0001-avoid-start-failure-with-bind-user.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.13/0001-named-lwresd-V-and-start-log-hide-build-options.patch renamed from meta/recipes-connectivity/bind/bind-9.16.12/0001-named-lwresd-V-and-start-log-hide-build-options.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.13/bind-ensure-searching-for-json-headers-searches-sysr.patch renamed from meta/recipes-connectivity/bind/bind-9.16.12/bind-ensure-searching-for-json-headers-searches-sysr.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.13/bind9 renamed from meta/recipes-connectivity/bind/bind-9.16.12/bind9 +0 -0
meta/recipes-connectivity/bind/bind-9.16.13/conf.patch renamed from meta/recipes-connectivity/bind/bind-9.16.12/conf.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.13/generate-rndc-key.sh renamed from meta/recipes-connectivity/bind/bind-9.16.12/generate-rndc-key.sh +0 -0
meta/recipes-connectivity/bind/bind-9.16.13/init.d-add-support-for-read-only-rootfs.patch renamed from meta/recipes-connectivity/bind/bind-9.16.12/init.d-add-support-for-read-only-rootfs.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.13/make-etc-initd-bind-stop-work.patch renamed from meta/recipes-connectivity/bind/bind-9.16.12/make-etc-initd-bind-stop-work.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.13/named.service renamed from meta/recipes-connectivity/bind/bind-9.16.12/named.service +0 -0
meta/recipes-connectivity/bind/bind_9.16.13.bb renamed from meta/recipes-connectivity/bind/bind_9.16.12.bb +1 -1
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "9914af9311fd349cab441097898d94fb28d0bfd9bf6ed04fe1f97f042644da7f" +SRC_URI[sha256sum] = "a54cc793fa5b69b35f610f2095760f8238dff5cfd52419f7ee1c9c227da4cc08" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4
Signature · 1 line
2.31.1
PATCH 27/61 bison: upgrade 3.7.5 -> 3.7.6
In reply to Alexander KanavinLicense-Update: http links -> https
---
.../recipes-devtools/bison/{bison_3.7.5.bb => bison_3.7.6.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/bison/{bison_3.7.5.bb => bison_3.7.6.bb} (88%)meta/recipes-devtools/bison/bison_3.7.6.bb renamed from meta/recipes-devtools/bison/bison_3.7.5.bb +2 -2
@@ -5,7 +5,7 @@ grammars ought to work with Bison with no change. Anyone familiar with Yacc shou little trouble." HOMEPAGE = "http://www.gnu.org/software/bison/" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SECTION = "devel" DEPENDS = "bison-native flex-native"
@@ -13,7 +13,7 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ file://add-with-bisonlocaledir.patch \ file://0001-Use-mapped-file-name-for-symbols.patch \ " -SRC_URI[sha256sum] = "e8c53bc5bc396d636622d0f25e31ca92fd53f00b09629f13ef540d564a6b31ab" +SRC_URI[sha256sum] = "67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf" # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4"
Signature · 1 line
2.31.1
PATCH 28/61 createrepo-c: upgrade 0.17.0 -> 0.17.2
In reply to Alexander Kanavin---
...01-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | 6 +++---
.../{createrepo-c_0.17.0.bb => createrepo-c_0.17.2.bb} | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.17.0.bb => createrepo-c_0.17.2.bb} (96%)meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +3 -3
@@ -1,4 +1,4 @@ -From 218a4760945be7a404df6515ffbc769c92791f9b Mon Sep 17 00:00:00 2001 +From 6f8f6d151b831b60f6e7892aa9294a6361353c72 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 30 Dec 2016 18:31:02 +0200 Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python
@@ -11,11 +11,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 855127f..dff1d97 100644 +index ecc262d..a86514c 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -14,7 +14,7 @@ if (NOT SKBUILD) - FIND_PACKAGE(PythonInterp 3 EXACT REQUIRED) + FIND_PACKAGE(PythonLibs 3 REQUIRED) endif (NOT SKBUILD) -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
meta/recipes-devtools/createrepo-c/createrepo-c_0.17.2.bb renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "909a0636665ed96f97babc3b887f9badc88875c3" +SRCREV = "8eff6ed99f5fd0ba844cb8513963435caab5fd3c" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 29/61 cronie: upgrade 1.5.5 -> 1.5.7
In reply to Alexander Kanavin---
.../cronie/{cronie_1.5.5.bb => cronie_1.5.7.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-extended/cronie/{cronie_1.5.5.bb => cronie_1.5.7.bb} (95%)meta/recipes-extended/cronie/cronie_1.5.7.bb renamed from meta/recipes-extended/cronie/cronie_1.5.5.bb +1 -2
@@ -25,8 +25,7 @@ SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV} PAM_SRC_URI = "file://crond_pam_config.patch" PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" -SRC_URI[md5sum] = "351a37d0b5bd0144816724b4482747ad" -SRC_URI[sha256sum] = "be34c79505e5544323281854744b9955ff16b160ee569f9df7c0dddae5720eac" +SRC_URI[sha256sum] = "538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3" inherit autotools update-rc.d useradd systemd
Signature · 1 line
2.31.1
PATCH 30/61 dnf: upgrade 4.6.0 -> 4.7.0
In reply to Alexander Kanavin---
...-dnf-rpm-miscutils.py-fix-usage-of-_.patch | 39 +++++++++++++++++++
...s.py-do-not-hardcode-usr-bin-rpmkeys.patch | 37 ++++++++++++++++++
.../dnf/{dnf_4.6.0.bb => dnf_4.7.0.bb} | 4 +-
3 files changed, 79 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch
create mode 100644 meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch
rename meta/recipes-devtools/dnf/{dnf_4.6.0.bb => dnf_4.7.0.bb} (94%)meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 2729c00f0060beab8537a9bebc796b170949093d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 4 May 2021 22:03:30 +0200 +Subject: [PATCH 1/2] dnf/rpm/miscutils.py: fix usage of _() + +Specifically: +- an import of _ was missing +- _ was reused for a different purpose + +Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/1762] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + dnf/rpm/miscutils.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py +index 235aaf28f..7e33d4c42 100644 +--- a/dnf/rpm/miscutils.py ++++ b/dnf/rpm/miscutils.py +@@ -22,6 +22,7 @@ import subprocess + import logging + + from dnf.i18n import ucd ++from dnf.i18n import _ + from shutil import which + + +@@ -46,7 +47,7 @@ def _verifyPkgUsingRpmkeys(package, installroot): + env={'LC_ALL': 'C'}, + stdout=subprocess.PIPE, + cwd='/') as p: +- data, _ = p.communicate() ++ data, err = p.communicate() + if p.returncode != 0 or data != (package.encode('ascii', 'strict') + b': digests signatures OK\n'): + return 0 + else: +-- +2.31.1 +
meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch new file +37 -0
@@ -0,0 +1,37 @@ +From dc14022a99dc017c52c484efb32729729baf854c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 4 May 2021 22:07:32 +0200 +Subject: [PATCH 2/2] dnf/rpm/miscutils.py: do not hardcode /usr/bin/rpmkeys + +Some build systems (e.g. Yocto) place a specially configured +rpmkeys executable elsewhere and set up PATH accordingly; +it's better to always take it from there. + +Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/1763] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + dnf/rpm/miscutils.py | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py +index 7e33d4c42..fcd956db9 100644 +--- a/dnf/rpm/miscutils.py ++++ b/dnf/rpm/miscutils.py +@@ -30,11 +30,9 @@ logger = logging.getLogger('dnf') + + + def _verifyPkgUsingRpmkeys(package, installroot): +- rpmkeys_binary = '/usr/bin/rpmkeys' +- if not os.path.isfile(rpmkeys_binary): +- rpmkeys_binary = which("rpmkeys") +- logger.info(_('Using rpmkeys executable from {path} to verify signature for package: {package}.').format( +- path=rpmkeys_binary, package=package)) ++ rpmkeys_binary = which("rpmkeys") ++ logger.info(_('Using rpmkeys executable from {path} to verify signature for package: {package}.').format( ++ path=rpmkeys_binary, package=package)) + + if not os.path.isfile(rpmkeys_binary): + logger.critical(_('Cannot find rpmkeys executable to verify signatures.')) +-- +2.31.1 +
meta/recipes-devtools/dnf/dnf_4.7.0.bb renamed from meta/recipes-devtools/dnf/dnf_4.6.0.bb +3 -1
@@ -16,9 +16,11 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0030-Run-python-scripts-using-env.patch \ file://0001-set-python-path-for-completion_helper.patch \ file://0001-dnf-write-the-log-lock-to-root.patch \ + file://0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch \ + file://0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch \ " -SRCREV = "c826d7db401ebf9b59b2fa74570a919e4af2673e" +SRCREV = "395541fbf8f87f81cdca7567f22be1182e55bea7" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 31/61 e2fsprogs: upgrade 1.46.1 -> 1.46.2
In reply to Alexander Kanavin---
...-ext2fs-unix_io.c-do-unlock-on-error.patch | 24 ++++++++++
...io.c-revert-parts-of-libext2fs-fix-p.patch | 48 +++++++++++++++++++
...-missing-check-for-permission-denied.patch | 2 +-
.../e2fsprogs/e2fsprogs/quiet-debugfs.patch | 6 +--
...2fsprogs_1.46.1.bb => e2fsprogs_1.46.2.bb} | 4 +-
5 files changed, 79 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-do-unlock-on-error.patch
create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.46.1.bb => e2fsprogs_1.46.2.bb} (96%)meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-do-unlock-on-error.patch new file +24 -0
@@ -0,0 +1,24 @@ +From 42ba67f9a51ef959e7fd8dac29b5398c121c6976 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 30 Apr 2021 23:45:56 +0200 +Subject: [PATCH] lib/ext2fs/unix_io.c: do unlock on error + +Upstream-Status: Submitted [https://github.com/tytso/e2fsprogs/pull/68] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + lib/ext2fs/unix_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c +index 64eee342..528c2fbc 100644 +--- a/lib/ext2fs/unix_io.c ++++ b/lib/ext2fs/unix_io.c +@@ -398,7 +398,7 @@ static errcode_t raw_write_blk(io_channel channel, + mutex_lock(data, BOUNCE_MTX); + if (ext2fs_llseek(data->dev, location, SEEK_SET) < 0) { + retval = errno ? errno : EXT2_ET_LLSEEK_FAILED; +- goto error_out; ++ goto error_unlock; + } + actual = write(data->dev, buf, size); + mutex_unlock(data, BOUNCE_MTX);
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch new file +48 -0
48 lines not on this page · raw message
meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch +1 -1
@@ -1,4 +1,4 @@ -From 9263b8764702f2b26ddaaf80808ebab31a1dba3b Mon Sep 17 00:00:00 2001 +From 8957443bcbea43685c76eb3cbc5009f7fd529283 Mon Sep 17 00:00:00 2001 From: Jackie Huang <[email protected]> Date: Wed, 10 Aug 2016 11:19:44 +0800 Subject: [PATCH] Fix missing check for permission denied.
meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch +3 -3
@@ -1,4 +1,4 @@ -From 6e4c1644a3a8cacf7c1f5953cc378589bb046d5a Mon Sep 17 00:00:00 2001 +From 3b75308cc75adc249db6ca36e42fe93309b9a018 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Mon, 23 Dec 2013 13:38:34 +0000 Subject: [PATCH] e2fsprogs: silence debugfs
@@ -14,10 +14,10 @@ Signed-off-by: Ross Burton <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c -index 132c5f9d..98063727 100644 +index b67a88bc..76dd5556 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c -@@ -2510,7 +2510,7 @@ static int source_file(const char *cmd_file, int ss_idx) +@@ -2518,7 +2518,7 @@ static int source_file(const char *cmd_file, int ss_idx) cp = strchr(buf, '\r'); if (cp) *cp = 0;
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.1.bb +3 -1
@@ -4,6 +4,8 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ + file://0001-lib-ext2fs-unix_io.c-do-unlock-on-error.patch \ + file://0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
@@ -11,7 +13,7 @@ SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permissio " -SRCREV = "3114c623f56b0d61f5f34b85f7b23d28f6c848c0" +SRCREV = "1eea0e2bd9a6760ebad834d5d2cf700fffe5ebe2" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
Signature · 1 line
2.31.1
PATCH 32/61 gnu-efi: upgrade 3.0.12 -> 3.0.13
In reply to Alexander Kanavin---
.../gnu-efi/{gnu-efi_3.0.12.bb => gnu-efi_3.0.13.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.12.bb => gnu-efi_3.0.13.bb} (95%)meta/recipes-bsp/gnu-efi/gnu-efi_3.0.13.bb renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb +1 -2
@@ -19,8 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \ file://gnu-efi-3.0.9-fix-clang-build.patch \ " -SRC_URI[md5sum] = "926763ff37bc9db3a9035cec41eb2f45" -SRC_URI[sha256sum] = "0196f2e1fd3c334b66e610a608a0e59233474c7a01bec7bc53989639aa327669" +SRC_URI[sha256sum] = "2fccf715279c46ee69c4859186af8150d07a13f4d19876e5459cd65be82d3b7d" COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" COMPATIBLE_HOST_armv4 = 'null'
Signature · 1 line
2.31.1
PATCH 33/61 systemd-boot: backport a fix to address failures with new gnu-efi
In reply to Alexander Kanavin--- ...f0a2af3f62acd446ebec8081b039b72caad8.patch | 179 ++++++++++++++++++ meta/recipes-core/systemd/systemd.inc | 1 + 2 files changed, 180 insertions(+) create mode 100644 meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch new file +179 -0
@@ -0,0 +1,179 @@ +From 48fff0a2af3f62acd446ebec8081b039b72caad8 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer <[email protected]> +Date: Fri, 12 Mar 2021 22:09:44 +0000 +Subject: [PATCH] boot: Move console declarations to missing_efi.h + +These were added to eficonex.h in gnu-efi 3.0.13. Let's move them +to missing_efi.h behind an appropriate guard to fix the build with +recent versions of gnu-efi. + +(cherry picked from commit 95ba433a5f34baf92921fb58051bc8241f908c0e) + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/boot/efi/console.c | 57 -------------------------------- + src/boot/efi/console.h | 6 +--- + src/boot/efi/missing_efi.h | 67 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 68 insertions(+), 62 deletions(-) + +diff --git a/src/boot/efi/console.c b/src/boot/efi/console.c +index 2dd4543d51..1d6dfeeea2 100644 +--- a/src/boot/efi/console.c ++++ b/src/boot/efi/console.c +@@ -9,63 +9,6 @@ + #define SYSTEM_FONT_WIDTH 8 + #define SYSTEM_FONT_HEIGHT 19 + +-#define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \ +- { 0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } } +- +-struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; +- +-typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, +- BOOLEAN ExtendedVerification +-); +- +-typedef UINT8 EFI_KEY_TOGGLE_STATE; +- +-typedef struct { +- UINT32 KeyShiftState; +- EFI_KEY_TOGGLE_STATE KeyToggleState; +-} EFI_KEY_STATE; +- +-typedef struct { +- EFI_INPUT_KEY Key; +- EFI_KEY_STATE KeyState; +-} EFI_KEY_DATA; +- +-typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, +- EFI_KEY_DATA *KeyData +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, +- EFI_KEY_TOGGLE_STATE *KeyToggleState +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)( +- EFI_KEY_DATA *KeyData +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, +- EFI_KEY_DATA KeyData, +- EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction, +- VOID **NotifyHandle +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, +- VOID *NotificationHandle +-); +- +-typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { +- EFI_INPUT_RESET_EX Reset; +- EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx; +- EFI_EVENT WaitForKeyEx; +- EFI_SET_STATE SetState; +- EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify; +- EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify; +-} EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; +- + EFI_STATUS console_key_read(UINT64 *key, BOOLEAN wait) { + EFI_GUID EfiSimpleTextInputExProtocolGuid = EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID; + static EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *TextInputEx; +diff --git a/src/boot/efi/console.h b/src/boot/efi/console.h +index 41df3a406e..2c69af552a 100644 +--- a/src/boot/efi/console.h ++++ b/src/boot/efi/console.h +@@ -1,11 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #pragma once + +-#define EFI_SHIFT_STATE_VALID 0x80000000 +-#define EFI_RIGHT_CONTROL_PRESSED 0x00000004 +-#define EFI_LEFT_CONTROL_PRESSED 0x00000008 +-#define EFI_RIGHT_ALT_PRESSED 0x00000010 +-#define EFI_LEFT_ALT_PRESSED 0x00000020 ++#include "missing_efi.h" + + #define EFI_CONTROL_PRESSED (EFI_RIGHT_CONTROL_PRESSED|EFI_LEFT_CONTROL_PRESSED) + #define EFI_ALT_PRESSED (EFI_RIGHT_ALT_PRESSED|EFI_LEFT_ALT_PRESSED) +diff --git a/src/boot/efi/missing_efi.h b/src/boot/efi/missing_efi.h +index 1b838af2a4..b6aae1eb5b 100644 +--- a/src/boot/efi/missing_efi.h ++++ b/src/boot/efi/missing_efi.h +@@ -53,3 +53,70 @@ typedef struct _EFI_RNG_PROTOCOL { + } EFI_RNG_PROTOCOL; + + #endif ++ ++#ifndef EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID ++ ++#define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \ ++ { 0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } } ++ ++#define EFI_SHIFT_STATE_VALID 0x80000000 ++#define EFI_RIGHT_CONTROL_PRESSED 0x00000004 ++#define EFI_LEFT_CONTROL_PRESSED 0x00000008 ++#define EFI_RIGHT_ALT_PRESSED 0x00000010 ++#define EFI_LEFT_ALT_PRESSED 0x00000020 ++ ++struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; ++ ++typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)( ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ BOOLEAN ExtendedVerification ++); ++ ++typedef UINT8 EFI_KEY_TOGGLE_STATE; ++ ++typedef struct { ++ UINT32 KeyShiftState; ++ EFI_KEY_TOGGLE_STATE KeyToggleState; ++} EFI_KEY_STATE; ++ ++typedef struct { ++ EFI_INPUT_KEY Key; ++ EFI_KEY_STATE KeyState; ++} EFI_KEY_DATA; ++ ++typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)( ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ EFI_KEY_DATA *KeyData ++); ++ ++typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)( ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ EFI_KEY_TOGGLE_STATE *KeyToggleState ++); ++ ++typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)( ++ EFI_KEY_DATA *KeyData ++); ++ ++typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)( ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ EFI_KEY_DATA KeyData, ++ EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction, ++ VOID **NotifyHandle ++); ++ ++typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)( ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ VOID *NotificationHandle ++); ++ ++typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { ++ EFI_INPUT_RESET_EX Reset; ++ EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx; ++ EFI_EVENT WaitForKeyEx; ++ EFI_SET_STATE SetState; ++ EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify; ++ EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify; ++} EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; ++ ++#endif
meta/recipes-core/systemd/systemd.inc +1 -0
@@ -18,6 +18,7 @@ SRCREV = "17472dca0160cbe7b807ca648475fd70d0d62fe5" SRCBRANCH = "v247-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ + file://48fff0a2af3f62acd446ebec8081b039b72caad8.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 34/61 gobject-introspection: upgrade 1.66.1 -> 1.68.0
In reply to Alexander Kanavin---
...pository-directory-for-native-builds.patch | 2 +-
...ude-girepo_dep-if-introspection-data.patch | 25 -------------------
...6.1.bb => gobject-introspection_1.68.0.bb} | 3 +--
3 files changed, 2 insertions(+), 28 deletions(-)
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.66.1.bb => gobject-introspection_1.68.0.bb} (98%)meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +1 -1
@@ -1,4 +1,4 @@ -From 41c3ee549787333a073a3ce6303efef625c74dce Mon Sep 17 00:00:00 2001 +From 5c606356523431769dffb02fffd2fbca8fb20232 Mon Sep 17 00:00:00 2001 From: Sascha Silbe <[email protected]> Date: Fri, 8 Jun 2018 13:55:10 +0200 Subject: [PATCH] Relocate the repository directory for native builds
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From ef5446af0ddad6a341b47957097ac40c6cb5e6d3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 20 Oct 2020 22:40:14 +0200 -Subject: [PATCH] meson.build: exclude girepo_dep if introspection data is - disabled - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/248] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 14af2b1..a3c27c3 100644 ---- a/meson.build -+++ b/meson.build -@@ -283,7 +283,7 @@ pkg.generate( - # FIXME: meson.override_dependency() and declare_dependency()'s variable arguments - # are new in Meson 0.54.0, older versions of Meson won't be able to use g-i as - # subproject anyway --if meson.version().version_compare('>=0.54.0') -+if meson.version().version_compare('>=0.54.0') and get_option('build_introspection_data') == true - girepo_dep = declare_dependency( - sources: typelibs, - dependencies: girepo_dep,
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb +1 -2
@@ -15,10 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ - file://0001-meson.build-exclude-girepo_dep-if-introspection-data.patch \ " -SRC_URI[sha256sum] = "dd44a55ee5f426ea22b6b89624708f9e8d53f5cc94e5485c15c87cb30e06161d" +SRC_URI[sha256sum] = "d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27" SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
Signature · 1 line
2.31.1
PATCH 35/61 gtk+3: upgrade 3.24.25 -> 3.24.28
In reply to Alexander Kanavin---
meta/recipes-gnome/gtk+/{gtk+3_3.24.25.bb => gtk+3_3.24.28.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.24.25.bb => gtk+3_3.24.28.bb} (89%)meta/recipes-gnome/gtk+/gtk+3_3.24.28.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.25.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "87e26b111d3b8a85ff218980a56f3e814257b8dd11e5c4d9a2803b423b08297c" +SRC_URI[sha256sum] = "b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6" S = "${WORKDIR}/gtk+-${PV}"
Signature · 1 line
2.31.1
PATCH 36/61 harfbuzz: upgrade 2.7.4 -> 2.8.0
In reply to Alexander Kanavin---
.../harfbuzz/{harfbuzz_2.7.4.bb => harfbuzz_2.8.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/harfbuzz/{harfbuzz_2.7.4.bb => harfbuzz_2.8.0.bb} (95%)meta/recipes-graphics/harfbuzz/harfbuzz_2.8.0.bb renamed from meta/recipes-graphics/harfbuzz/harfbuzz_2.7.4.bb +1 -1
@@ -12,7 +12,7 @@ UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7" +SRC_URI[sha256sum] = "a1079fd021adaf5683351f34587a255975cc3bcadba31246ae40ebebb95ecd42" inherit meson pkgconfig lib_package gtk-doc gobject-introspection
Signature · 1 line
2.31.1
PATCH 37/61 less: upgrade 563 -> 581
In reply to Alexander Kanavin---
meta/recipes-extended/less/{less_563.bb => less_581.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/less/{less_563.bb => less_581.bb} (93%)meta/recipes-extended/less/less_581.bb renamed from meta/recipes-extended/less/less_563.bb +1 -1
@@ -28,7 +28,7 @@ DEPENDS = "ncurses" SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "ce5b6d2b9fc4442d7a07c93ab128d2dff2ce09a1d4f2d055b95cf28dd0dc9a9a" +SRC_URI[sha256sum] = "1d077f83fe7867e0ecfd278eab3122326b21c22c9161366189c38e09b96a2c65" UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"
Signature · 1 line
2.31.1
PATCH 38/61 libfm: upgrade 1.3.1 -> 1.3.2
In reply to Alexander Kanavin---
meta/recipes-support/libfm/{libfm_1.3.1.bb => libfm_1.3.2.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-support/libfm/{libfm_1.3.1.bb => libfm_1.3.2.bb} (93%)meta/recipes-support/libfm/libfm_1.3.2.bb renamed from meta/recipes-support/libfm/libfm_1.3.1.bb +1 -2
@@ -18,8 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-Do-not-add-library-path-to-avoid-host-contamination.patch \ " -SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba" -SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4" +SRC_URI[sha256sum] = "a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5" inherit autotools pkgconfig gtk-doc gettext features_check mime mime-xdg ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
Signature · 1 line
2.31.1
PATCH 39/61 libinput: upgrade 1.16.4 -> 1.17.1
In reply to Alexander Kanavin---
.../wayland/{libinput_1.16.4.bb => libinput_1.17.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/wayland/{libinput_1.16.4.bb => libinput_1.17.1.bb} (95%)meta/recipes-graphics/wayland/libinput_1.17.1.bb renamed from meta/recipes-graphics/wayland/libinput_1.16.4.bb +1 -1
@@ -16,7 +16,7 @@ SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://run-ptest \ file://determinism.patch \ " -SRC_URI[sha256sum] = "65923a06d5a8970e4a999c4668797b9b689614b62b1d44432ab1c87b65e39e29" +SRC_URI[sha256sum] = "e51c50f3ce253961bed452d9f93102cc26128406975ab88ff9ec9e6c3b875137" UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
Signature · 1 line
2.31.1
PATCH 40/61 libwpe: upgrade 1.8.0 -> 1.10.0
In reply to Alexander Kanavin---
meta/recipes-sato/webkit/{libwpe_1.8.0.bb => libwpe_1.10.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-sato/webkit/{libwpe_1.8.0.bb => libwpe_1.10.0.bb} (90%)meta/recipes-sato/webkit/libwpe_1.10.0.bb renamed from meta/recipes-sato/webkit/libwpe_1.8.0.bb +1 -1
@@ -14,7 +14,7 @@ inherit cmake features_check REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "a6f00a7d091cbd4db57fe7ee3b4c12c6350921d654ed79812800a26c888481d2" +SRC_URI[sha256sum] = "2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d" # This is a tweak of upstream-version-is-even needed because # ipstream directory contains tarballs for other components as well.
Signature · 1 line
2.31.1
PATCH 41/61 libxres: upgrade 1.2.0 -> 1.2.1
In reply to Alexander Kanavin---
.../xorg-lib/{libxres_1.2.0.bb => libxres_1.2.1.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxres_1.2.0.bb => libxres_1.2.1.bb} (77%)meta/recipes-graphics/xorg-lib/libxres_1.2.1.bb renamed from meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb +1 -2
@@ -16,5 +16,4 @@ PE = "1" XORG_PN = "libXres" -SRC_URI[md5sum] = "5d6d443d1abc8e1f6fc1c57fb27729bb" -SRC_URI[sha256sum] = "ff75c1643488e64a7cfbced27486f0f944801319c84c18d3bd3da6bf28c812d4" +SRC_URI[sha256sum] = "b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11"
Signature · 1 line
2.31.1
PATCH 42/61 linux-firmware: upgrade 20210208 -> 20210315
In reply to Alexander KanavinLicense-Update: additional firmware files, version changes
---
...{linux-firmware_20210208.bb => linux-firmware_20210315.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20210208.bb => linux-firmware_20210315.bb} (99%)meta/recipes-kernel/linux-firmware/linux-firmware_20210315.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20210208.bb +2 -2
@@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=ef0565762eac313c409567b59dff00b2 \ + file://WHENCE;md5=e21a8cbddc1612bce56f06fe154a0743 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -205,7 +205,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "1bcb1a3944c361507754a7d26ccff40ffc28d1fb93bce711d67da26b33e785b7" +SRC_URI[sha256sum] = "a2348f03492713dca9aef202496c6e58f5e63ee5bec6a7bdfcf8b18ce7155e70" inherit allarch
Signature · 1 line
2.31.1
PATCH 43/61 pango: upgrade 1.48.2 -> 1.48.4
In reply to Alexander Kanavin---
.../recipes-graphics/pango/{pango_1.48.2.bb => pango_1.48.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/pango/{pango_1.48.2.bb => pango_1.48.4.bb} (94%)meta/recipes-graphics/pango/pango_1.48.4.bb renamed from meta/recipes-graphics/pango/pango_1.48.2.bb +1 -1
@@ -20,7 +20,7 @@ GIR_MESON_DISABLE_FLAG = "disabled" SRC_URI += "file://run-ptest" -SRC_URI[archive.sha256sum] = "d21f8b30dc8abdfc55de25656ecb88dc1105eeeb315e5e2a980dcef8010c2c80" +SRC_URI[archive.sha256sum] = "418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
Signature · 1 line
2.31.1
PATCH 44/61 piglit: upgrade to latest revision
In reply to Alexander Kanavin--- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/piglit/piglit_git.bb +1 -1
@@ -18,7 +18,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "d4d9353b7290ed22cb7349226a8e4017402d3f02" +SRCREV = "6a4be9e9946df310d9402f995f371c7deb8c27ba" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}"
Signature · 1 line
2.31.1
PATCH 45/61 pkgconf: upgrade 1.7.3 -> 1.7.4
In reply to Alexander Kanavin---
.../pkgconf/{pkgconf_1.7.3.bb => pkgconf_1.7.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/pkgconf/{pkgconf_1.7.3.bb => pkgconf_1.7.4.bb} (96%)meta/recipes-devtools/pkgconf/pkgconf_1.7.4.bb renamed from meta/recipes-devtools/pkgconf/pkgconf_1.7.3.bb +1 -1
@@ -20,7 +20,7 @@ SRC_URI = "\ file://pkg-config-native.in \ file://pkg-config-esdk.in \ " -SRC_URI[sha256sum] = "b846aea51cf696c3392a0ae58bef93e2e72f8e7073ca6ad1ed8b01c85871f9c0" +SRC_URI[sha256sum] = "d73f32c248a4591139a6b17777c80d4deab6b414ec2b3d21d0a24be348c476ab" inherit autotools
Signature · 1 line
2.31.1
PATCH 46/61 python3-hypothesis: upgrade 6.2.0 -> 6.9.1
In reply to Alexander Kanavin---
...{python3-hypothesis_6.2.0.bb => python3-hypothesis_6.9.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-hypothesis_6.2.0.bb => python3-hypothesis_6.9.1.bb} (81%)meta/recipes-devtools/python/python3-hypothesis_6.9.1.bb renamed from meta/recipes-devtools/python/python3-hypothesis_6.2.0.bb +1 -1
@@ -7,7 +7,7 @@ PYPI_PACKAGE = "hypothesis" inherit pypi setuptools3 -SRC_URI[sha256sum] = "c16fbde26b65c98a2464c48209b066c2f6dab5e8e38acd9d959021eb8d58b6c0" +SRC_URI[sha256sum] = "5e25a0be23b1ff81ecf07e87d82e2e39a79c83c1458178af202ffe4b0183bcca" RDEPENDS_${PN} += "python3-attrs python3-core python3-sortedcontainers"
Signature · 1 line
2.31.1
PATCH 47/61 python3-importlib-metadata: upgrade 3.4.0 -> 3.10.1
In reply to Alexander Kanavin---
...b-metadata_3.4.0.bb => python3-importlib-metadata_3.10.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-importlib-metadata_3.4.0.bb => python3-importlib-metadata_3.10.1.bb} (88%)meta/recipes-devtools/python/python3-importlib-metadata_3.10.1.bb renamed from meta/recipes-devtools/python/python3-importlib-metadata_3.4.0.bb +1 -1
@@ -8,7 +8,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "importlib_metadata" UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" -SRC_URI[sha256sum] = "fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d" +SRC_URI[sha256sum] = "c9356b657de65c53744046fa8f7358afe0714a1af7d570c00c3835c2d724a7c1" S = "${WORKDIR}/importlib_metadata-${PV}"
Signature · 1 line
2.31.1
PATCH 48/61 python3-pytest: upgrade 6.2.2 -> 6.2.3
In reply to Alexander Kanavin---
.../python/{python3-pytest_6.2.2.bb => python3-pytest_6.2.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-pytest_6.2.2.bb => python3-pytest_6.2.3.bb} (93%)meta/recipes-devtools/python/python3-pytest_6.2.3.bb renamed from meta/recipes-devtools/python/python3-pytest_6.2.2.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " -SRC_URI[sha256sum] = "9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9" +SRC_URI[sha256sum] = "671238a46e4df0f3498d1c3270e5deb9b32d25134c99b7d75370a68cfbe9b634" inherit update-alternatives pypi setuptools3
Signature · 1 line
2.31.1
PATCH 49/61 python3-setuptools-scm: upgrade 5.0.1 -> 6.0.1
In reply to Alexander Kanavin---
...-setuptools-scm_5.0.1.bb => python3-setuptools-scm_6.0.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-setuptools-scm_5.0.1.bb => python3-setuptools-scm_6.0.1.bb} (90%)meta/recipes-devtools/python/python3-setuptools-scm_6.0.1.bb renamed from meta/recipes-devtools/python/python3-setuptools-scm_5.0.1.bb +1 -1
@@ -4,7 +4,7 @@ DESCRIPTION = "setuptools_scm handles managing your Python package versions in S LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[sha256sum] = "c85b6b46d0edd40d2301038cdea96bb6adc14d62ef943e75afb08b3e7bcf142a" +SRC_URI[sha256sum] = "d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92" PYPI_PACKAGE = "setuptools_scm" inherit pypi setuptools3
Signature · 1 line
2.31.1
PATCH 50/61 python3-setuptools: upgrade 54.1.1 -> 56.0.0
In reply to Alexander Kanavin--- ...0001-conditionally-do-not-fetch-code-by-easy_install.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +2 -2
@@ -1,4 +1,4 @@ -From 6380cc63f79abe8b8404c9be5ed5f213a70c8c6a Mon Sep 17 00:00:00 2001 +From 552758405739be9ae220bbd158c2a1b7176fe292 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install
@@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index eeb21b5..eca1edd 100644 +index 0917804..eed4a5a 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -636,6 +636,11 @@ class easy_install(Command):
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 50/61] python3-setuptools: upgrade 54.1.1 -> 56.0.0
Quoted 6 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...0001-conditionally-do-not-fetch-code-by-easy_install.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
change does not match the subject. Is something missing here ?
Quoted 25 lines
meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +2
-3@@ -1,4 +1,4 @@ -From 6380cc63f79abe8b8404c9be5ed5f213a70c8c6a Mon Sep 17 00:00:00 2001 +From 552758405739be9ae220bbd158c2a1b7176fe292 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install@@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index eeb21b5..eca1edd 100644 +index 0917804..eed4a5a 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -636,6 +636,11 @@ class easy_install(Command): --2.31.1
Re: [OE-core] [PATCH 50/61] python3-setuptools: upgrade 54.1.1 -> 56.0.0
Quoted 11 lines · Khem Raj
Quoted 6 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...0001-conditionally-do-not-fetch-code-by-easy_install.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)change does not match the subject. Is something missing here ?
Someone else's update merged first, and rebase on top of that left only these pieces instead of dropping the patch. I'll remove it now locally.
Alex
PATCH 51/61 stress-ng: upgrade 0.12.05 -> 0.12.06
In reply to Alexander Kanavin---
.../stress-ng/{stress-ng_0.12.05.bb => stress-ng_0.12.06.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/stress-ng/{stress-ng_0.12.05.bb => stress-ng_0.12.06.bb} (90%)meta/recipes-extended/stress-ng/stress-ng_0.12.06.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.12.05.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ file://no_daddr_t.patch \ " -SRC_URI[sha256sum] = "af7779aee38e6d94726ed7d5cf36384a64d50c86e42fff89c141d8609913f425" +SRC_URI[sha256sum] = "75eb340266b1bbae944d8f9281af978bd5bc2c8085df97a098d5500d6f177296" DEPENDS = "coreutils-native"
Signature · 1 line
2.31.1
PATCH 52/61 vala: upgrade 0.50.4 -> 0.52.2
In reply to Alexander Kanavin---
meta/recipes-devtools/vala/{vala_0.50.4.bb => vala_0.52.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/vala/{vala_0.50.4.bb => vala_0.52.2.bb} (50%)meta/recipes-devtools/vala/vala_0.52.2.bb renamed from meta/recipes-devtools/vala/vala_0.50.4.bb +1 -1
@@ -2,4 +2,4 @@ require ${BPN}.inc SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch" -SRC_URI[sha256sum] = "58fc31fa8bf492035b11d1a7d514801710afc65bd458b24c0f8d00280a92a38c" +SRC_URI[sha256sum] = "3a3c460803ba661e513be3d0984b583e05473f602c75fa98e91755503714a97b"
Signature · 1 line
2.31.1
PATCH 53/61 x264: upgrade to latest revision
In reply to Alexander Kanavin--- meta/recipes-multimedia/x264/x264_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/x264/x264_git.bb +1 -1
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "544c61f082194728d0391fb280a6e138ba320a96" +SRCREV = "55d517bc4569272a2c9a367a4106c234aba2ffbc" PV = "r3039+git${SRCPV}"
Signature · 1 line
2.31.1
PATCH 54/61 xkbcomp: upgrade 1.4.4 -> 1.4.5
In reply to Alexander KanavinLicense-Update: formatting
---
.../xorg-app/{xkbcomp_1.4.4.bb => xkbcomp_1.4.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-app/{xkbcomp_1.4.4.bb => xkbcomp_1.4.5.bb} (74%)meta/recipes-graphics/xorg-app/xkbcomp_1.4.5.bb renamed from meta/recipes-graphics/xorg-app/xkbcomp_1.4.4.bb +2 -2
@@ -7,7 +7,7 @@ XKB keymap into one of several output formats. The most common use for \ xkbcomp is to create a compiled keymap file (.xkm extension) which can \ be read directly by XKB-capable X servers or utilities." -LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a" +LIC_FILES_CHKSUM = "file://COPYING;md5=be5e191f04d3f2cd80aa83b928ba984c" DEPENDS += "libxkbfile"
@@ -15,4 +15,4 @@ BBCLASSEXTEND = "native" EXTRA_OECONF += "--disable-selective-werror" -SRC_URI[sha256sum] = "59cce603a607a17722a0a1cf99010f4894e7812beb5d695abbc08474d59af27e" +SRC_URI[sha256sum] = "6851086c4244b6fd0cc562880d8ff193fb2bbf1e141c73632e10731b31d4b05e"
Signature · 1 line
2.31.1
PATCH 55/61 xorgproto: upgrade 2020.1 -> 2021.3
In reply to Alexander KanavinLicense-Update: formatting
---
.../xorg-proto/{xorgproto_2020.1.bb => xorgproto_2021.3.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-graphics/xorg-proto/{xorgproto_2020.1.bb => xorgproto_2021.3.bb} (77%)meta/recipes-graphics/xorg-proto/xorgproto_2021.3.bb renamed from meta/recipes-graphics/xorg-proto/xorgproto_2020.1.bb +2 -4
@@ -1,4 +1,3 @@ - SUMMARY = "X Window System unified protocol definitions" DESCRIPTION = "This package provides the headers and specification documents defining \ the core protocol and (many) extensions for the X Window System"
@@ -7,11 +6,10 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" SECTION = "x11/libs" LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676" +LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=dfc4bd2b0568b31725b85b0604e69b56" SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.bz2" -SRC_URI[md5sum] = "c29f4fa78f53b52b3efdc71ebd9506b6" -SRC_URI[sha256sum] = "54a153f139035a376c075845dd058049177212da94d7a9707cf9468367b699d2" +SRC_URI[sha256sum] = "4c732b14fc7c7db64306374d9e8386d6172edbb93f587614df1938b9d9b9d737" inherit meson
Signature · 1 line
2.31.1
PATCH 56/61 xserver-xorg: upgrade 1.20.10 -> 1.20.11
In reply to Alexander Kanavin---
.../xserver-xorg/CVE-2021-3472.patch | 43 -------------------
...org_1.20.10.bb => xserver-xorg_1.20.11.bb} | 3 +-
2 files changed, 1 insertion(+), 45 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-3472.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.10.bb => xserver-xorg_1.20.11.bb} (91%)meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-3472.patch deleted +0 -43
@@ -1,43 +0,0 @@ -From 7aaf54a1884f71dc363f0b884e57bcb67407a6cd Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <[email protected]> -Date: Sun, 21 Mar 2021 18:38:57 +0100 -Subject: [PATCH] Fix XChangeFeedbackControl() request underflow - -CVE-2021-3472 / ZDI-CAN-1259 - -This vulnerability was discovered by: -Jan-Niklas Sohn working with Trend Micro Zero Day Initiative - -Signed-off-by: Matthieu Herrb <[email protected]> - -Upstream-Status: Backport -CVE: CVE-2021-3472 - -Reference to upstream patch: -[https://gitlab.freedesktop.org/xorg/xserver/-/commit/7aaf54a1884f71dc363f0b884e57bcb67407a6cd] - -Signed-off-by: Stefan Ghinea <[email protected]> ---- - Xi/chgfctl.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c -index 1de4da9..7a597e4 100644 ---- a/Xi/chgfctl.c -+++ b/Xi/chgfctl.c -@@ -464,8 +464,11 @@ ProcXChangeFeedbackControl(ClientPtr client) - break; - case StringFeedbackClass: - { -- xStringFeedbackCtl *f = ((xStringFeedbackCtl *) &stuff[1]); -+ xStringFeedbackCtl *f; - -+ REQUEST_AT_LEAST_EXTRA_SIZE(xChangeFeedbackControlReq, -+ sizeof(xStringFeedbackCtl)); -+ f = ((xStringFeedbackCtl *) &stuff[1]); - if (client->swapped) { - if (len < bytes_to_int32(sizeof(xStringFeedbackCtl))) - return BadLength; --- -2.17.1 -
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb +1 -2
@@ -7,9 +7,8 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ - file://CVE-2021-3472.patch \ " -SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" +SRC_URI[sha256sum] = "914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades.
Signature · 1 line
2.31.1
PATCH 57/61 python3: add markdown/smartypants/typogrify modules
In reply to Alexander KanavinThis is needed to enable gi-docgen, a successor to gtk-doc
--- meta/conf/distro/include/maintainers.inc | 3 +++ .../python/python3-markdown_3.3.3.bb | 14 ++++++++++++++ .../python/python3-smartypants_2.0.0.bb | 12 ++++++++++++ .../python/python3-typogrify_2.0.7.bb | 14 ++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-markdown_3.3.3.bb create mode 100644 meta/recipes-devtools/python/python3-smartypants_2.0.0.bb create mode 100644 meta/recipes-devtools/python/python3-typogrify_2.0.7.bb
meta/conf/distro/include/maintainers.inc +3 -0
@@ -608,6 +608,7 @@ RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard Purdie <richard.purdie@linuxfound RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER_pn-python3-markdown = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-python3-markupsafe = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER_pn-python3-more-itertools = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <[email protected]>"
@@ -630,11 +631,13 @@ RECIPE_MAINTAINER_pn-python3-scons-native = "Tim Orling <timothy.t.orling@linux. RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-setuptools-scm = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-six = "Zang Ruochen <[email protected]>" +RECIPE_MAINTAINER_pn-python3-smartypants = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-python3-smmap = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-sortedcontainers = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-subunit = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-testtools = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-toml = "Tim Orling <[email protected]>" +RECIPE_MAINTAINER_pn-python3-typogrify = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-python3-wcwidth = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-zipp = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-qemu = "Richard Purdie <[email protected]>"
meta/recipes-devtools/python/python3-markdown_3.3.3.bb new file +14 -0
@@ -0,0 +1,14 @@ +SUMMARY = "A Python implementation of John Gruber's Markdown." +HOMEPAGE = "https://python-markdown.github.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "Markdown" +SRC_URI[md5sum] = "034e3bccfde211d44b4a7a69cb290ba0" +SRC_URI[sha256sum] = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18" + +BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools"
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +12 -0
@@ -0,0 +1,12 @@ +SUMMARY = "Translator of plain ASCII punctuation characters into 'smart' typographic punctuation HTML entities" +HOMEPAGE = "https://pythonhosted.org/smartypants/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=977036977591ac666c728921ecc54c4f" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "smartypants" +SRC_URI[sha256sum] = "7812353a32022699a1aa8cd5626e01c94a946dcaeedaee2d0b382bae4c4cbf36" + +BBCLASSEXTEND = "native" +
meta/recipes-devtools/python/python3-typogrify_2.0.7.bb new file +14 -0
@@ -0,0 +1,14 @@ +SUMMARY = "Filters to enhance web typography, including support for Django & Jinja templates" +HOMEPAGE = "https://github.com/mintchaos/typogrify" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=12bc792d6f5415dbf421f3fd183c6dd2" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "typogrify" +SRC_URI[sha256sum] = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38" + +BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-smartypants" +
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 57/61] python3: add markdown/smartypants/typogrify modules
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb
Quoted 64 lines · Alexander Kanavin
This is needed to enable gi-docgen, a successor to gtk-doc
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 3 +++ .../python/python3-markdown_3.3.3.bb | 14 ++++++++++++++ .../python/python3-smartypants_2.0.0.bb | 12 ++++++++++++ .../python/python3-typogrify_2.0.7.bb | 14 ++++++++++++++ 4 files changed, 43 insertions(+)create mode 100644 meta/recipes-devtools/python/python3-markdown_3.3.3.bb create mode 100644 meta/recipes-devtools/python/python3-smartypants_2.0.0.bb create mode 100644 meta/recipes-devtools/python/python3-typogrify_2.0.7.bb
meta/conf/distro/include/maintainers.inc +3
-0@@ -608,6 +608,7 @@ RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard Purdie <richard.purdie@linuxfound RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER_pn-python3-markdown = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-python3-markupsafe = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER_pn-python3-more-itertools = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <[email protected]>"@@ -630,11 +631,13 @@ RECIPE_MAINTAINER_pn-python3-scons-native = "Tim Orling <timothy.t.orling@linux. RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-setuptools-scm = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-six = "Zang Ruochen <[email protected]>" +RECIPE_MAINTAINER_pn-python3-smartypants = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-python3-smmap = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-sortedcontainers = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-subunit = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-testtools = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-toml = "Tim Orling <[email protected]>" +RECIPE_MAINTAINER_pn-python3-typogrify = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-python3-wcwidth = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-zipp = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-qemu = "Richard Purdie <[email protected]>"meta/recipes-devtools/python/python3-markdown_3.3.3.bb new file +14
-0@@ -0,0 +1,14 @@ +SUMMARY = "A Python implementation of John Gruber's Markdown." +HOMEPAGE = "https://python-markdown.github.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "Markdown" +SRC_URI[md5sum] = "034e3bccfde211d44b4a7a69cb290ba0" +SRC_URI[sha256sum] = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18" + +BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools"meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +0
-0
According to pypi this isn't the latest version, but 2.0.1 isn't available as sources - also this project is unmaintained and the repo isn't even available anymore - what's the process for these kind of recipes?
Quoted 38 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +12
-0@@ -0,0 +1,12 @@ +SUMMARY = "Translator of plain ASCII punctuation characters into 'smart' typographic punctuation HTML entities" +HOMEPAGE = "https://pythonhosted.org/smartypants/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=977036977591ac666c728921ecc54c4f" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "smartypants" +SRC_URI[sha256sum] = "7812353a32022699a1aa8cd5626e01c94a946dcaeedaee2d0b382bae4c4cbf36" + +BBCLASSEXTEND = "native" +meta/recipes-devtools/python/python3-typogrify_2.0.7.bb new file +14
-0@@ -0,0 +1,14 @@ +SUMMARY = "Filters to enhance web typography, including support for Django & Jinja templates" +HOMEPAGE = "https://github.com/mintchaos/typogrify" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=12bc792d6f5415dbf421f3fd183c6dd2" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "typogrify" +SRC_URI[sha256sum] = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38" + +BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-smartypants" +
Re: [OE-core] [PATCH 57/61] python3: add markdown/smartypants/typogrify modules
Quoted 64 lines · Konrad Weihmann
Quoted 60 lines · Alexander Kanavin
This is needed to enable gi-docgen, a successor to gtk-doc
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 3 +++ .../python/python3-markdown_3.3.3.bb | 14 ++++++++++++++ .../python/python3-smartypants_2.0.0.bb | 12 ++++++++++++ .../python/python3-typogrify_2.0.7.bb | 14 ++++++++++++++ 4 files changed, 43 insertions(+)create mode 100644 meta/recipes-devtools/python/python3-markdown_3.3.3.bb create mode 100644 meta/recipes-devtools/python/python3-smartypants_2.0.0.bb create mode 100644 meta/recipes-devtools/python/python3-typogrify_2.0.7.bb
meta/conf/distro/include/maintainers.inc +3
-0@@ -608,6 +608,7 @@ RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard Purdie <richard.purdie@linuxfound RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER_pn-python3-markdown = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-python3-markupsafe = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER_pn-python3-more-itertools = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <[email protected]>"@@ -630,11 +631,13 @@ RECIPE_MAINTAINER_pn-python3-scons-native = "Tim Orling <timothy.t.orling@linux. RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-setuptools-scm = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-six = "Zang Ruochen <[email protected]>" +RECIPE_MAINTAINER_pn-python3-smartypants = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-python3-smmap = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-sortedcontainers = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-subunit = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-testtools = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-toml = "Tim Orling <[email protected]>" +RECIPE_MAINTAINER_pn-python3-typogrify = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-python3-wcwidth = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-zipp = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-qemu = "Richard Purdie <[email protected]>"meta/recipes-devtools/python/python3-markdown_3.3.3.bb new file +14
-0@@ -0,0 +1,14 @@ +SUMMARY = "A Python implementation of John Gruber's Markdown." +HOMEPAGE = "https://python-markdown.github.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "Markdown" +SRC_URI[md5sum] = "034e3bccfde211d44b4a7a69cb290ba0" +SRC_URI[sha256sum] = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18" + +BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools"meta/recipes-devtools/python/python3-smartypants_2.0.0.bb +0
-0
Quoted 9 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb
Quoted 4 lines
new file mode 100644
index 0000000000..8acc971c35meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +0
-0According to pypi this isn't the latest version, but 2.0.1 isn't available as sources - also this project is unmaintained and the repo isn't even available anymore - what's the process for these kind of recipes?
looking at the URL https://pythonhosted.org/smartypants/
As of 2016-12-28, smartypants is looking for new maintainer to take
over, please contact project owner on Bitbucket.
yeah we should not add unmaintained new recipe additions for dead packages to at least oe-core
if gi-docgen, is next-gen for gtk-doc then report it upstream that they have such a dependency and whats their plan because next-gen tells me that they might looking into future
Quoted 41 lines
Quoted 38 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +12
-0@@ -0,0 +1,12 @@ +SUMMARY = "Translator of plain ASCII punctuation characters into 'smart' typographic punctuation HTML entities" +HOMEPAGE = "https://pythonhosted.org/smartypants/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=977036977591ac666c728921ecc54c4f" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "smartypants" +SRC_URI[sha256sum] = "7812353a32022699a1aa8cd5626e01c94a946dcaeedaee2d0b382bae4c4cbf36" + +BBCLASSEXTEND = "native" +meta/recipes-devtools/python/python3-typogrify_2.0.7.bb new file +14
-0@@ -0,0 +1,14 @@ +SUMMARY = "Filters to enhance web typography, including support for Django & Jinja templates" +HOMEPAGE = "https://github.com/mintchaos/typogrify" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=12bc792d6f5415dbf421f3fd183c6dd2" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "typogrify" +SRC_URI[sha256sum] = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38" + +BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-smartypants" +
Re: [OE-core] [PATCH 57/61] python3: add markdown/smartypants/typogrify modules
The repo is here:
https://github.com/leohemsted/smartypants.py
I opened an issue:
https://github.com/mintchaos/typogrify/issues/56
gi-docgen doesn't depend on it directly, but rather through typogrify.
Alex
Quoted 169 lines · Khem Raj
Quoted 10 lines · Konrad Weihmann
Quoted 6 lines · Alexander Kanavin
This is needed to enable gi-docgen, a successor to gtk-doc
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 3 +++ .../python/python3-markdown_3.3.3.bb | 14++++++++++++++
Quoted 2 lines
Quoted 2 lines
.../python/python3-smartypants_2.0.0.bb | 12 ++++++++++++ .../python/python3-typogrify_2.0.7.bb | 14++++++++++++++
Quoted 2 lines
Quoted 2 lines
4 files changed, 43 insertions(+)create mode 100644 meta/recipes-devtools/python/
python3-markdown_3.3.3.bb
Quoted 1 line
Quoted 1 line
create mode 100644 meta/recipes-devtools/python/
python3-smartypants_2.0.0.bb
Quoted 1 line
Quoted 1 line
create mode 100644 meta/recipes-devtools/python/
python3-typogrify_2.0.7.bb
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta/conf/distro/include/maintainers.inc
Quoted 4 lines
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard
Quoted 4 lines
index
140f7b490e..0c3e3628ba100644meta/conf/distro/include/maintainers.inc +0
-0@@ -608,6 +608,7 @@ RECIPE_MAINTAINER_pn-python3-jinja2 = "RichardPurdie <richard.purdie@linuxfound
Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard · line 608
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard · line 609
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard · line 610
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard · line 611
Quoted 1 line
meta/conf/distro/include/maintainers.inc +1
-0+RECIPE_MAINTAINER_pn-python3-markdown = "Alexander Kanavin <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard · line 612
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-markupsafe = "Richard Purdie <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard · line 613
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-more-itertools = "Tim Orling <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard · line 614
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0@@ -630,11 +631,13 @@ RECIPE_MAINTAINER_pn-python3-scons-native = "TimOrling <timothy.t.orling@linux.
Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 631
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 632
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-setuptools-scm = "Tim Orling <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 633
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-six = "Zang Ruochen <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 634
Quoted 1 line
meta/conf/distro/include/maintainers.inc +1
-0+RECIPE_MAINTAINER_pn-python3-smartypants = "Alexander Kanavin <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 635
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-smmap = "Oleksandr Kravchuk <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 636
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-sortedcontainers = "Tim Orling <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 637
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-subunit = "Oleksandr Kravchuk <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 638
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-testtools = "Oleksandr Kravchuk <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 639
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-toml = "Tim Orling <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 640
Quoted 1 line
meta/conf/distro/include/maintainers.inc +1
-0+RECIPE_MAINTAINER_pn-python3-typogrify = "Alexander Kanavin <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 641
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-wcwidth = "Tim Orling <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 642
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-python3-zipp = "Tim Orling <Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-python3-scons-native = "Tim · line 643
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER_pn-qemu = "Richard Purdie <Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0b/meta/recipes-devtools/python/python3-markdown_3.3.3.bb
Quoted 9 lines
meta/recipes-devtools/python/python3-markdown_3.3.3.bb line 4
Quoted 9 lines
new file mode 100644
index 0000000000..c456f05541meta/recipes-devtools/python/python3-markdown_3.3.3.bb new file +4
-0@@ -0,0 +1,14 @@ +SUMMARY = "A Python implementation of John Gruber's Markdown." +HOMEPAGE = "https://python-markdown.github.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM ="file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed"
Quoted 6 lines
meta/recipes-devtools/python/python3-markdown_3.3.3.bb
Quoted 6 lines
meta/recipes-devtools/python/python3-markdown_3.3.3.bb new file +6
-0+ +inherit pypi setuptools3 + +PYPI_PACKAGE = "Markdown" +SRC_URI[md5sum] = "034e3bccfde211d44b4a7a69cb290ba0" +SRC_URI[sha256sum] ="
5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18"Quoted 5 lines
Review
Quoted 5 lines
meta/recipes-devtools/python/python3-markdown_3.3.3.bb new file +4
-0+ +BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools"(quoted diff) +0
-0b/meta/recipes-devtools/python/python3-smartypants_2.0.0.bb
Quoted 8 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb
Quoted 4 lines
new file mode 100644
index 0000000000..8acc971c35meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +0
-0According to pypi this isn't the latest version, but 2.0.1 isn't available as sources - also this project is unmaintained and the repo isn't even available anymore - what's the process for these kind of
recipes?
Quoted 1 line
looking at the URL https://pythonhosted.org/smartypants/
As of 2016-12-28, smartypants is looking for new maintainer to take
over, please contact project owner on Bitbucket.yeah we should not add unmaintained new recipe additions for dead packages to at least oe-core
if gi-docgen, is next-gen for gtk-doc then report it upstream that they have such a dependency and whats their plan because next-gen tells me that they might looking into futureQuoted 2 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb line 1
Quoted 2 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +1
-0@@ -0,0 +1,12 @@ +SUMMARY = "Translator of plain ASCII punctuation characters into'smart' typographic punctuation HTML entities"
Quoted 3 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb
Quoted 3 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +3
-0+HOMEPAGE = "https://pythonhosted.org/smartypants/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM ="file://COPYING;md5=977036977591ac666c728921ecc54c4f"
Quoted 5 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb
Quoted 5 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +5
-0+ +inherit pypi setuptools3 + +PYPI_PACKAGE = "smartypants" +SRC_URI[sha256sum] ="
7812353a32022699a1aa8cd5626e01c94a946dcaeedaee2d0b382bae4c4cbf36"Quoted 4 lines
Review
Quoted 4 lines
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb new file +3
-0+ +BBCLASSEXTEND = "native" +(quoted diff) +0
-0b/meta/recipes-devtools/python/python3-typogrify_2.0.7.bb
Quoted 6 lines
meta/recipes-devtools/python/python3-typogrify_2.0.7.bb line 1
Quoted 6 lines
new file mode 100644
index 0000000000..3becb0dd8dmeta/recipes-devtools/python/python3-typogrify_2.0.7.bb new file +1
-0@@ -0,0 +1,14 @@ +SUMMARY = "Filters to enhance web typography, including support forDjango & Jinja templates"
Quoted 3 lines
meta/recipes-devtools/python/python3-typogrify_2.0.7.bb
Quoted 3 lines
meta/recipes-devtools/python/python3-typogrify_2.0.7.bb new file +3
-0+HOMEPAGE = "https://github.com/mintchaos/typogrify" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM ="file://LICENSE.txt;md5=12bc792d6f5415dbf421f3fd183c6dd2"
Quoted 5 lines
meta/recipes-devtools/python/python3-typogrify_2.0.7.bb
Quoted 5 lines
meta/recipes-devtools/python/python3-typogrify_2.0.7.bb new file +5
-0+ +inherit pypi setuptools3 + +PYPI_PACKAGE = "typogrify" +SRC_URI[sha256sum] ="
8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"Quoted 13 lines
Quoted 10 lines
meta/recipes-devtools/python/python3-typogrify_2.0.7.bb new file +5
-0+ +BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-smartypants" +
Re: [OE-core] [PATCH 57/61] python3: add markdown/smartypants/typogrify modules
Quoted 5 lines · Alexander Kanavin
The repo is here:
https://github.com/leohemsted/smartypants.py <https://github.com/leohemsted/smartypants.py>I opened an issue:
https://github.com/mintchaos/typogrify/issues/56 <https://github.com/mintchaos/typogrify/issues/56>
Thanks for that one - but if this project is still alive (just relocated from bitbucket to GH), wouldn't it make more sense to introduce the 2.0.1 version pulled via git instead of the pretty outdated 2.0.0 from pypi?
Quoted 211 lines
gi-docgen doesn't depend on it directly, but rather through typogrify.
Alex
On Wed, 5 May 2021 at 19:51, Khem Raj <[email protected] <mailto:[email protected]>> wrote:
On Wed, May 5, 2021 at 8:39 AM Konrad Weihmann <[email protected] <mailto:[email protected]>> wrote: > > > > On 05.05.21 17:18, Alexander Kanavin wrote: > > This is needed to enable gi-docgen, a successor to gtk-doc > > > > Signed-off-by: Alexander Kanavin <[email protected] <mailto:[email protected]>> > > --- > > meta/conf/distro/include/maintainers.inc | 3 +++ > > .../python/python3-markdown_3.3.3.bb <http://python3-markdown_3.3.3.bb> | 14 ++++++++++++++ > > .../python/python3-smartypants_2.0.0.bb <http://python3-smartypants_2.0.0.bb> | 12 ++++++++++++ > > .../python/python3-typogrify_2.0.7.bb <http://python3-typogrify_2.0.7.bb> | 14 ++++++++++++++ > > 4 files changed, 43 insertions(+) > > create mode 100644 meta/recipes-devtools/python/python3-markdown_3.3.3.bb <http://python3-markdown_3.3.3.bb> > > create mode 100644 meta/recipes-devtools/python/python3-smartypants_2.0.0.bb <http://python3-smartypants_2.0.0.bb> > > create mode 100644 meta/recipes-devtools/python/python3-typogrify_2.0.7.bb <http://python3-typogrify_2.0.7.bb> > > > > diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc > > index 140f7b490e..0c3e3628ba 100644 > > --- a/meta/conf/distro/include/maintainers.inc > > +++ b/meta/conf/distro/include/maintainers.inc > > @@ -608,6 +608,7 @@ RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard Purdie <richard.purdie@linuxfound > > RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <[email protected] <mailto:[email protected]>>" > > +RECIPE_MAINTAINER_pn-python3-markdown = "Alexander Kanavin <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-markupsafe = "Richard Purdie <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-more-itertools = "Tim Orling <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <[email protected] <mailto:[email protected]>>" > > @@ -630,11 +631,13 @@ RECIPE_MAINTAINER_pn-python3-scons-native = "Tim Orling <timothy.t.orling@linux. > > RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-setuptools-scm = "Tim Orling <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-six = "Zang Ruochen <[email protected] <mailto:[email protected]>>" > > +RECIPE_MAINTAINER_pn-python3-smartypants = "Alexander Kanavin <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-smmap = "Oleksandr Kravchuk <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-sortedcontainers = "Tim Orling <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-subunit = "Oleksandr Kravchuk <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-testtools = "Oleksandr Kravchuk <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-toml = "Tim Orling <[email protected] <mailto:[email protected]>>" > > +RECIPE_MAINTAINER_pn-python3-typogrify = "Alexander Kanavin <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-wcwidth = "Tim Orling <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-python3-zipp = "Tim Orling <[email protected] <mailto:[email protected]>>" > > RECIPE_MAINTAINER_pn-qemu = "Richard Purdie <[email protected] <mailto:[email protected]>>" > > diff --git a/meta/recipes-devtools/python/python3-markdown_3.3.3.bb <http://python3-markdown_3.3.3.bb> b/meta/recipes-devtools/python/python3-markdown_3.3.3.bb <http://python3-markdown_3.3.3.bb> > > new file mode 100644 > > index 0000000000..c456f05541 > > --- /dev/null > > +++ b/meta/recipes-devtools/python/python3-markdown_3.3.3.bb <http://python3-markdown_3.3.3.bb> > > @@ -0,0 +1,14 @@ > > +SUMMARY = "A Python implementation of John Gruber's Markdown." > > +HOMEPAGE = "https://python-markdown.github.io/ <https://python-markdown.github.io/>" > > +LICENSE = "BSD-3-Clause" > > +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" > > + > > +inherit pypi setuptools3 > > + > > +PYPI_PACKAGE = "Markdown" > > +SRC_URI[md5sum] = "034e3bccfde211d44b4a7a69cb290ba0" > > +SRC_URI[sha256sum] = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18" > > + > > +BBCLASSEXTEND = "native" > > + > > +RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools" > > diff --git a/meta/recipes-devtools/python/python3-smartypants_2.0.0.bb <http://python3-smartypants_2.0.0.bb> b/meta/recipes-devtools/python/python3-smartypants_2.0.0.bb <http://python3-smartypants_2.0.0.bb> > > new file mode 100644 > > index 0000000000..8acc971c35 > > --- /dev/null > > +++ b/meta/recipes-devtools/python/python3-smartypants_2.0.0.bb <http://python3-smartypants_2.0.0.bb> > > According to pypi this isn't the latest version, but 2.0.1 isn't > available as sources - also this project is unmaintained and the repo > isn't even available anymore - what's the process for these kind of recipes? > looking at the URL https://pythonhosted.org/smartypants/ <https://pythonhosted.org/smartypants/> As of 2016-12-28, smartypants is looking for new maintainer to take over, please contact project owner on Bitbucket. yeah we should not add unmaintained new recipe additions for dead packages to at least oe-core if gi-docgen, is next-gen for gtk-doc then report it upstream that they have such a dependency and whats their plan because next-gen tells me that they might looking into future > > @@ -0,0 +1,12 @@ > > +SUMMARY = "Translator of plain ASCII punctuation characters into 'smart' typographic punctuation HTML entities" > > +HOMEPAGE = "https://pythonhosted.org/smartypants/ <https://pythonhosted.org/smartypants/>" > > +LICENSE = "BSD-3-Clause" > > +LIC_FILES_CHKSUM = "file://COPYING;md5=977036977591ac666c728921ecc54c4f" > > + > > +inherit pypi setuptools3 > > + > > +PYPI_PACKAGE = "smartypants" > > +SRC_URI[sha256sum] = "7812353a32022699a1aa8cd5626e01c94a946dcaeedaee2d0b382bae4c4cbf36" > > + > > +BBCLASSEXTEND = "native" > > + > > diff --git a/meta/recipes-devtools/python/python3-typogrify_2.0.7.bb <http://python3-typogrify_2.0.7.bb> b/meta/recipes-devtools/python/python3-typogrify_2.0.7.bb <http://python3-typogrify_2.0.7.bb> > > new file mode 100644 > > index 0000000000..3becb0dd8d > > --- /dev/null > > +++ b/meta/recipes-devtools/python/python3-typogrify_2.0.7.bb <http://python3-typogrify_2.0.7.bb> > > @@ -0,0 +1,14 @@ > > +SUMMARY = "Filters to enhance web typography, including support for Django & Jinja templates" > > +HOMEPAGE = "https://github.com/mintchaos/typogrify <https://github.com/mintchaos/typogrify>" > > +LICENSE = "BSD-3-Clause" > > +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=12bc792d6f5415dbf421f3fd183c6dd2" > > + > > +inherit pypi setuptools3 > > + > > +PYPI_PACKAGE = "typogrify" > > +SRC_URI[sha256sum] = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38" > > + > > +BBCLASSEXTEND = "native" > > + > > +RDEPENDS_${PN} += "${PYTHON_PN}-smartypants" > > + > > > > > > > > > > > > >
Re: [OE-core] [PATCH 57/61] python3: add markdown/smartypants/typogrify modules
Quoted 5 lines · Konrad Weihmann
Quoted 4 lines · Alexander Kanavin
The repo is here:
https://github.com/leohemsted/smartypants.py
<https://github.com/leohemsted/smartypants.py>
Quoted 9 lines
Quoted 3 lines
I opened an issue:
https://github.com/mintchaos/typogrify/issues/56
<https://github.com/mintchaos/typogrify/issues/56>Thanks for that one - but if this project is still alive (just relocated from bitbucket to GH), wouldn't it make more sense to introduce the 2.0.1 version pulled via git instead of the pretty outdated 2.0.0 from pypi?
I don't think it's alive, open issues and PRs all dead, last commit in 2017 shortly after 2.0.1 release.
If it becomes alive again, it'll almost certainly be a fork in another location,
and pypi would then automatically take care of it for us. Besides pypi recipes are
much easier to write, and this is a very marginal module :)
Alex
Re: [OE-core] [PATCH 57/61] python3: add markdown/smartypants/typogrify modules
Quoted 22 lines · Alexander Kanavin
On Wed, 5 May 2021 at 21:06, Konrad Weihmann <[email protected] <mailto:[email protected]>> wrote:
On 05.05.21 21:03, Alexander Kanavin wrote:
> The repo is here:
> https://github.com/leohemsted/smartypants.py
<https://github.com/leohemsted/smartypants.py>
> <https://github.com/leohemsted/smartypants.py
<https://github.com/leohemsted/smartypants.py>>
>
> I opened an issue:
> https://github.com/mintchaos/typogrify/issues/56
<https://github.com/mintchaos/typogrify/issues/56>
> <https://github.com/mintchaos/typogrify/issues/56
<https://github.com/mintchaos/typogrify/issues/56>>Thanks for that one - but if this project is still alive (just relocated
from bitbucket to GH), wouldn't it make more sense to introduce the 2.0.1 version pulled via git instead of the pretty outdated 2.0.0 from pypi?
Quoted 7 lines
I don't think it's alive, open issues and PRs all dead, last commit in 2017 shortly after 2.0.1 release.
If it becomes alive again, it'll almost certainly be a fork in another location, and pypi would then automatically take care of it for us. Besides pypi recipes are much easier to write, and this is a very marginal module :)
Alex
Agree - looking at https://github.com/leohemsted/smartypants.py/compare/v2.0.0...master there isn't much of a functional change either.
The status of typogrify isn't also not very convincing - changes from 2014 till today haven't been released - so it might be worth a shot to open a ticket at gi-docgen and ask about the need for this outdated/likely unmaintained dependency
Re: [OE-core] [PATCH 57/61] python3: add markdown/smartypants/typogrify modules
Quoted 9 lines · Konrad Weihmann
Agree - looking at
https://github.com/leohemsted/smartypants.py/compare/v2.0.0...master
there isn't much of a functional change either.The status of typogrify isn't also not very convincing - changes from 2014 till today haven't been released - so it might be worth a shot to open a ticket at gi-docgen and ask about the need for this outdated/likely unmaintained dependency
This
https://github.com/mintchaos/typogrify/commit/dda5baed03b7948fe101b0c691aaf330157d7f94
is recent enough that I don't think that is necessary yet. Let's see what they say about smartypants.
Alex
PATCH 58/61 gi-docgen: add a recipe and class
In reply to Alexander KanavinThis seems to be the gtk-doc successor, and gnome projects such as pango and gdk-pixbuf have started transitioning to it.
--- meta/classes/gi-docgen.bbclass | 24 +++++++++++++++++++ meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-gnome/gi-docgen/gi-docgen_git.bb | 22 +++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 meta/classes/gi-docgen.bbclass create mode 100644 meta/recipes-gnome/gi-docgen/gi-docgen_git.bb
meta/classes/gi-docgen.bbclass new file +24 -0
@@ -0,0 +1,24 @@ +# gi-docgen is a new gnome documentation generator, which +# seems to be a successor to gtk-doc: +# https://gitlab.gnome.org/GNOME/gi-docgen + +# This variable is set to True if api-documentation is in +# DISTRO_FEATURES, and False otherwise. +GIDOCGEN_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'True', 'False', d)}" +# When building native recipes, disable gi-docgen, as it is not necessary, +# pulls in additional dependencies, and makes build times longer +GIDOCGEN_ENABLED_class-native = "False" +GIDOCGEN_ENABLED_class-nativesdk = "False" + +# meson: default option name to enable/disable gi-docgen. This matches most +# projects' configuration. In doubts - check meson_options.txt in project's +# source path. +GIDOCGEN_MESON_OPTION ?= 'gtk_doc' +GIDOCGEN_MESON_ENABLE_FLAG ?= 'true' +GIDOCGEN_MESON_DISABLE_FLAG ?= 'false' + +# Auto enable/disable based on GIDOCGEN_ENABLED +EXTRA_OEMESON_prepend = "-D${GIDOCGEN_MESON_OPTION}=${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '${GIDOCGEN_MESON_ENABLE_FLAG}', '${GIDOCGEN_MESON_DISABLE_FLAG}', d)} " + +DEPENDS_append = "${@' gi-docgen-native gi-docgen' if d.getVar('GIDOCGEN_ENABLED') == 'True' else ''}" +
meta/conf/distro/include/maintainers.inc +1 -0
@@ -205,6 +205,7 @@ RECIPE_MAINTAINER_pn-gdk-pixbuf = "Ross Burton <[email protected]>" RECIPE_MAINTAINER_pn-gettext = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-gettext-minimal-native = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-ghostscript = "Hongxu Jia <[email protected]>" +RECIPE_MAINTAINER_pn-gi-docgen = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-git = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-glew = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-glib-2.0 = "Anuj Mittal <[email protected]>"
meta/recipes-gnome/gi-docgen/gi-docgen_git.bb new file +22 -0
@@ -0,0 +1,22 @@ +SUMMARY = "Documentation tool for GObject-based libraries" +DESCRIPTION = "GI-DocGen is a document generator for GObject-based libraries. GObject is \ +the base type system of the GNOME project. GI-Docgen reuses the \ +introspection data generated by GObject-based libraries to generate the API \ +reference of these libraries, as well as other ancillary documentation." +HOMEPAGE = "https://gnome.pages.gitlab.gnome.org/gi-docgen/" + +LICENSE = "GPLv3+ & Apache-2.0" +LIC_FILES_CHKSUM = "file://gi-docgen.py;beginline=1;endline=5;md5=2dc0f1f01202478cfe813c0e7f80b326" + +SRC_URI = "git://gitlab.gnome.org/GNOME/gi-docgen.git;protocol=https;branch=main" + +PV = "2021.5" +SRCREV = "7dee859321573f9c843ef7fb136f11142cb6ddf8" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +RDEPENDS_${PN} += "python3-asyncio python3-core python3-jinja2 python3-json python3-markdown python3-markupsafe python3-pygments python3-toml python3-typogrify python3-xml" + +BBCLASSEXTEND = "native"
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 58/61] gi-docgen: add a recipe and class
Quoted 5 lines · Alexander Kanavin
This seems to be the gtk-doc successor, and gnome projects such as pango and gdk-pixbuf have started transitioning to it.
going through
https://gitlab.gnome.org/GNOME/gi-docgen#disclaimer
it seems that its still under development and not declared stable, so I am wary of the churn it will cause.
I would prefer to wait until at least its declared prime time for system wide inclusion.
Quoted 85 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/classes/gi-docgen.bbclass | 24 +++++++++++++++++++ meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-gnome/gi-docgen/gi-docgen_git.bb | 22 +++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 meta/classes/gi-docgen.bbclass create mode 100644 meta/recipes-gnome/gi-docgen/gi-docgen_git.bbmeta/classes/gi-docgen.bbclass new file +24
-0@@ -0,0 +1,24 @@ +# gi-docgen is a new gnome documentation generator, which +# seems to be a successor to gtk-doc: +# https://gitlab.gnome.org/GNOME/gi-docgen + +# This variable is set to True if api-documentation is in +# DISTRO_FEATURES, and False otherwise. +GIDOCGEN_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'True', 'False', d)}" +# When building native recipes, disable gi-docgen, as it is not necessary, +# pulls in additional dependencies, and makes build times longer +GIDOCGEN_ENABLED_class-native = "False" +GIDOCGEN_ENABLED_class-nativesdk = "False" + +# meson: default option name to enable/disable gi-docgen. This matches most +# projects' configuration. In doubts - check meson_options.txt in project's +# source path. +GIDOCGEN_MESON_OPTION ?= 'gtk_doc' +GIDOCGEN_MESON_ENABLE_FLAG ?= 'true' +GIDOCGEN_MESON_DISABLE_FLAG ?= 'false' + +# Auto enable/disable based on GIDOCGEN_ENABLED +EXTRA_OEMESON_prepend = "-D${GIDOCGEN_MESON_OPTION}=${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '${GIDOCGEN_MESON_ENABLE_FLAG}', '${GIDOCGEN_MESON_DISABLE_FLAG}', d)} " + +DEPENDS_append = "${@' gi-docgen-native gi-docgen' if d.getVar('GIDOCGEN_ENABLED') == 'True' else ''}" +meta/conf/distro/include/maintainers.inc +1
-0@@ -205,6 +205,7 @@ RECIPE_MAINTAINER_pn-gdk-pixbuf = "Ross Burton <[email protected]>" RECIPE_MAINTAINER_pn-gettext = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-gettext-minimal-native = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-ghostscript = "Hongxu Jia <[email protected]>" +RECIPE_MAINTAINER_pn-gi-docgen = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-git = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-glew = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-glib-2.0 = "Anuj Mittal <[email protected]>"meta/recipes-gnome/gi-docgen/gi-docgen_git.bb new file +22
-1@@ -0,0 +1,22 @@ +SUMMARY = "Documentation tool for GObject-based libraries" +DESCRIPTION = "GI-DocGen is a document generator for GObject-based libraries. GObject is \ +the base type system of the GNOME project. GI-Docgen reuses the \ +introspection data generated by GObject-based libraries to generate the API \ +reference of these libraries, as well as other ancillary documentation." +HOMEPAGE = "https://gnome.pages.gitlab.gnome.org/gi-docgen/" + +LICENSE = "GPLv3+ & Apache-2.0" +LIC_FILES_CHKSUM = "file://gi-docgen.py;beginline=1;endline=5;md5=2dc0f1f01202478cfe813c0e7f80b326" + +SRC_URI = "git://gitlab.gnome.org/GNOME/gi-docgen.git;protocol=https;branch=main" + +PV = "2021.5" +SRCREV = "7dee859321573f9c843ef7fb136f11142cb6ddf8" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +RDEPENDS_${PN} += "python3-asyncio python3-core python3-jinja2 python3-json python3-markdown python3-markupsafe python3-pygments python3-toml python3-typogrify python3-xml" + +BBCLASSEXTEND = "native" --2.31.1
Re: [OE-core] [PATCH 58/61] gi-docgen: add a recipe and class
Quoted 8 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
This seems to be the gtk-doc successor, and gnome projects such as pango and gdk-pixbuf have started transitioning to it.
Quoted 8 lines
going through
https://gitlab.gnome.org/GNOME/gi-docgen#disclaimerit seems that its still under development and not declared stable, so I am wary of the churn it will cause.
I would prefer to wait until at least its declared prime time for system wide inclusion.
It is only built if you enable api-documentation, and even then used only in pango and gdk-pixbuf. I'd say it's fairly well contained.
Alex
Re: [OE-core] [PATCH 58/61] gi-docgen: add a recipe and class
Quoted 18 lines · Alexander Kanavin
Quoted 7 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
This seems to be the gtk-doc successor, and gnome projects such as pango and gdk-pixbuf have started transitioning to it.
Quoted 8 lines
going through
https://gitlab.gnome.org/GNOME/gi-docgen#disclaimerit seems that its still under development and not declared stable, so I am wary of the churn it will cause.
I would prefer to wait until at least its declared prime time for system wide inclusion.
Quoted 2 lines
It is only built if you enable api-documentation, and even then used only in pango and gdk-pixbuf. I'd say it's fairly well contained.
I did also have a quick chat with friends in that community and their advice was that it was ok to switch now FWIW...
Cheers,
Richard
Re: [OE-core] [PATCH 58/61] gi-docgen: add a recipe and class
Quoted 20 lines · Richard Purdie
Quoted 18 lines · Alexander Kanavin
Quoted 15 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
This seems to be the gtk-doc successor, and gnome projects such as pango and gdk-pixbuf have started transitioning to it.
going through
https://gitlab.gnome.org/GNOME/gi-docgen#disclaimerit seems that its still under development and not declared stable, so I am wary of the churn it will cause.
I would prefer to wait until at least its declared prime time for system wide inclusion.
Quoted 5 lines
Quoted 2 lines
It is only built if you enable api-documentation, and even then used only in pango and gdk-pixbuf. I'd say it's fairly well contained.
I did also have a quick chat with friends in that community and their advice was that it was ok to switch now FWIW...
ok, that helps, perhaps they can reflect this assertion in document above? but still, depending upon abandoned packages needs to be answered by upstream IMO before we tread down this path
Quoted 5 lines
Cheers,
Richard
Re: [OE-core] [PATCH 58/61] gi-docgen: add a recipe and class
Quoted 25 lines · Khem Raj
Quoted 23 lines · Richard Purdie
Quoted 20 lines · Alexander Kanavin
Quoted 7 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
This seems to be the gtk-doc successor, and gnome projects such as pango and gdk-pixbuf have started transitioning to it.
Quoted 8 lines
going through
https://gitlab.gnome.org/GNOME/gi-docgen#disclaimerit seems that its still under development and not declared stable, so I am wary of the churn it will cause.
I would prefer to wait until at least its declared prime time for system wide inclusion.It is only built if you enable api-documentation, and even then used only in pango and gdk-pixbuf. I'd say it's fairly well contained.
Quoted 6 lines
Quoted 2 lines
I did also have a quick chat with friends in that community and their advice was that it was ok to switch now FWIW...
ok, that helps, perhaps they can reflect this assertion in document above? but still, depending upon abandoned packages needs to be answered by upstream IMO before we tread down this path
Reading that disclaimer, it seems to be saying they're making it work for gtk. We're using it in the gtk related components it is being developed for so I'm not sure there is an issue. What it says not to do is use it for general non-gtk code. We're not using it outside gtk?
Cheers,
Richard
Re: [OE-core] [PATCH 58/61] gi-docgen: add a recipe and class
Quoted 30 lines · Richard Purdie
Quoted 28 lines · Khem Raj
Quoted 25 lines · Richard Purdie
Quoted 18 lines · Alexander Kanavin
Quoted 7 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
This seems to be the gtk-doc successor, and gnome projects such as pango and gdk-pixbuf have started transitioning to it.
Quoted 8 lines
going through
https://gitlab.gnome.org/GNOME/gi-docgen#disclaimerit seems that its still under development and not declared stable, so I am wary of the churn it will cause.
I would prefer to wait until at least its declared prime time for system wide inclusion.Quoted 2 lines
It is only built if you enable api-documentation, and even then used only in pango and gdk-pixbuf. I'd say it's fairly well contained.
I did also have a quick chat with friends in that community and their advice was that it was ok to switch now FWIW...
Quoted 8 lines
Quoted 3 lines
ok, that helps, perhaps they can reflect this assertion in document above? but still, depending upon abandoned packages needs to be answered by upstream IMO before we tread down this path
Reading that disclaimer, it seems to be saying they're making it work for gtk. We're using it in the gtk related components it is being developed for so I'm not sure there is an issue. What it says not to do is use it for general non-gtk code. We're not using it outside gtk?
This above says
GI-DocGen is still in development. The recommended use of GI-DocGen is to add it as a sub-project to your Meson build system, and vendor it when releasing dist archives.
we are trying to use it in system mode and not vendored along with packages which need it. Perhaps I am misunderstanding?
Quoted 5 lines
Cheers,
Richard
Re: [OE-core] [PATCH 58/61] gi-docgen: add a recipe and class
Quoted 9 lines · Khem Raj
Quoted 2 lines
Reading that disclaimer, it seems to be saying they're making it work
for gtk.
Quoted 1 line
We're using it in the gtk related components it is being developed for
so I'm
Quoted 1 line
not sure there is an issue. What it says not to do is use it for general
non-gtk
Quoted 1 line
code. We're not using it outside gtk?
Quoted 9 lines
This above says
GI-DocGen is still in development. The recommended use of GI-DocGen is to add it as a sub-project to your Meson build system, and vendor it when releasing dist archives.
we are trying to use it in system mode and not vendored along with packages which need it. Perhaps I am misunderstanding?
The options are:
- do not update pango and gdk-pixbuf
- update them but drop api documentation support from them, as they no longer support gtk-doc
- update them and enable gi-docgen for them, through a recipe that ensures we have reproducibility and consistency in what version of gi-docgen is being used across consumer recipes.
The gi-docgen recipe outputs would only be provided at build time into their sysroots, and won't be used otherwise. It's been tested on the AB, and it works.
I think you're inventing a problem here that does not actually exist.
Alex
Re: [OE-core] [PATCH 58/61] gi-docgen: add a recipe and class
In reply to Khem RajQuoted 41 lines · Khem Raj
Quoted 30 lines · Richard Purdie
Quoted 28 lines · Khem Raj
Quoted 25 lines · Richard Purdie
Quoted 18 lines · Alexander Kanavin
Quoted 7 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
This seems to be the gtk-doc successor, and gnome projects such as pango and gdk-pixbuf have started transitioning to it.
Quoted 8 lines
going through
https://gitlab.gnome.org/GNOME/gi-docgen#disclaimerit seems that its still under development and not declared stable, so I am wary of the churn it will cause.
I would prefer to wait until at least its declared prime time for system wide inclusion.Quoted 2 lines
It is only built if you enable api-documentation, and even then used only in pango and gdk-pixbuf. I'd say it's fairly well contained.
I did also have a quick chat with friends in that community and their advice was that it was ok to switch now FWIW...
Quoted 8 lines
Quoted 3 lines
ok, that helps, perhaps they can reflect this assertion in document above? but still, depending upon abandoned packages needs to be answered by upstream IMO before we tread down this path
Reading that disclaimer, it seems to be saying they're making it work for gtk. We're using it in the gtk related components it is being developed for so I'm not sure there is an issue. What it says not to do is use it for general non-gtk code. We're not using it outside gtk?
Quoted 8 lines
This above says
GI-DocGen is still in development. The recommended use of GI-DocGen is to add it as a sub-project to your Meson build system, and vendor it when releasing dist archives.
we are trying to use it in system mode and not vendored along with packages which need it. Perhaps I am misunderstanding?
Effectively we are vendoring it since only things with a dependency on it will see it and we're only depending on it from things which it is intended for. It isn't like we're making it a system wide development tool.
Cheers,
Richard
Re: [OE-core] [PATCH 58/61] gi-docgen: add a recipe and class
Quoted 58 lines · Richard Purdie
Quoted 9 lines · Khem Raj
Quoted 7 lines · Richard Purdie
Quoted 5 lines · Khem Raj
Quoted 3 lines · Richard Purdie
Quoted 1 line · Alexander Kanavin
On Wed, 5 May 2021 at 20:05, Khem Raj <[email protected]>
Quoted 1 line · wrote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
On Wed, May 5, 2021 at 8:20 AM Alexander Kanavin <
Quoted 10 lines · [email protected]> wrote:
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 5 lines
This seems to be the gtk-doc successor, and gnome projects such as pango and gdk-pixbuf have started transitioning to it.
going through
https://gitlab.gnome.org/GNOME/gi-docgen#disclaimerit seems that its still under development and not declared
stable, so
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
I am wary of the churn it will cause.
I would prefer to wait until at least its declared prime timefor
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
system wide inclusion.
It is only built if you enable api-documentation, and even then
used only
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
in pango and gdk-pixbuf. I'd say it's fairly well contained.
I did also have a quick chat with friends in that community and
their advice
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
was that it was ok to switch now FWIW...
ok, that helps, perhaps they can reflect this assertion in document
above?
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
but still, depending upon abandoned packages needs to be answered by upstream IMO before we tread down this path
Reading that disclaimer, it seems to be saying they're making it work
for gtk.
Quoted 1 line
Quoted 1 line
We're using it in the gtk related components it is being developed for
so I'm
Quoted 1 line
Quoted 1 line
not sure there is an issue. What it says not to do is use it for
general non-gtk
Quoted 8 lines
Quoted 1 line
code. We're not using it outside gtk?
This above says
GI-DocGen is still in development. The recommended use of GI-DocGen is to add it as a sub-project to your Meson build system, and vendor it when releasing dist archives.
Quoted 8 lines
Quoted 2 lines
we are trying to use it in system mode and not vendored along with packages which need it. Perhaps I am misunderstanding?
Effectively we are vendoring it since only things with a dependency on it will see it
and we're only depending on it from things which it is intended for. It isn't like
we're making it a system wide development tool.
I thought vendoring would mean you don’t need the tools that are used but the output is captured like how configure file is pregenerated in autoconf world
But I guess we want the updates so as long as we can make progress with upstream on seeing if these dependencies would have some adopters so they can be maintained we should be good
Quoted 6 lines
Cheers,
Richard
PATCH 59/61 gdk-pixbuf/pango: replace gtk-doc with gi-docgen
In reply to Alexander Kanavin--- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb | 2 +- meta/recipes-graphics/pango/pango_1.48.4.bb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb +1 -1
@@ -28,7 +28,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f" -inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package +inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package GIR_MESON_OPTION = 'introspection' GIR_MESON_ENABLE_FLAG = "enabled"
meta/recipes-graphics/pango/pango_1.48.4.bb +1 -2
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection +inherit gnomebase gi-docgen ptest-gnome upstream-version-is-even gobject-introspection GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled"
@@ -31,7 +31,6 @@ PACKAGECONFIG[x11] = ",,virtual/libx11 libxft" PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false" PACKAGECONFIG[thai] = ",,libthai" -GTKDOC_MESON_OPTION = "gtk_doc" GIR_MESON_OPTION = 'introspection' do_configure_prepend() {
Signature · 1 line
2.31.1
PATCH 60/61 Revert "oeqa: Set LD_LIBRARY_PATH when executing native commands"
In reply to Alexander KanavinLD_LIBRARY_PATH leaks into host executables too, and breaks them as they are not uninative-enabled. E.g. on ubuntu 18.04 trying to run host bash with a sysroot that was built on Fedora 33:
akanavin@ubuntu1804-ty-3:/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-24341/tmp/work/x86_64-linux/gnupg-native/2.3.1-r0/recipe-sysroot-native$ LD_LIBRARY_PATH=./usr/lib /bin/bash /bin/bash: ./usr/lib/libtinfo.so.5: no version information available (required by /bin/bash) /bin/bash: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.33' not found (required by ./usr/lib/libtinfo.so.5)
This was seen e.g. here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/2090/steps/14/logs/stdio
--- meta/lib/oeqa/utils/commands.py | 3 --- 1 file changed, 3 deletions(-)
meta/lib/oeqa/utils/commands.py +0 -3
@@ -174,11 +174,8 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, sync=T if native_sysroot: extra_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin" % \ (native_sysroot, native_sysroot, native_sysroot) - extra_libpaths = "%s/lib:%s/usr/lib" % \ - (native_sysroot, native_sysroot) nenv = dict(options.get('env', os.environ)) nenv['PATH'] = extra_paths + ':' + nenv.get('PATH', '') - nenv['LD_LIBRARY_PATH'] = extra_libpaths + ':' + nenv.get('LD_LIBRARY_PATH', '') options['env'] = nenv cmd = Command(command, timeout=timeout, output_log=output_log, **options)
Signature · 1 line
2.31.1
PATCH 61/61 diffoscope: add native libraries to LD_LIBRARY_PATH
In reply to Alexander KanavinReversal of global setting in previous commit necessitates a local fix, otherwise, this happens:
File "/home/pokybuild/yocto-worker/reproducible-debian/build/build-st-52142/tmp/work/x86_64-linux/diffoscope-native/172-r0/recipe-sysroot-native/usr/lib/python3.9/ctypes/__init__.py", line 392, in __getitem__
func = self._FuncPtr((name_or_ordinal, self))
AttributeError: nativepython3: undefined symbol: archive_errno
--- meta/recipes-support/diffoscope/diffoscope_172.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-support/diffoscope/diffoscope_172.bb +1 -0
@@ -23,6 +23,7 @@ do_install_append_class-native() { create_wrapper ${D}${bindir}/diffoscope \ MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} }
Signature · 1 line
2.31.1