From 9ce980d2006e26f32300acdd78d1bac497a87e73 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 21 Jan 2025 18:59:03 +0000
Subject: [PATCH] Update dependency electron to v34 (#2092)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/build_linux.yaml | 3 +--
 package.json                       | 2 +-
 scripts/glibc-check.sh             | 6 +++---
 yarn.lock                          | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml
index e86c2e74..701c4c8e 100644
--- a/.github/workflows/build_linux.yaml
+++ b/.github/workflows/build_linux.yaml
@@ -22,6 +22,7 @@ on:
                 description: "How to link sqlcipher, one of 'system' | 'static'"
 env:
     SQLCIPHER_BUNDLED: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
+    MAX_GLIBC: 2.31 # bullseye-era glibc, used by glibc-check.sh
 permissions: {} # No permissions required
 jobs:
     # We build the hak files on native infrastructure as matrix-seshat fails to cross-compile properly
@@ -144,8 +145,6 @@ jobs:
                   for filename in ./.hak/hakModules/**/*.node; do
                       ./scripts/glibc-check.sh $filename
                   done
-              env:
-                  MAX_VER: 2.31 # bullseye-era glibc
 
     build:
         needs: hak
diff --git a/package.json b/package.json
index f095a4a2..a1ea8b16 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
         "app-builder-lib": "25.1.8",
         "chokidar": "^4.0.0",
         "detect-libc": "^2.0.0",
-        "electron": "32.2.8",
+        "electron": "34.0.0",
         "electron-builder": "25.1.8",
         "electron-builder-squirrel-windows": "25.1.8",
         "electron-devtools-installer": "^4.0.0",
diff --git a/scripts/glibc-check.sh b/scripts/glibc-check.sh
index 60e070f7..6e7dc576 100755
--- a/scripts/glibc-check.sh
+++ b/scripts/glibc-check.sh
@@ -3,7 +3,7 @@
 # Source https://gist.github.com/vladimyr/9a03481154cd3048a486bdf71e5e1535/57e57a6ace6fb2c8bba948bce726df7a96c3f99f
 # This scripts lets you check which minimum GLIBC version an executable requires.
 # Simply run './glibc-check.sh path/to/your/binary'
-MAX_VER="${MAX_VER:-2.28}"
+MAX_GLIBC="${MAX_GLIBC:-2.28}"
 
 BINARY="$1"
 
@@ -39,10 +39,10 @@ IFS="
 VERS=$(objdump -T "$BINARY" | grep GLIBC_ | sed 's/.*GLIBC_\([.0-9]*\).*/\1/g' | sort -u)
 
 for VER in $VERS; do
-  vercomp "$VER" "$MAX_VER"
+  vercomp "$VER" "$MAX_GLIBC"
   COMP=$?
   if [[ $COMP -eq 1 ]]; then
-    echo "Error! ${BINARY} requests GLIBC ${VER}, which is higher than target ${MAX_VER}"
+    echo "Error! ${BINARY} requests GLIBC ${VER}, which is higher than target ${MAX_GLIBC}"
     echo "Affected symbols:"
     objdump -T "$BINARY" | grep -F "GLIBC_${VER}"
     echo "Looking for symbols in libraries..."
diff --git a/yarn.lock b/yarn.lock
index a5499e5b..b5e1c74a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3694,10 +3694,10 @@ electron-window-state@^5.0.3:
     jsonfile "^4.0.0"
     mkdirp "^0.5.1"
 
-electron@32.2.8:
-  version "32.2.8"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-32.2.8.tgz#4154e40a8e10cf7e2a892ed7176f849ad88536be"
-  integrity sha512-jaAgBeFKjH6Cd7CnG7XhApZtLz2ewUXLyf1rKh9D+eaFD5XCYQpH77PhmrT5u0IpSP6eSZoHpAQ0sMqOFsh6kA==
+electron@34.0.0:
+  version "34.0.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-34.0.0.tgz#30ccedbc02d2f036868b8278960fd0e438ec0e52"
+  integrity sha512-fpaPb0lifoUJ6UJa4Lk8/0B2Ku/xDZWdc1Gkj67jbygTCrvSon0qquju6Ltx1Kz23GRqqlIHXiy9EvrjpY7/Wg==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"