* [PR PATCH] electron33: update to 33.2.0.
@ 2025-02-02 3:03 oreo639
2025-02-05 7:26 ` [PR PATCH] [Merged]: " Johnnynator
0 siblings, 1 reply; 2+ messages in thread
From: oreo639 @ 2025-02-02 3:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages electron33
https://github.com/void-linux/void-packages/pull/54182
electron33: update to 33.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
cc: @Johnnynator
#### Testing the changes
- I tested the changes in this PR: **briefly**
Fixes crashing in vscode 1.96.x.
See: https://github.com/void-linux/void-packages/pull/51909
(Haven't finished building for x86_64-musl)
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54182.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-electron33-54182.patch --]
[-- Type: text/x-diff, Size: 3342 bytes --]
From 37c98dfca2ad501d2fbcb8e49ea6f3a4770c3843 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 1 Feb 2025 18:55:52 -0800
Subject: [PATCH] electron33: update to 33.2.0.
---
.../patches/spellchecker-infinate-loop.patch | 31 +++++++++++++++++++
srcpkgs/electron33/template | 8 ++---
2 files changed, 35 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/electron33/patches/spellchecker-infinate-loop.patch
diff --git a/srcpkgs/electron33/patches/spellchecker-infinate-loop.patch b/srcpkgs/electron33/patches/spellchecker-infinate-loop.patch
new file mode 100644
index 00000000000000..df73d1349269f7
--- /dev/null
+++ b/srcpkgs/electron33/patches/spellchecker-infinate-loop.patch
@@ -0,0 +1,31 @@
+From 9f6ee267adabcbd3348dd1a4daf57843aef14050 Mon Sep 17 00:00:00 2001
+From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
+Date: Fri, 13 Dec 2024 16:47:55 +0000
+Subject: [PATCH] fix: custom spell-checker stuck in infinite loop
+
+`ReadUnicodeCharacter` updates index to the last character read, and not after it. We need to manually increment it to move to the next character.
+
+It also doesn't validate that the index is valid, so we need to check that index is within bounds.
+
+Refs: #44336
+
+Co-authored-by: Jesper Ek <deadbeef84@gmail.com>
+---
+ shell/renderer/api/electron_api_spell_check_client.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/shell/renderer/api/electron_api_spell_check_client.cc b/shell/renderer/api/electron_api_spell_check_client.cc
+index b97f1771ff723..95e05ecccb524 100644
+--- a/src/electron/shell/renderer/api/electron_api_spell_check_client.cc
++++ b/src/electron/shell/renderer/api/electron_api_spell_check_client.cc
+@@ -32,7 +32,9 @@ namespace {
+
+ bool HasWordCharacters(const std::u16string& text, size_t index) {
+ base_icu::UChar32 code;
+- while (base::ReadUnicodeCharacter(text.c_str(), text.size(), &index, &code)) {
++ while (index < text.size() &&
++ base::ReadUnicodeCharacter(text.c_str(), text.size(), &index, &code)) {
++ ++index;
+ UErrorCode error = U_ZERO_ERROR;
+ if (uscript_getScript(code, &error) != USCRIPT_COMMON)
+ return true;
diff --git a/srcpkgs/electron33/template b/srcpkgs/electron33/template
index 1b08bbe8ecaf51..cffabd57a7c621 100644
--- a/srcpkgs/electron33/template
+++ b/srcpkgs/electron33/template
@@ -1,9 +1,9 @@
# Template file for 'electron33'
pkgname=electron33
-version=33.0.2
+version=33.2.0
revision=1
_nodever=20.18.0
-_chromiumver=130.0.6723.59
+_chromiumver=130.0.6723.118
archs="x86_64* aarch64*"
create_wrksrc=yes
build_wrksrc="src"
@@ -27,8 +27,8 @@ homepage="https://electronjs.org"
distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="c6d3be16998ee1f92020078e39dd5c7ea98a1222d2f68919b533ef7f507521fa
- 90401be8adcd6f580db5c71ea865c97db0e719ba41f406f5869fc7f44bd20e4f
+checksum="6a0589bbdbf1d5ccc8508b536c1beeb5f49cedb1806dc0de9b04f568946be056
+ a0a9a740ebb864e89febf4d5480ffbf31b45ac5a506ae70184fa842e27b2d177
651bb82f6af18084070893559643759165ce050b5839f830d4cc098130d3ad89"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: electron33: update to 33.2.0.
2025-02-02 3:03 [PR PATCH] electron33: update to 33.2.0 oreo639
@ 2025-02-05 7:26 ` Johnnynator
0 siblings, 0 replies; 2+ messages in thread
From: Johnnynator @ 2025-02-05 7:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]
There's a merged pull request on the void-packages repository
electron33: update to 33.2.0.
https://github.com/void-linux/void-packages/pull/54182
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
cc: @Johnnynator
#### Testing the changes
- I tested the changes in this PR: **YES**
Tested on x86_64 and x86_64-musl and appears to work.
Fixes crashing in vscode 1.96.x.
See: https://github.com/void-linux/void-packages/pull/51909
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl (native)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-05 7:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-02 3:03 [PR PATCH] electron33: update to 33.2.0 oreo639
2025-02-05 7:26 ` [PR PATCH] [Merged]: " Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).