diff mbox series

[1/3] vte: 0.82.2 -> 0.83.90

Message ID 20260210095025.633860-1-hongxu.jia@windriver.com
State New
Headers show
Series [1/3] vte: 0.82.2 -> 0.83.90 | expand

Commit Message

Hongxu Jia Feb. 10, 2026, 9:50 a.m. UTC 
- Drop patch 0001-support-reproducibility-for-debug-sources.patch
which has been merged by upstream

- Fix build failed on arm64

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 ...rt-reproducibility-for-debug-sources.patch | 48 -------------------
 .../vte/0002-fix-build-failed-on-arm64.patch  | 33 +++++++++++++
 .../vte/{vte_0.82.2.bb => vte_0.83.90.bb}     |  4 +-
 3 files changed, 35 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-support/vte/vte/0001-support-reproducibility-for-debug-sources.patch
 create mode 100644 meta/recipes-support/vte/vte/0002-fix-build-failed-on-arm64.patch
 rename meta/recipes-support/vte/{vte_0.82.2.bb => vte_0.83.90.bb} (93%)

Comments

Alexander Kanavin Feb. 10, 2026, 9:54 a.m. UTC | #1 
On Tue, 10 Feb 2026 at 10:50, hongxu via lists.openembedded.org
<hongxu.jia=windriver.com@lists.openembedded.org> wrote:
>  .../vte/{vte_0.82.2.bb => vte_0.83.90.bb}     |  4 +-

0.83.90 is a pre-release, we should wait for 0.84

Unfortunately gnome release schedule always is just a bit too late for
yocto releases, and typically there's no time to test and merge
version updates. Can the backport be added to existing recipe?

Alex
Hongxu Jia Feb. 11, 2026, 2:23 a.m. UTC | #2 
On 2/10/26 17:54, Alexander Kanavin wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On Tue, 10 Feb 2026 at 10:50, hongxu via lists.openembedded.org
> <hongxu.jia=windriver.com@lists.openembedded.org> wrote:
>>   .../vte/{vte_0.82.2.bb => vte_0.83.90.bb}     |  4 +-
> 0.83.90 is a pre-release, we should wait for 0.84
>
> Unfortunately gnome release schedule always is just a bit too late for
> yocto releases, and typically there's no time to test and merge
> version updates. Can the backport be added to existing recipe?

OK, let's wait for 0.84.

The backport is not necessary for 0.82.2, it was introduced in 0.83.90 
and fixed in development branch (master)

//Hongxu

> Alex
diff mbox series

Patch

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 <hongxu.jia@windriver.com>
-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 <hongxu.jia@windriver.com>
----
- 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/0002-fix-build-failed-on-arm64.patch b/meta/recipes-support/vte/vte/0002-fix-build-failed-on-arm64.patch
new file mode 100644
index 0000000000..80b3e4854a
--- /dev/null
+++ b/meta/recipes-support/vte/vte/0002-fix-build-failed-on-arm64.patch
@@ -0,0 +1,33 @@ 
+From 0b606d7f1d9d60ab04ad0a07443bf792b5b932bc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 10 Feb 2026 13:09:10 +0800
+Subject: [PATCH 2/2] fix build failed on arm64
+
+subprojects/simdutf/simdutf.cpp:1819:2: error: expected ';' after class definition
+ 1819 | } // namespace arm64
+      |  ^
+      |  ;
+
+Upstream-Status: Backport [https://github.com/simdutf/simdutf/commit/2542805947b0592c3bf65b7ca778b0406fe0b6ee]
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ src/simdutf/arm64/implementation.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/simdutf/arm64/implementation.h b/src/simdutf/arm64/implementation.h
+index ae91895b..61c29634 100644
+--- a/src/simdutf/arm64/implementation.h
++++ b/src/simdutf/arm64/implementation.h
+@@ -284,8 +284,8 @@ public:
+                    char character) const noexcept;
+   const char16_t *find(const char16_t *start, const char16_t *end,
+                        char16_t character) const noexcept;
+-};
+ #endif // SIMDUTF_FEATURE_BASE64
++};
+ 
+ } // namespace arm64
+ } // namespace simdutf
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/vte/vte_0.82.2.bb b/meta/recipes-support/vte/vte_0.83.90.bb
similarity index 93%
rename from meta/recipes-support/vte/vte_0.82.2.bb
rename to meta/recipes-support/vte/vte_0.83.90.bb
index d5dced4ce6..a28d8e040c 100644
--- a/meta/recipes-support/vte/vte_0.82.2.bb
+++ b/meta/recipes-support/vte/vte_0.83.90.bb
@@ -18,10 +18,10 @@  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 \
+            file://0002-fix-build-failed-on-arm64.patch;patchdir=subprojects/simdutf \
 "
 
-SRC_URI[archive.sha256sum] = "e1295aafc4682b3b550f1235dc2679baa0f71570d8ed543c001c1283d530be91"
+SRC_URI[archive.sha256sum] = "a43441a78f8893268ae927e7bae3b17ffe669913ed954e172fbd12d3e083e286"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"