| 1 |
commit: 465542cd55d1b1e8abeae081aab71a70e86a79c1 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 23 06:50:09 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 23 06:54:54 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=465542cd |
| 7 |
|
| 8 |
dev-qt/qtwayland: fix xcomposite USE flag for 5.9 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-qt/qtwayland/qtwayland-5.9.1.ebuild | 8 ++------ |
| 13 |
dev-qt/qtwayland/qtwayland-5.9.9999.ebuild | 8 ++------ |
| 14 |
dev-qt/qtwayland/qtwayland-5.9999.ebuild | 8 ++------ |
| 15 |
3 files changed, 6 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild |
| 18 |
index ff3ca8ba..9455cb3b 100644 |
| 19 |
--- a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild |
| 20 |
+++ b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild |
| 21 |
@@ -33,11 +33,7 @@ src_prepare() { |
| 22 |
src/plugins/shellintegration/ivi-shell/ivi-shell.pro \ |
| 23 |
tests/auto/compositor/compositor/compositor.pro |
| 24 |
|
| 25 |
- qt5-build_src_prepare |
| 26 |
-} |
| 27 |
+ use xcomposite || rm -r config.tests/xcomposite || die |
| 28 |
|
| 29 |
-src_configure() { |
| 30 |
- qt_use_compile_test xcomposite |
| 31 |
- |
| 32 |
- qt5-build_src_configure |
| 33 |
+ qt5-build_src_prepare |
| 34 |
} |
| 35 |
|
| 36 |
diff --git a/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild |
| 37 |
index ff3ca8ba..9455cb3b 100644 |
| 38 |
--- a/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild |
| 39 |
+++ b/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild |
| 40 |
@@ -33,11 +33,7 @@ src_prepare() { |
| 41 |
src/plugins/shellintegration/ivi-shell/ivi-shell.pro \ |
| 42 |
tests/auto/compositor/compositor/compositor.pro |
| 43 |
|
| 44 |
- qt5-build_src_prepare |
| 45 |
-} |
| 46 |
+ use xcomposite || rm -r config.tests/xcomposite || die |
| 47 |
|
| 48 |
-src_configure() { |
| 49 |
- qt_use_compile_test xcomposite |
| 50 |
- |
| 51 |
- qt5-build_src_configure |
| 52 |
+ qt5-build_src_prepare |
| 53 |
} |
| 54 |
|
| 55 |
diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.9999.ebuild |
| 56 |
index ff3ca8ba..9455cb3b 100644 |
| 57 |
--- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild |
| 58 |
+++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild |
| 59 |
@@ -33,11 +33,7 @@ src_prepare() { |
| 60 |
src/plugins/shellintegration/ivi-shell/ivi-shell.pro \ |
| 61 |
tests/auto/compositor/compositor/compositor.pro |
| 62 |
|
| 63 |
- qt5-build_src_prepare |
| 64 |
-} |
| 65 |
+ use xcomposite || rm -r config.tests/xcomposite || die |
| 66 |
|
| 67 |
-src_configure() { |
| 68 |
- qt_use_compile_test xcomposite |
| 69 |
- |
| 70 |
- qt5-build_src_configure |
| 71 |
+ qt5-build_src_prepare |
| 72 |
} |
Archives