1 |
commit: 9478b6b6ad00efa0512e5379e9c244eff5a50c93 |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 19 16:21:49 2015 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 2 18:34:45 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9478b6b6 |
7 |
|
8 |
qt5-build.eclass: stop passing some obsolete options to configure |
9 |
|
10 |
They were unused since the early Qt 5.0.0 days, and now upstream |
11 |
officially dropped them so the configure won't accept them anymore. |
12 |
|
13 |
See fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f and |
14 |
e824abd987d77efaa085fe1f9fb514d270798d55 in qtbase. |
15 |
|
16 |
(cherry picked from proj/qt commit e7965ab4d0f98974f7abb148bcf00abafd6d698f) |
17 |
|
18 |
eclass/qt5-build.eclass | 10 ++++------ |
19 |
1 file changed, 4 insertions(+), 6 deletions(-) |
20 |
|
21 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
22 |
index 19c2fb5..04b1751 100644 |
23 |
--- a/eclass/qt5-build.eclass |
24 |
+++ b/eclass/qt5-build.eclass |
25 |
@@ -10,7 +10,7 @@ |
26 |
# @BLURB: Eclass for Qt5 split ebuilds. |
27 |
# @DESCRIPTION: |
28 |
# This eclass contains various functions that are used when building Qt5. |
29 |
-# Requires EAPI 5. |
30 |
+# Requires EAPI 5 or 6. |
31 |
|
32 |
case ${EAPI} in |
33 |
5|6) : ;; |
34 |
@@ -19,7 +19,7 @@ esac |
35 |
|
36 |
inherit eutils flag-o-matic toolchain-funcs versionator virtualx |
37 |
|
38 |
-if [[ ${EAPI} == 5 ]] ; then |
39 |
+if [[ ${EAPI} == 5 ]]; then |
40 |
inherit multilib |
41 |
fi |
42 |
|
43 |
@@ -202,11 +202,10 @@ qt5-build_src_prepare() { |
44 |
fi |
45 |
|
46 |
if [[ ${EAPI} == 5 ]]; then |
47 |
- # apply patches |
48 |
[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" |
49 |
epatch_user |
50 |
else |
51 |
- default_src_prepare |
52 |
+ default |
53 |
fi |
54 |
} |
55 |
|
56 |
@@ -617,8 +616,7 @@ qt5_base_configure() { |
57 |
|
58 |
# disable obsolete/unused X11-related flags |
59 |
# (not shown in ./configure -help output) |
60 |
- -no-mitshm -no-xcursor -no-xfixes -no-xinerama -no-xinput |
61 |
- -no-xrandr -no-xshape -no-xsync -no-xvideo |
62 |
+ -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync |
63 |
|
64 |
# always enable session management support: it doesn't need extra deps |
65 |
# at configure time and turning it off is dangerous, see bug 518262 |