From 684c75079acf70609000138f22f55f6b450f7293 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 11 Oct 2023 22:45:01 -0400 Subject: [PATCH] electron19: use python3.11 to build --- srcpkgs/electron19/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template index 30932485884..ee888e1dceb 100644 --- a/srcpkgs/electron19/template +++ b/srcpkgs/electron19/template @@ -12,7 +12,7 @@ hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ni pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk 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" + $(vopt_if sndio sndio-devel) jq python3.11" makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel @@ -190,6 +190,8 @@ post_patch() { } pre_configure() { + ln -s "/usr/bin/python3.11" "${XBPS_WRAPPERDIR}/python3" + cd "$wrksrc/$build_wrksrc" # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion @@ -262,8 +264,8 @@ pre_configure() { msg_normal "Replacing gn files\n" - python3 build/linux/unbundle/replace_gn_files.py --system-libraries \ - $use_system + python3.11 build/linux/unbundle/replace_gn_files.py \ + --system-libraries $use_system third_party/libaddressinput/chromium/tools/update-strings.py } @@ -399,6 +401,10 @@ do_build() { export BUILD_AR="$AR_host" export BUILD_NM="$NM_host" fi + + # Prevent ERR_OSSL_EVP_UNSUPPORTED + export NODE_OPTIONS=--openssl-legacy-provider + msg_normal "Ninja turtles GO!\n" ninja ${makejobs} -C out/$_buildtype electron third_party/electron_node:headers # finish rest of the build