From: zlice <zlice@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] electron19: fix build
Date: Mon, 10 Apr 2023 18:54:12 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43376@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 936 bytes --]
There is a new pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages electron19_fix_build
https://github.com/void-linux/void-packages/pull/43376
electron19: fix build
#### Testing the changes
- I tested the changes in this PR: **NO** (but yes? because it's for the build)
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
While checking ffmpeg5/6 changes I was having trouble building `electron19`. There have been a few big changes lately and the last build fix was months ago, so I'm not sure what changed. (Looks like a lot of active patching or something in the template?)
Going to verify non-ffmpeg change build tonight if I remember.
part https://github.com/void-linux/void-packages/issues/39083 (not on list)
A patch file from https://github.com/void-linux/void-packages/pull/43376.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-electron19_fix_build-43376.patch --]
[-- Type: text/x-diff, Size: 3709 bytes --]
From 8e8e8d3a95623a3e8066c67490914adadef5cb29 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 10 Apr 2023 12:51:06 -0400
Subject: [PATCH] electron19: fix build
---
srcpkgs/electron19/patches/python-3.11.patch | 11 ++++
...-constraints-on-VirtualCursor-layout.patch | 50 +++++++++++++++++++
2 files changed, 61 insertions(+)
create mode 100644 srcpkgs/electron19/patches/python-3.11.patch
create mode 100644 srcpkgs/electron19/patches/sql-relax-constraints-on-VirtualCursor-layout.patch
diff --git a/srcpkgs/electron19/patches/python-3.11.patch b/srcpkgs/electron19/patches/python-3.11.patch
new file mode 100644
index 000000000000..ec6511b18c2e
--- /dev/null
+++ b/srcpkgs/electron19/patches/python-3.11.patch
@@ -0,0 +1,11 @@
+--- a/src/tools/grit/grit/util.py 2022-06-14 05:15:31.000000000 -0400
++++ b/src/tools/grit/grit/util.py 2023-04-10 09:06:50.593197014 -0400
+@@ -209,7 +209,7 @@
+ mode = 'rb'
+ encoding = None
+ else:
+- mode = 'rU'
++ mode = 'r'
+
+ with io.open(filename, mode, encoding=encoding) as f:
+ return f.read()
diff --git a/srcpkgs/electron19/patches/sql-relax-constraints-on-VirtualCursor-layout.patch b/srcpkgs/electron19/patches/sql-relax-constraints-on-VirtualCursor-layout.patch
new file mode 100644
index 000000000000..a11a64f21abe
--- /dev/null
+++ b/srcpkgs/electron19/patches/sql-relax-constraints-on-VirtualCursor-layout.patch
@@ -0,0 +1,50 @@
+From 7d1394bd639e3bcf68082ac3fc33eeed6a00d2e6 Mon Sep 17 00:00:00 2001
+From: Elly Fong-Jones <ellyjones@chromium.org>
+Date: Thu, 2 Mar 2023 00:15:11 +0000
+Subject: [PATCH] sql: relax constraints on VirtualCursor layout
+
+VirtualCursor::FromSqliteCursor required that VirtualCursor had a
+standard layout, but in fact VirtualCursor shouldn't have a standard
+layout, and the fact that it does with libc++ is a deviation from the
+C++ standard. This change:
+
+1. Relaxes the requirement that VirtualCursor has a standard layout, and
+2. Relaxes the requirement that the sqlite_cursor_ field has to be at
+ offset 0
+
+by use of offsetof() and pointer subtraction. This change both improves
+standards compliance and makes this code build with libstdc++.
+
+Bug: 1380656
+Change-Id: I9c47abd9197b187da0360ca5619ccf7dadab4f33
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4292313
+Reviewed-by: Austin Sullivan <asully@chromium.org>
+Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1111925}
+---
+ sql/recover_module/cursor.h | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+Copied from void chromium patches
+
+diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
+index 1970bdca8c6..4cb06557009 100644
+--- a/src/sql/recover_module/cursor.h
++++ b/src/sql/recover_module/cursor.h
+@@ -63,12 +63,10 @@ class VirtualCursor {
+ // |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor().
+ static inline VirtualCursor* FromSqliteCursor(
+ sqlite3_vtab_cursor* sqlite_cursor) {
+- static_assert(std::is_standard_layout<VirtualCursor>::value,
+- "needed for the reinterpret_cast below");
+- static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0,
+- "sqlite_cursor_ must be the first member of the class");
+- VirtualCursor* result = reinterpret_cast<VirtualCursor*>(sqlite_cursor);
+- DCHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
++ VirtualCursor* result = reinterpret_cast<VirtualCursor*>(
++ (reinterpret_cast<char*>(sqlite_cursor) -
++ offsetof(VirtualCursor, sqlite_cursor_)));
++ CHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
+ return result;
+ }
+
next reply other threads:[~2023-04-10 16:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-10 16:54 zlice [this message]
2023-04-13 1:18 ` [PR PATCH] [Merged]: " Johnnynator
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-43376@inbox.vuxu.org \
--to=zlice@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).