diff --git a/srcpkgs/electron19/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch b/srcpkgs/electron19/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch index 916dba9dc3b..4258b65ecc3 100644 --- a/srcpkgs/electron19/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch +++ b/srcpkgs/electron19/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch @@ -31,7 +31,7 @@ index 000000000..55173bac9 +def main(): + configs = parse_args().config + for config_json in configs: -+ for patch_dir, repo in json.load(config_json).iteritems(): ++ for patch_dir, repo in json.load(config_json).items(): + print(repo) + + diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template index ee888e1dceb..4b40de20a3f 100644 --- a/srcpkgs/electron19/template +++ b/srcpkgs/electron19/template @@ -7,7 +7,7 @@ _chromiumver=102.0.5005.125 archs="x86_64* aarch64* ppc64le*" create_wrksrc=yes build_wrksrc="src" -hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids +hostmakedepends="$(vopt_if clang "clang lld") pkgconf perl gperf bison ninja nodejs hwids libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel @@ -127,7 +127,7 @@ post_patch() { ."src/electron/patches/squirrel.mac", ."src/electron/patches/nan")' \ config.json.old > src/electron/patches/config.json - python2 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do + python3.11 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do cd "$wrksrc"/"$repopath" git init -q git config "gc.auto" 0 @@ -146,7 +146,7 @@ post_patch() { cd "$wrksrc" done - python2 src/electron/script/apply_all_patches.py src/electron/patches/config.json + python3.11 src/electron/script/apply_all_patches.py src/electron/patches/config.json touch .electron_patches_done fi @@ -215,7 +215,7 @@ pre_configure() { 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}" \ LDFLAGS="${XBPS_LDFLAGS}" \ - python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles + python3.11 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles # 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