From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C8B12138334 for ; Sat, 10 Nov 2018 20:27:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8667EE0CCA; Sat, 10 Nov 2018 20:27:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 323A9E0CCA for ; Sat, 10 Nov 2018 20:27:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC2E9335CFA for ; Sat, 10 Nov 2018 20:27:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E989F3DB for ; Sat, 10 Nov 2018 20:27:17 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1541881621.07df47de4fba65ea226811b9b6f586290cf7035c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 07df47de4fba65ea226811b9b6f586290cf7035c X-VCS-Branch: master Date: Sat, 10 Nov 2018 20:27:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: beef30af-ad78-4867-8daa-51c17fcb8f19 X-Archives-Hash: 99a4958dc255fc3443a4bb90cf97bd45 commit: 07df47de4fba65ea226811b9b6f586290cf7035c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 10 19:50:52 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 10 20:27:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07df47de dev-qt/qtwebengine: Update paxmark-mksnapshot patches for 5.11.{1,2} Reported-by: Han outlook.com> Thanks-to: Attila Tóth atoth.sote.hu> Thanks-to: Miroslaw Mieszczak mieszczak.com.pl> Closes: https://bugs.gentoo.org/670852 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qtwebengine-5.11.1-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++ .../qtwebengine-5.11.2-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 2 +- dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild | 2 +- 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch new file mode 100644 index 00000000000..352deefb22a --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-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 +@@ -661,6 +661,7 @@ action("run_mksnapshot") { + + deps = [ + ":mksnapshot($v8_snapshot_toolchain)", ++ ":run_paxmark", + ] + + script = "tools/run.py" +@@ -706,6 +707,28 @@ action("run_mksnapshot") { + args += [ rebase_path(v8_embed_script, root_build_dir) ] + } + } ++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("run_mkpeephole") { + visibility = [ ":*" ] # Only targets in this file can depend on this. 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 00000000000..f7a5c064fc4 --- /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.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild index ba8cd487b93..72de09bfac9 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild @@ -86,7 +86,7 @@ PATCHES+=( ) src_prepare() { - use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) + use pax_kernel && PATCHES+=( "${FILESDIR}/${P}-paxmark-mksnapshot.patch" ) # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild index 57fa9ada481..90eb3ad2944 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.11.2.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}/${P}-paxmark-mksnapshot.patch" ) if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \