From 34ec66b608b982e005b7633fdef709eb18b8adc1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 17 Jul 2025 22:36:49 +0200
Subject: [PATCH] electron24: use gn package instead of bundled version

---
 srcpkgs/electron24/template | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index 42b57dc512d..cd7b266c970 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -12,7 +12,7 @@ hostmakedepends="$(vopt_if clang "clang lld") pkgconf perl gperf bison ninja nod
  pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk8 libxslt-devel
  opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
  alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if sndio sndio-devel) jq python3.11"
+ $(vopt_if sndio sndio-devel) jq python3.11 gn"
 makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
  libXi-devel libgcrypt-devel libsecret-devel cups-devel elfutils-devel
  libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
@@ -224,12 +224,14 @@ pre_configure() {
 	rm -f third_party/devtools-frontend/src/third_party/esbuild/esbuild
 
 	# compile gn early, so it can be used to generate gni stuff
-	msg_normal "Bootstrapping GN\n"
-	CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
-	CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" \
-	CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS} -Wno-error=redundant-move" \
-	LDFLAGS="${XBPS_LDFLAGS}" \
-		python3.11 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
+	if false; then
+		msg_normal "Bootstrapping GN\n"
+		CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
+		CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS} -Wno-error=redundant-move" \
+		LDFLAGS="${XBPS_LDFLAGS}" \
+			python3.11 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
+	fi
 
 	# we need to generate ppc64 stuff for libvpx as it's not shipped
 	# this has to be done before unbundling, but after gn is built
@@ -400,7 +402,11 @@ do_configure() {
 	)
 
 	msg_normal "Configuring build\n"
-	out/Release/gn gen out/$_buildtype --args="${conf[*]}"
+	if false; then
+		out/Release/gn gen out/$_buildtype --args="${conf[*]}"
+	else
+		gn gen out/$_buildtype --args="${conf[*]}"
+	fi
 }
 
 do_build() {