Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
Date: Thu, 30 Sep 2021 11:35:32
Message-Id: 1632998460.5bfd9878ff738a85fa2f4be47c362ac4c7a08cdb.asturm@gentoo
1 commit: 5bfd9878ff738a85fa2f4be47c362ac4c7a08cdb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 28 10:13:58 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 30 10:41:00 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5bfd9878
7
8 dev-qt/qtwebengine: Support EXTRA_GN env var
9
10 (sync with Gentoo ebuild repository)
11
12 Thanks-to: Jannik Glückert <jannik.glueckert <AT> gmail.com>
13 Package-Manager: Portage-3.0.22, Repoman-3.0.3
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch | 12 ++++++++++++
17 dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 1 +
18 2 files changed, 13 insertions(+)
19
20 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
21 new file mode 100644
22 index 00000000..0488122c
23 --- /dev/null
24 +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
25 @@ -0,0 +1,12 @@
26 +diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
27 +index 3d6fda80e..3d0bc86fe 100644
28 +--- a/src/core/gn_run.pro
29 ++++ b/src/core/gn_run.pro
30 +@@ -38,5 +38,6 @@ build_pass|!debug_and_release {
31 + }
32 +
33 ++ gn_args += $$(EXTRA_GN)
34 + gn_args = $$system_quote($$gn_args)
35 + gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir()))
36 + gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
37 + gn_python = "--script-executable=$$pythonPathForSystem()"
38
39 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
40 index c096ab58..e6ec7679 100644
41 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
42 +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
43 @@ -100,6 +100,7 @@ BDEPEND="${PYTHON_DEPS}
44
45 PATCHES=(
46 "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # downstream, bug 695446
47 + "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
48 "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
49 "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
50 "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989