wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

electron24: remove py2 from build requirements

Browse source
This commit is contained in:
Andrew J. Hesford 2023-10-12 23:12:23 -04:00
parent 4c0a7cacc3
commit 235934769a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/electron24/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
View file

@ -31,7 +31,7 @@ index 000000000..55173bac9
+def main(): +def main():
+ configs = parse_args().config + configs = parse_args().config
+ for config_json in configs: + 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) + print(repo)
+ +
+ +

8
srcpkgs/electron24/template
View file

@ -7,7 +7,7 @@ _chromiumver=112.0.5615.165
archs="x86_64* aarch64*" archs="x86_64* aarch64*"
create_wrksrc=yes create_wrksrc=yes
build_wrksrc="src" 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 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 pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
@ -149,7 +149,7 @@ post_patch() {
."src/electron/patches/squirrel.mac", ."src/electron/patches/nan")' \ ."src/electron/patches/squirrel.mac", ."src/electron/patches/nan")' \
config.json.old > src/electron/patches/config.json 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
_git_init $repopath _git_init $repopath
done done
_git_init src/electron _git_init src/electron
@ -162,7 +162,7 @@ post_patch() {
cd "$wrksrc" cd "$wrksrc"
done 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 touch .electron_patches_done
fi fi
@ -228,7 +228,7 @@ pre_configure() {
CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \ 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}" \ CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
LDFLAGS="${XBPS_LDFLAGS}" \ 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 # 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 # this has to be done before unbundling, but after gn is built