From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 80F6F158534 for ; Wed, 21 Aug 2024 07:24:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AFC32BC025; Wed, 21 Aug 2024 07:24:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7FCBA2BC025 for ; Wed, 21 Aug 2024 07:24:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 978B7340C20 for ; Wed, 21 Aug 2024 07:24:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CEAFA1F01 for ; Wed, 21 Aug 2024 07:24:10 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1724225048.1da8c330b1ef2b888af91caf7264fb8f28fa7ce2.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/helix/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch X-VCS-Directories: app-editors/helix/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 1da8c330b1ef2b888af91caf7264fb8f28fa7ce2 X-VCS-Branch: master Date: Wed, 21 Aug 2024 07:24:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d94914b6-75c3-418c-9492-1e0fc9163a9b X-Archives-Hash: aa2b4218a0adf75adda290e0a2e1bef7 commit: 1da8c330b1ef2b888af91caf7264fb8f28fa7ce2 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Aug 21 06:29:16 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Aug 21 07:24:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da8c330 app-editors/helix: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/38227 Signed-off-by: Joonas Niilola gentoo.org> .../helix-23.10-tree-sitter-d-gnu-extension.patch | 65 ---------------------- .../helix-23.10-tree-sitter-gemini-path.patch | 23 -------- ...x-23.10-tree-sitter-rescript-implicit-int.patch | 38 ------------- 3 files changed, 126 deletions(-) diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch b/app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch deleted file mode 100644 index b1789a9df944..000000000000 --- a/app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 394998798ef15175455a29cc239999e61ff78e6f Mon Sep 17 00:00:00 2001 -From: Michal Rostecki -Date: Wed, 6 Dec 2023 15:24:34 +0000 -Bug: https://bugs.gentoo.org/912050 -Subject: [PATCH] chore: Update tree-sitter-d - -One of the included changes is gdamore/tree-sitter-d#22 which -fixes the build of Helix when using clang as `CC`. ---- - languages.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/languages.toml b/languages.toml -index 66b43472f5a3..7f1c6b769fad 100644 ---- a/languages.toml -+++ b/languages.toml -@@ -2220,7 +2220,7 @@ formatter = { command = "dfmt" } - - [[grammar]] - name = "d" --source = { git = "https://github.com/gdamore/tree-sitter-d", rev="601c4a1e8310fb2f3c43fa8a923d0d27497f3c04" } -+source = { git = "https://github.com/gdamore/tree-sitter-d", rev = "5566f8ce8fc24186fad06170bbb3c8d97c935d74" } - - [[language]] - name = "vhs" -diff --git a/runtime/grammars/sources/d/src/scanner.c b/runtime/grammars/sources/d/src/scanner.c -index 6753ba0..2061b02 100644 ---- a/runtime/grammars/sources/d/src/scanner.c -+++ b/runtime/grammars/sources/d/src/scanner.c -@@ -67,7 +67,7 @@ match_escape(TSLexer *lexer) - case 'x': - for (int i = 0; i < 2; i++) { // expect two hex digits - lexer->advance(lexer, false); -- if (!isascii(lexer->lookahead) || -+ if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) || - !isxdigit(lexer->lookahead)) { - return (false); - } -@@ -78,7 +78,7 @@ match_escape(TSLexer *lexer) - case 'u': - for (int i = 0; i < 4; i++) { - lexer->advance(lexer, false); -- if (!isascii(lexer->lookahead) || -+ if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) || - !isxdigit(lexer->lookahead)) { - return (false); - } -@@ -89,7 +89,7 @@ match_escape(TSLexer *lexer) - case 'U': - for (int i = 0; i < 8; i++) { - lexer->advance(lexer, false); -- if (!isascii(lexer->lookahead) || -+ if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) || - !isxdigit(lexer->lookahead)) { - return (false); - } -@@ -123,7 +123,7 @@ match_escape(TSLexer *lexer) - } - break; - } -- if (!isascii(lexer->lookahead) || -+ if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) || - !isalnum(lexer->lookahead)) { - return (false); - } diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch b/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch deleted file mode 100644 index bb108f000b2f..000000000000 --- a/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 41eca94bb6bf3642b1cdb80e89845813a9d03edc Mon Sep 17 00:00:00 2001 -From: Nimrod -Date: Mon, 27 Nov 2023 20:31:20 -0500 -Subject: [PATCH] Update git source of Gemini grammar - -The author's username changed from "sfr" to "nbsp" ---- - languages.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/languages.toml b/languages.toml -index ef4687af8a71..33b27626e720 100644 ---- a/languages.toml -+++ b/languages.toml -@@ -2916,7 +2916,7 @@ file-types = ["gmi"] - - [[grammar]] - name = "gemini" --source = { git = "https://git.sr.ht/~sfr/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" } -+source = { git = "https://git.sr.ht/~nbsp/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" } - - [[language]] - name = "templ" diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch b/app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch deleted file mode 100644 index fd7ef56d2799..000000000000 --- a/app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 17918a99bcf1bf39b08c09e0690d2ecccda8088d Mon Sep 17 00:00:00 2001 -From: Nan Zhong -Date: Thu, 30 Nov 2023 22:35:49 -0500 -Bug: https://bugs.gentoo.org/912050 -Bug: https://bugs.gentoo.org/918941 -Subject: [PATCH] languages: update rescript grammar - -This bump fixes a build failure of the grammer with clang. ---- - languages.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/languages.toml b/languages.toml -index 10ed167b028d..f4ff483b2b11 100644 ---- a/languages.toml -+++ b/languages.toml -@@ -1523,7 +1523,7 @@ indent = { tab-width = 2, unit = " " } - - [[grammar]] - name = "rescript" --source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "65609807c628477f3b94052e7ef895885ac51c3c" } -+source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "467dcf99f68c47823d7b378779a6b282d7ef9782" } - - [[language]] - name = "erlang" -diff --git a/runtime/grammars/sources/rescript/src/scanner.c b/runtime/grammars/sources/rescript/src/scanner.c -index 9bf9fa4..113ca35 100644 ---- a/runtime/grammars/sources/rescript/src/scanner.c -+++ b/runtime/grammars/sources/rescript/src/scanner.c -@@ -131,7 +131,7 @@ bool tree_sitter_rescript_external_scanner_scan( - const bool* valid_symbols - ) { - ScannerState* state = (ScannerState*)payload; -- const in_string = state->in_quotes || state->in_backticks; -+ const bool in_string = state->in_quotes || state->in_backticks; - - if (valid_symbols[TEMPLATE_CHARS]) { - lexer->result_symbol = TEMPLATE_CHARS;