1 |
commit: 71b0725e2b295f383bdbe98571545aaf705c5a03 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 8 20:23:27 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 8 21:34:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b0725e |
7 |
|
8 |
dev-qt/qtwebengine: pax_kernel is dead |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708676 |
11 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../qtwebengine-5.11.2-paxmark-mksnapshot.patch | 41 ---------------------- |
15 |
dev-qt/qtwebengine/metadata.xml | 1 - |
16 |
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 11 ++---- |
17 |
dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild | 11 ++---- |
18 |
dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 11 ++---- |
19 |
5 files changed, 9 insertions(+), 66 deletions(-) |
20 |
|
21 |
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 |
22 |
deleted file mode 100644 |
23 |
index f7a5c064fc4..00000000000 |
24 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch |
25 |
+++ /dev/null |
26 |
@@ -1,41 +0,0 @@ |
27 |
-Bug: https://bugs.gentoo.org/634220 |
28 |
- |
29 |
---- a/src/3rdparty/chromium/v8/BUILD.gn |
30 |
-+++ b/src/3rdparty/chromium/v8/BUILD.gn |
31 |
-@@ -803,6 +803,7 @@ |
32 |
- |
33 |
- deps = [ |
34 |
- ":mksnapshot($v8_snapshot_toolchain)", |
35 |
-+ ":run_paxmark", |
36 |
- ] |
37 |
- |
38 |
- script = "tools/run.py" |
39 |
-@@ -854,6 +855,28 @@ |
40 |
- } |
41 |
- } |
42 |
- } |
43 |
-+action("run_paxmark") { |
44 |
-+ visibility = [ ":*" ] # Only targets in this file can depend on this. |
45 |
-+ |
46 |
-+ deps = [ |
47 |
-+ ":mksnapshot($v8_snapshot_toolchain)", |
48 |
-+ ] |
49 |
-+ |
50 |
-+ script = "/usr/sbin/pypaxctl" |
51 |
-+ |
52 |
-+ sources = [] |
53 |
-+ |
54 |
-+ outputs = [ |
55 |
-+ "$target_out_dir/mksnapshot", |
56 |
-+ ] |
57 |
-+ |
58 |
-+ args = [ |
59 |
-+ "-sm", |
60 |
-+ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", |
61 |
-+ "root_out_dir") + "/mksnapshot", |
62 |
-+ root_build_dir), |
63 |
-+ ] |
64 |
-+} |
65 |
- |
66 |
- action("v8_dump_build_config") { |
67 |
- script = "tools/testrunner/utils/dump_build_config.py" |
68 |
|
69 |
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml |
70 |
index acca7340ba1..180beb2cfc8 100644 |
71 |
--- a/dev-qt/qtwebengine/metadata.xml |
72 |
+++ b/dev-qt/qtwebengine/metadata.xml |
73 |
@@ -11,7 +11,6 @@ |
74 |
<flag name="geolocation">Enable physical position determination |
75 |
via <pkg>dev-qt/qtpositioning</pkg></flag> |
76 |
<flag name="jumbo-build">Combine source files to speed up build process.</flag> |
77 |
- <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag> |
78 |
<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> |
79 |
instead of bundled.</flag> |
80 |
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> |
81 |
|
82 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild |
83 |
index fbd7648f6f0..8161d840612 100644 |
84 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild |
85 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild |
86 |
@@ -2,8 +2,9 @@ |
87 |
# Distributed under the terms of the GNU General Public License v2 |
88 |
|
89 |
EAPI=6 |
90 |
+ |
91 |
PYTHON_COMPAT=( python2_7 ) |
92 |
-inherit multiprocessing pax-utils python-any-r1 qt5-build |
93 |
+inherit multiprocessing python-any-r1 qt5-build |
94 |
|
95 |
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
96 |
|
97 |
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
98 |
KEYWORDS="arm x86" |
99 |
fi |
100 |
|
101 |
-IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio |
102 |
- +system-ffmpeg +system-icu widgets" |
103 |
+IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" |
104 |
REQUIRED_USE="designer? ( widgets )" |
105 |
|
106 |
RDEPEND=" |
107 |
@@ -75,7 +75,6 @@ DEPEND="${RDEPEND} |
108 |
dev-util/ninja |
109 |
dev-util/re2c |
110 |
sys-devel/bison |
111 |
- pax_kernel? ( sys-apps/elfix ) |
112 |
!!=sys-devel/binutils-2.31.1-r5 |
113 |
!!=sys-devel/binutils-2.32-r0 |
114 |
" |
115 |
@@ -87,8 +86,6 @@ PATCHES+=( |
116 |
) |
117 |
|
118 |
src_prepare() { |
119 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) |
120 |
- |
121 |
if ! use jumbo-build; then |
122 |
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
123 |
src/core/config/common.pri || die |
124 |
@@ -137,6 +134,4 @@ src_install() { |
125 |
if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then |
126 |
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" |
127 |
fi |
128 |
- |
129 |
- pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess |
130 |
} |
131 |
|
132 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild |
133 |
index 3a69fc34880..f5c244acbfc 100644 |
134 |
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild |
135 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild |
136 |
@@ -2,8 +2,9 @@ |
137 |
# Distributed under the terms of the GNU General Public License v2 |
138 |
|
139 |
EAPI=7 |
140 |
+ |
141 |
PYTHON_COMPAT=( python2_7 ) |
142 |
-inherit multiprocessing pax-utils python-any-r1 qt5-build |
143 |
+inherit multiprocessing python-any-r1 qt5-build |
144 |
|
145 |
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
146 |
|
147 |
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
148 |
KEYWORDS="amd64 arm arm64 ~x86" |
149 |
fi |
150 |
|
151 |
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio |
152 |
- +system-ffmpeg +system-icu widgets" |
153 |
+IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" |
154 |
REQUIRED_USE="designer? ( widgets )" |
155 |
|
156 |
RDEPEND=" |
157 |
@@ -75,14 +75,11 @@ DEPEND="${RDEPEND} |
158 |
dev-util/ninja |
159 |
dev-util/re2c |
160 |
sys-devel/bison |
161 |
- pax_kernel? ( sys-apps/elfix ) |
162 |
" |
163 |
|
164 |
PATCHES+=( "${FILESDIR}/${PN}-5.12.5-icu-65.patch" ) |
165 |
|
166 |
src_prepare() { |
167 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) |
168 |
- |
169 |
if ! use jumbo-build; then |
170 |
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
171 |
src/core/config/common.pri || die |
172 |
@@ -126,6 +123,4 @@ src_install() { |
173 |
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then |
174 |
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" |
175 |
fi |
176 |
- |
177 |
- pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess |
178 |
} |
179 |
|
180 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild |
181 |
index db4d9855990..ce5929f9ca8 100644 |
182 |
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild |
183 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild |
184 |
@@ -2,8 +2,9 @@ |
185 |
# Distributed under the terms of the GNU General Public License v2 |
186 |
|
187 |
EAPI=7 |
188 |
+ |
189 |
PYTHON_COMPAT=( python2_7 ) |
190 |
-inherit multiprocessing pax-utils python-any-r1 qt5-build |
191 |
+inherit multiprocessing python-any-r1 qt5-build |
192 |
|
193 |
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
194 |
|
195 |
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
196 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
197 |
fi |
198 |
|
199 |
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio |
200 |
- +system-ffmpeg +system-icu widgets" |
201 |
+IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" |
202 |
REQUIRED_USE="designer? ( widgets )" |
203 |
|
204 |
RDEPEND=" |
205 |
@@ -75,12 +75,9 @@ DEPEND="${RDEPEND} |
206 |
dev-util/ninja |
207 |
dev-util/re2c |
208 |
sys-devel/bison |
209 |
- pax_kernel? ( sys-apps/elfix ) |
210 |
" |
211 |
|
212 |
src_prepare() { |
213 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) |
214 |
- |
215 |
if ! use jumbo-build; then |
216 |
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
217 |
src/buildtools/config/common.pri || die |
218 |
@@ -124,6 +121,4 @@ src_install() { |
219 |
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then |
220 |
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" |
221 |
fi |
222 |
- |
223 |
- pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess |
224 |
} |