commit:     37f8becb08996226dd1e0a0bfaf4bd67e7418629
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 17:16:36 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 17:17:23 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=37f8becb

dev-qt/qtwebengine: Update paxmark-mksnapshot patch

Reported-by: Han <jkmls <AT> outlook.com>
Thanks-to: Attila Tóth <atoth <AT> atoth.sote.hu>
Thanks-to: Miroslaw Mieszczak <gentoo <AT> mieszczak.com.pl>
Bug: https://bugs.gentoo.org/670852
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../qtwebengine-5.11.2-paxmark-mksnapshot.patch    | 41 ++++++++++++++++++++++
 dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild    |  2 +-
 dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild    |  2 +-
 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild       |  2 +-
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
new file mode 100644
index 00000000..f7a5c064
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
@@ -0,0 +1,41 @@
+Bug: https://bugs.gentoo.org/634220
+
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -803,6 +803,7 @@
+ 
+     deps = [
+       ":mksnapshot($v8_snapshot_toolchain)",
++      ":run_paxmark",
+     ]
+ 
+     script = "tools/run.py"
+@@ -854,6 +855,28 @@
+     }
+   }
+ }
++action("run_paxmark") {
++  visibility = [ ":*" ]  # Only targets in this file can depend on this.
++
++  deps = [
++    ":mksnapshot($v8_snapshot_toolchain)",
++  ]
++
++  script = "/usr/sbin/pypaxctl"
++
++  sources = []
++
++  outputs = [
++     "$target_out_dir/mksnapshot",
++  ]
++
++  args = [
++    "-sm",
++    "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
++                                      "root_out_dir") + "/mksnapshot",
++                       root_build_dir),
++  ]
++}
+ 
+ action("v8_dump_build_config") {
+   script = "tools/testrunner/utils/dump_build_config.py"

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 57fa9ada..e9994435 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -84,7 +84,7 @@ PATCHES+=(
 )
 
 src_prepare() {
-       use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+       use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
 
        if ! use jumbo-build; then
                sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \

diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 2a34a526..c3767074 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
 PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
 
 src_prepare() {
-       use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+       use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
 
        if ! use jumbo-build; then
                sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 2a34a526..c3767074 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
 PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
 
 src_prepare() {
-       use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+       use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
 
        if ! use jumbo-build; then
                sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \

Reply via email to