package/bat: remove no longer needed patch for gcc15 compat
PATCH 1/2 package/bat: remove no longer needed patch for gcc15 compat
The bat 0.26.0 already depends on a newer version of the onig_sys crate, so the problem that patch is fixing was no already no longer present.
--- ...ig-by-regex-fancy-in-minimal-applica.patch | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 package/bat/0001-Replace-regex-onig-by-regex-fancy-in-minimal-applica.patch
package/bat/0001-Replace-regex-onig-by-regex-fancy-in-minimal-applica.patch deleted +0 -47
@@ -1,47 +0,0 @@ -From 9b6727df25e45222b3863dbe5f5bc58237b68ab9 Mon Sep 17 00:00:00 2001 -From: El Mehdi YOUNES <[email protected]> -Date: Tue, 2 Sep 2025 14:02:11 +0200 -Subject: [PATCH] Replace regex-onig by regex-fancy in minimal-application - -The default "application" feature enables "minimal-application", which -in turn pulls in the "regex-onig" feature of syntect. This brings in the -onig crate (version 6.4.0) and its dependency onig_sys, which fail to -build with GCC 15 due to C23 keyword conflicts. - -It is not possible to simply update the onig crate from bat itself, -since its version is pinned indirectly by syntect. To avoid this -dependency and fix the build, replace "regex-onig" with "regex-fancy" in -"minimal-application". This makes bat use the pure-Rust fancy-regex -engine instead of Oniguruma, removing the need for onig_sys and allowing -the package to build with GCC 15. - -There is an an ongoing discussion about removing Oniguruma from bat -since Oniguruma has been declared archived: - -see https://github.com/sharkdp/bat/issues/3285 - -The Upstream project for now is refusing to use fancy-regex as default. - -Upstream: not submitted - -Signed-off-by: El Mehdi YOUNES <[email protected]> ---- - Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 80d19321..93a07a1d 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -29,7 +29,7 @@ minimal-application = [ - "clap", - "etcetera", - "paging", -- "regex-onig", -+ "regex-fancy", - "wild", - ] - git = ["git2"] # Support indicating git modifications --- -2.43.0 -
Signature · 6 lines
2.53.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 2/2 package/bat: bump to 0.26.1
Release notes: https://github.com/sharkdp/bat/releases/tag/v0.26.1
--- package/bat/bat.hash | 2 +- package/bat/bat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/bat/bat.hash +1 -1
@@ -1,4 +1,4 @@ # Locally generated -sha256 e23db7a34f860d425cf0bb6f13505606024ab81035327262963d8395b4a6f3b5 bat-0.26.0-cargo5.tar.gz +sha256 688fe9a308dc6024f8d9516b33f6f8e293087023c0a75628ad36c8e04e36a824 bat-0.26.1-cargo5.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE sha256 dccda9eb9533f5c65624a1106536c6cfde46008d58e60b3faf154e8b9fd5b46e LICENSE-MIT
package/bat/bat.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -BAT_VERSION = 0.26.0 +BAT_VERSION = 0.26.1 BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) BAT_LICENSE = Apache-2.0 or MIT BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
Signature · 6 lines
2.53.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 4 lines · Marcus Hoffmann via buildroot
The bat 0.26.0 already depends on a newer version of the
onig_syscrate, so the problem that patch is fixing was no already no longer present.Signed-off-by Marcus Hoffmann <[email protected]>
Series applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Perale via buildroot
AppliedIn reply of:
Quoted 4 lines
The bat 0.26.0 already depends on a newer version of the
onig_syscrate, so the problem that patch is fixing was no already no longer present.Signed-off-by Marcus Hoffmann <[email protected]>
Applied to 2026.02.x. Thanks
Quoted 65 lines
--- ...ig-by-regex-fancy-in-minimal-applica.patch | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 package/bat/0001-Replace-regex-onig-by-regex-fancy-in-minimal-applica.patchpackage/bat/0001-Replace-regex-onig-by-regex-fancy-in-minimal-applica.patch deleted +0
-47@@ -1,47 +0,0 @@ -From 9b6727df25e45222b3863dbe5f5bc58237b68ab9 Mon Sep 17 00:00:00 2001 -From: El Mehdi YOUNES <[email protected]> -Date: Tue, 2 Sep 2025 14:02:11 +0200 -Subject: [PATCH] Replace regex-onig by regex-fancy in minimal-application - -The default "application" feature enables "minimal-application", which -in turn pulls in the "regex-onig" feature of syntect. This brings in the -onig crate (version 6.4.0) and its dependency onig_sys, which fail to -build with GCC 15 due to C23 keyword conflicts. - -It is not possible to simply update the onig crate from bat itself, -since its version is pinned indirectly by syntect. To avoid this -dependency and fix the build, replace "regex-onig" with "regex-fancy" in -"minimal-application". This makes bat use the pure-Rust fancy-regex -engine instead of Oniguruma, removing the need for onig_sys and allowing -the package to build with GCC 15. - -There is an an ongoing discussion about removing Oniguruma from bat -since Oniguruma has been declared archived: - -see https://github.com/sharkdp/bat/issues/3285 - -The Upstream project for now is refusing to use fancy-regex as default. - -Upstream: not submitted - -Signed-off-by: El Mehdi YOUNES <[email protected]> ---- - Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 80d19321..93a07a1d 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -29,7 +29,7 @@ minimal-application = [ - "clap", - "etcetera", - "paging", -- "regex-onig", -+ "regex-fancy", - "wild", - ] - git = ["git2"] # Support indicating git modifications --- -2.43.0 -Signature · 6 lines
2.53.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot