summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-08-28 12:13:58 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-09-02 20:38:07 +0200
commit5cb1eb3cca7137dea7140befea7ead10f144b233 (patch)
treedaf432973c4931d3e592176df32acbc5630b24de
parentdev-qt/qtwebengine: 5.15.2_p20210824 snapshot bump, EAPI-8 bump (diff)
downloadgentoo-5cb1eb3cca7137dea7140befea7ead10f144b233.tar.gz
gentoo-5cb1eb3cca7137dea7140befea7ead10f144b233.tar.bz2
gentoo-5cb1eb3cca7137dea7140befea7ead10f144b233.zip
dev-qt/qtwebengine: Support EXTRA_GN env var
Thanks-to: Jannik Glückert <jannik.glueckert@gmail.com> Closes: https://bugs.gentoo.org/774186 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch12
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild1
2 files changed, 13 insertions, 0 deletions
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
new file mode 100644
index 000000000000..0488122ce92f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
@@ -0,0 +1,12 @@
+diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
+index 3d6fda80e..3d0bc86fe 100644
+--- a/src/core/gn_run.pro
++++ b/src/core/gn_run.pro
+@@ -38,5 +38,6 @@ build_pass|!debug_and_release {
+ }
+
++ gn_args += $$(EXTRA_GN)
+ gn_args = $$system_quote($$gn_args)
+ gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir()))
+ gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
+ gn_python = "--script-executable=$$pythonPathForSystem()"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
index 1a87eb9defb8..abc242e938be 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
@@ -100,6 +100,7 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+ "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
"${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989