From: Alexander Kanavin <[email protected]> Signed-off-by: Alexander Kanavin <[email protected]> --- ...rt-reproducibility-for-debug-sources.patch | 48 ------------------- .../vte/{vte_0.82.2.bb => vte_0.84.0.bb} | 6 ++- 2 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-support/vte/vte/0001-support-reproducibility-for-debug-sources.patch rename meta/recipes-support/vte/{vte_0.82.2.bb => vte_0.84.0.bb} (90%)
diff --git a/meta/recipes-support/vte/vte/0001-support-reproducibility-for-debug-sources.patch b/meta/recipes-support/vte/vte/0001-support-reproducibility-for-debug-sources.patch deleted file mode 100644 index 20e8f71c0e..0000000000 --- a/meta/recipes-support/vte/vte/0001-support-reproducibility-for-debug-sources.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0959004adbe46f88d558d2ce61b496c662c196f5 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Mon, 3 Nov 2025 06:13:11 +0000 -Subject: [PATCH] support reproducibility for debug sources - -While option --debug-sources is used, the generated source file contains -build path comments which caused the build is not reproducible [1] -...subprojects/simdutf/simdutf.h... - 1 /* auto-generated on 2025-03-17 16:13:41 -0400. Do not edit! */ - 2 /* begin file include/simdutf.h */ - 3 // /build-dir/vte-0.82.1/subprojects/simdutf/include/simdutf.h:1 - 4 #ifndef SIMDUTF_H -...subprojects/simdutf/simdutf.h... - -After apply this commit, use relative path to instead -...subprojects/simdutf/simdutf.h... - 1 /* auto-generated on 2025-03-17 16:13:41 -0400. Do not edit! */ - 2 /* begin file include/simdutf.h */ - 3 // include/simdutf.h:1 - 4 #ifndef SIMDUTF_H -...subprojects/simdutf/simdutf.h... - -[1] https://reproducible-builds.org/ - -Upstream-Status: Submitted [https://github.com/simdutf/simdutf/pull/848] - -Signed-off-by: Hongxu Jia <[email protected]> ---- - singleheader/amalgamate.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/singleheader/amalgamate.py b/singleheader/amalgamate.py -index 190b2f6..75e0d78 100755 ---- a/singleheader/amalgamate.py -+++ b/singleheader/amalgamate.py -@@ -385,7 +385,8 @@ def filter_features(file): - current_features = None - elif enabled: - if context.args.debug_sources and not prev_line.endswith('\\'): -- yield f"// {file}:{lineno}" -+ RELFILE = os.path.relpath(file, PROJECTPATH) -+ yield f"// {RELFILE}:{lineno}" - - if line or (not line and prev_line): - yield line --- -2.48.1 - diff --git a/meta/recipes-support/vte/vte_0.82.2.bb b/meta/recipes-support/vte/vte_0.84.0.bb similarity index 90% rename from meta/recipes-support/vte/vte_0.82.2.bb rename to meta/recipes-support/vte/vte_0.84.0.bb index d5dced4ce6..70cc6b3c99 100644 --- a/meta/recipes-support/vte/vte_0.82.2.bb +++ b/meta/recipes-support/vte/vte_0.84.0.bb @@ -18,10 +18,12 @@ GIDOCGEN_MESON_OPTION = "docs" inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection systemd vala SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ - file://0001-support-reproducibility-for-debug-sources.patch;patchdir=./subprojects/simdutf \ " -SRC_URI[archive.sha256sum] = "e1295aafc4682b3b550f1235dc2679baa0f71570d8ed543c001c1283d530be91" +SRC_URI[archive.sha256sum] = "0414e31583836aeb7878da25f67c515f7e8879917ecc37c92e26b83e8d8fc3e3" +# remove the below line when updating to vte 0.84.1 (or higher) as it includes +# https://gitlab.gnome.org/GNOME/vte/-/commit/77fe661760d2afac1e4d5a4b7eba477cbed6b430 +EXTRA_OEMESON += "-Dsimdutf:base64=true" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#239149): https://lists.openembedded.org/g/openembedded-core/message/239149 Mute This Topic: https://lists.openembedded.org/mt/119880534/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
