From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] electron19: fix build with Python 3.11
Date: Sat, 03 Dec 2022 14:45:10 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40890@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1376 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages electron19-gcc12
https://github.com/void-linux/void-packages/pull/40890
electron19: fix build with Python 3.11
I didn't manage to apply a proper patch, but this at least fixes the build.
[ci skip]
depends on #40889
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40890.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-electron19-gcc12-40890.patch --]
[-- Type: text/x-diff, Size: 1920 bytes --]
From 9c3debacab7d3ae9d54676eef0eafbe2b14b7ec4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Dec 2022 14:35:44 +0100
Subject: [PATCH 1/2] electron19: fix build with Python 3.11
---
srcpkgs/electron19/template | 3 +++
1 file changed, 3 insertions(+)
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index c7cb81120d41..ed40a221ebe3 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -198,6 +198,9 @@ pre_configure() {
sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
-i services/device/public/cpp/usb/BUILD.gn
+ vsed -e 's|python3.10|python3.11|g' -i third_party/electron_node/configure
+ vsed -e "s|(3, 10)|(3, 11)|" -i third_party/electron_node/configure
+
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -sf /usr/bin/node third_party/node/linux/node-linux-x64/bin/
rm -f third_party/devtools-frontend/src/third_party/esbuild/esbuild
From 9875efbb4e00b37134878af20d5988022df0796d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Dec 2022 14:43:55 +0100
Subject: [PATCH 2/2] electron19: fix build with gcc 12
---
srcpkgs/electron19/template | 3 +++
1 file changed, 3 insertions(+)
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index ed40a221ebe3..068136be7623 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -201,6 +201,9 @@ pre_configure() {
vsed -e 's|python3.10|python3.11|g' -i third_party/electron_node/configure
vsed -e "s|(3, 10)|(3, 11)|" -i third_party/electron_node/configure
+ # Add missing include
+ vsed -e "s|#include <algorithm>|&\n#include <utility>|" -i base/third_party/symbolize/symbolize.h
+
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -sf /usr/bin/node third_party/node/linux/node-linux-x64/bin/
rm -f third_party/devtools-frontend/src/third_party/esbuild/esbuild
next reply other threads:[~2022-12-03 13:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-03 13:45 paper42 [this message]
2022-12-22 21:03 ` [PR PATCH] [Merged]: electron19: fix build with gcc 12 paper42
-- strict thread matches above, loose matches on Subject: below --
2022-12-03 13:38 [PR PATCH] electron19: fix build with Python 3.11 paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40890@inbox.vuxu.org \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).