| 1 |
commit: 0a15d4ce616703a9f53877d92b162329dd4af438 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 20 21:40:53 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 21 11:07:14 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a15d4ce |
| 7 |
|
| 8 |
kde-plasma/systemsettings: Re-apply fix for hang in src_configure |
| 9 |
|
| 10 |
Same as commit af940af244b6c6d28d3ba2936976c80b9990414d |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild | 8 ++++++++ |
| 16 |
kde-plasma/systemsettings/systemsettings-9999.ebuild | 8 ++++++++ |
| 17 |
2 files changed, 16 insertions(+) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild b/kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild |
| 20 |
index 159c06160c..20bada9ce1 100644 |
| 21 |
--- a/kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild |
| 22 |
+++ b/kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild |
| 23 |
@@ -43,6 +43,14 @@ RDEPEND="${DEPEND} |
| 24 |
gtk? ( $(add_plasma_dep kde-gtk-config) ) |
| 25 |
" |
| 26 |
|
| 27 |
+src_prepare() { |
| 28 |
+ kde5_src_prepare |
| 29 |
+ |
| 30 |
+ # FIXME: hangs in chroot; similar to bug #640432 |
| 31 |
+ sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \ |
| 32 |
+ -i CMakeLists.txt || die |
| 33 |
+} |
| 34 |
+ |
| 35 |
src_configure() { |
| 36 |
local mycmakeargs=( |
| 37 |
$(cmake-utils_use_find_package classic KF5KHtml) |
| 38 |
|
| 39 |
diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild |
| 40 |
index 159c06160c..20bada9ce1 100644 |
| 41 |
--- a/kde-plasma/systemsettings/systemsettings-9999.ebuild |
| 42 |
+++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild |
| 43 |
@@ -43,6 +43,14 @@ RDEPEND="${DEPEND} |
| 44 |
gtk? ( $(add_plasma_dep kde-gtk-config) ) |
| 45 |
" |
| 46 |
|
| 47 |
+src_prepare() { |
| 48 |
+ kde5_src_prepare |
| 49 |
+ |
| 50 |
+ # FIXME: hangs in chroot; similar to bug #640432 |
| 51 |
+ sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \ |
| 52 |
+ -i CMakeLists.txt || die |
| 53 |
+} |
| 54 |
+ |
| 55 |
src_configure() { |
| 56 |
local mycmakeargs=( |
| 57 |
$(cmake-utils_use_find_package classic KF5KHtml) |
Archives