1 |
commit: 37f8becb08996226dd1e0a0bfaf4bd67e7418629 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 13 17:16:36 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 13 17:17:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=37f8becb |
7 |
|
8 |
dev-qt/qtwebengine: Update paxmark-mksnapshot patch |
9 |
|
10 |
Reported-by: Han <jkmls <AT> outlook.com> |
11 |
Thanks-to: Attila Tóth <atoth <AT> atoth.sote.hu> |
12 |
Thanks-to: Miroslaw Mieszczak <gentoo <AT> mieszczak.com.pl> |
13 |
Bug: https://bugs.gentoo.org/670852 |
14 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
.../qtwebengine-5.11.2-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++ |
18 |
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 2 +- |
19 |
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +- |
20 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +- |
21 |
4 files changed, 44 insertions(+), 3 deletions(-) |
22 |
|
23 |
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 |
24 |
new file mode 100644 |
25 |
index 00000000..f7a5c064 |
26 |
--- /dev/null |
27 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch |
28 |
@@ -0,0 +1,41 @@ |
29 |
+Bug: https://bugs.gentoo.org/634220 |
30 |
+ |
31 |
+--- a/src/3rdparty/chromium/v8/BUILD.gn |
32 |
++++ b/src/3rdparty/chromium/v8/BUILD.gn |
33 |
+@@ -803,6 +803,7 @@ |
34 |
+ |
35 |
+ deps = [ |
36 |
+ ":mksnapshot($v8_snapshot_toolchain)", |
37 |
++ ":run_paxmark", |
38 |
+ ] |
39 |
+ |
40 |
+ script = "tools/run.py" |
41 |
+@@ -854,6 +855,28 @@ |
42 |
+ } |
43 |
+ } |
44 |
+ } |
45 |
++action("run_paxmark") { |
46 |
++ visibility = [ ":*" ] # Only targets in this file can depend on this. |
47 |
++ |
48 |
++ deps = [ |
49 |
++ ":mksnapshot($v8_snapshot_toolchain)", |
50 |
++ ] |
51 |
++ |
52 |
++ script = "/usr/sbin/pypaxctl" |
53 |
++ |
54 |
++ sources = [] |
55 |
++ |
56 |
++ outputs = [ |
57 |
++ "$target_out_dir/mksnapshot", |
58 |
++ ] |
59 |
++ |
60 |
++ args = [ |
61 |
++ "-sm", |
62 |
++ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", |
63 |
++ "root_out_dir") + "/mksnapshot", |
64 |
++ root_build_dir), |
65 |
++ ] |
66 |
++} |
67 |
+ |
68 |
+ action("v8_dump_build_config") { |
69 |
+ script = "tools/testrunner/utils/dump_build_config.py" |
70 |
|
71 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild |
72 |
index 57fa9ada..e9994435 100644 |
73 |
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild |
74 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild |
75 |
@@ -84,7 +84,7 @@ PATCHES+=( |
76 |
) |
77 |
|
78 |
src_prepare() { |
79 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
80 |
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) |
81 |
|
82 |
if ! use jumbo-build; then |
83 |
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
84 |
|
85 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
86 |
index 2a34a526..c3767074 100644 |
87 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
88 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
89 |
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND} |
90 |
PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124 |
91 |
|
92 |
src_prepare() { |
93 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
94 |
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) |
95 |
|
96 |
if ! use jumbo-build; then |
97 |
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
98 |
|
99 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
100 |
index 2a34a526..c3767074 100644 |
101 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
102 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
103 |
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND} |
104 |
PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124 |
105 |
|
106 |
src_prepare() { |
107 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
108 |
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) |
109 |
|
110 |
if ! use jumbo-build; then |
111 |
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |