Skip to contentSkip to conversation

vte: upgrade 0.82.2 -> 0.84.0

PATCH Superseded [email protected] 2 participants 3 messages Mar 26 – Mar 29

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 vte: upgrade 0.82.2 -> 0.84.0

From: Ankur Tyagi <[email protected]>

Drop patch which is now merged in simdutf[1] v7.7.1 used by vte[2]

[1] https://github.com/simdutf/simdutf/commit/c6f8e887ef51bb80dd978180042b9b9f4f46800f
[1] https://gitlab.gnome.org/GNOME/vte/-/blob/0.84.0/subprojects/simdutf.wrap?ref_type=tags

---
 ...rt-reproducibility-for-debug-sources.patch | 48 -------------------
 .../vte/{vte_0.82.2.bb => vte_0.84.0.bb}      |  3 +-
 2 files changed, 1 insertion(+), 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} (93%)
meta/recipes-support/vte/vte/0001-support-reproducibility-for-debug-sources.patch deleted +0 -48
deleted file mode 100644
index 20e8f71c0e..0000000000
@@ -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
-
meta/recipes-support/vte/vte_0.84.0.bb renamed from meta/recipes-support/vte/vte_0.82.2.bb +1 -2
similarity index 93%
rename from meta/recipes-support/vte/vte_0.82.2.bb
rename to meta/recipes-support/vte/vte_0.84.0.bb
index d5dced4ce6..2a31c9998c 100644
@@ -18,10 +18,9 @@ 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"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
#1 lore raw
Quoted 9 lines · Ankur Tyagi via lists.openembedded.org

From: Ankur Tyagi <[email protected]>

Drop patch which is now merged in simdutf[1] v7.7.1 used by vte[2]

[1] https://github.com/simdutf/simdutf/commit/c6f8e887ef51bb80dd978180042b9b9f4f46800f
[1] https://gitlab.gnome.org/GNOME/vte/-/blob/0.84.0/subprojects/simdutf.wrap?ref_type=tags

---

Hi Ankur,

Thanks for your patch.

It looks like we have some build issues, at least on ARM64:

ERROR: vte-0.84.0-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/temp/run.do_compile.515741' failed with exit code 1
...

| FAILED: [code=1] subprojects/simdutf/libsimdutf.a.p/meson-generated_.._simdutf.cpp.o
| aarch64-poky-linux-g++ -march=armv8-a+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/recipe-sysroot -Isubprojects/simdutf/libsimdutf.a.p -Isubprojects/simdutf -I../sources/vte-0.84.0/subprojects/simdutf -fvisibility=hidden -fdiagnostics-color=always -D_GLIBCXX_ASSERTIONS=1 -D_FILE_OFFSET_BITS=64 -std=gnu++23 -O2 -g -fcanon-prefix-map -ffile-prefix-map=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/sources/vte-0.84.0=/usr/src/debug/vte/0.84.0 -ffile-prefix-map=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/build=/usr/src/debug/vte/0.84.0 -ffile-prefix-map=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/recipe-sysroot= -ffile-prefix-map=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/recipe-sysroot-native= -pipe -fvisibility-inlines-hidden -fPIC -isystem../sources/vte-0.84.0/subprojects/simdutf/include -Wno-undef -Wno-missing-declarations -MD -MQ subprojects/simdutf/libsimdutf.a.p/meson-generated_.._simdutf.cpp.o -MF subprojects/simdutf/libsimdutf.a.p/meson-generated_.._simdutf.cpp.o.d -o subprojects/simdutf/libsimdutf.a.p/meson-generated_.._simdutf.cpp.o -c subprojects/simdutf/simdutf.cpp
| subprojects/simdutf/simdutf.cpp:1819:2: error: expected ';' after class definition
|  1819 | } // namespace arm64
|       |  ^
|       |  ;
| subprojects/simdutf/simdutf.cpp:11490:52: error: definition of 'bool simdutf::implementation::supported_by_runtime_system() const' is not in namespace enclosing 'simdutf::implementation' [-fpermissive]
| 11490 | bool implementation::supported_by_runtime_system() const {
|       |                                                    ^~~~~
| subprojects/simdutf/simdutf.cpp:11531:21: error: 'implementation' in namespace 'simdutf::simdutf::arm64' does not name a type
| 11531 | static const arm64::implementation *get_arm64_singleton() {
|       |                     ^~~~~~~~~~~~~~

...

https://autobuilder.yoctoproject.org/valkyrie/#/builders/60/builds/3465
https://autobuilder.yoctoproject.org/valkyrie/#/builders/22/builds/3489

Can you have a look at the issue?

Thanks,
Mathieu

Signature · 3 lines
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw
Quoted 32 lines · Mathieu Dubois-Briand
Quoted 9 lines · Ankur Tyagi via lists.openembedded.org

From: Ankur Tyagi <[email protected]>

Drop patch which is now merged in simdutf[1] v7.7.1 used by vte[2]

[1] https://github.com/simdutf/simdutf/commit/c6f8e887ef51bb80dd978180042b9b9f4f46800f
[1] https://gitlab.gnome.org/GNOME/vte/-/blob/0.84.0/subprojects/simdutf.wrap?ref_type=tags

---

Hi Ankur,

Thanks for your patch.

It looks like we have some build issues, at least on ARM64:

ERROR: vte-0.84.0-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/temp/run.do_compile.515741' failed with exit code 1
...

| FAILED: [code=1] subprojects/simdutf/libsimdutf.a.p/meson-generated_.._simdutf.cpp.o
| aarch64-poky-linux-g++ -march=armv8-a+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/recipe-sysroot -Isubprojects/simdutf/libsimdutf.a.p -Isubprojects/simdutf -I../sources/vte-0.84.0/subprojects/simdutf -fvisibility=hidden -fdiagnostics-color=always -D_GLIBCXX_ASSERTIONS=1 -D_FILE_OFFSET_BITS=64 -std=gnu++23 -O2 -g -fcanon-prefix-map -ffile-prefix-map=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/sources/vte-0.84.0=/usr/src/debug/vte/0.84.0 -ffile-prefix-map=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/build=/usr/src/debug/vte/0.84.0 -ffile-prefix-map=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/recipe-sysroot= -ffile-prefix-map=/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/armv8a-poky-linux/vte/0.84.0/recipe-sysroot-native= -pipe -fvisibility-inlines-hidden -fPIC -isystem../sources/vte-0.84.0/subprojects/simdutf/include -Wno-undef -Wno-missing-declarations -MD -MQ subprojects/simdutf/libsimdutf.a.p/meson-generated_.._simdutf.cpp.o -MF subprojects/simdutf/libsimdutf.a.p/meson-generated_.._simdutf.cpp.o.d -o subprojects/simdutf/libsimdutf.a.p/meson-generated_.._simdutf.cpp.o -c subprojects/simdutf/simdutf.cpp
| subprojects/simdutf/simdutf.cpp:1819:2: error: expected ';' after class definition
|  1819 | } // namespace arm64
|       |  ^
|       |  ;
| subprojects/simdutf/simdutf.cpp:11490:52: error: definition of 'bool simdutf::implementation::supported_by_runtime_system() const' is not in namespace enclosing 'simdutf::implementation' [-fpermissive]
| 11490 | bool implementation::supported_by_runtime_system() const {
|       |                                                    ^~~~~
| subprojects/simdutf/simdutf.cpp:11531:21: error: 'implementation' in namespace 'simdutf::simdutf::arm64' does not name a type
| 11531 | static const arm64::implementation *get_arm64_singleton() {
|       |                     ^~~~~~~~~~~~~~
Quoted 6 lines

...

https://autobuilder.yoctoproject.org/valkyrie/#/builders/60/builds/3465
https://autobuilder.yoctoproject.org/valkyrie/#/builders/22/builds/3489

Can you have a look at the issue?

Hi Mathieu,

I discussed this issue with upstream
(https://github.com/simdutf/simdutf/issues/951)
Sending v2 with the fix.

cheers
Ankur

Quoted 9 lines

Thanks,
Mathieu

--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com