| 1 |
commit: 0547ce7a6ddce8c17cb3036f69bbe84f9604ca8c |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 29 02:35:38 2016 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 30 00:42:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0547ce7a |
| 7 |
|
| 8 |
app-office/calligra: Fix configure, remove file collisions |
| 9 |
|
| 10 |
Gentoo-bug: 603584, 603772 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
|
| 14 |
app-office/calligra/calligra-9999.ebuild | 10 +++++++++- |
| 15 |
1 file changed, 9 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
| 18 |
index 11d1221..a89e5bd 100644 |
| 19 |
--- a/app-office/calligra/calligra-9999.ebuild |
| 20 |
+++ b/app-office/calligra/calligra-9999.ebuild |
| 21 |
@@ -114,6 +114,7 @@ COMMON_DEPEND=" |
| 22 |
okular? ( $(add_kdeapps_dep okular) ) |
| 23 |
) |
| 24 |
calligra_features_plan? ( |
| 25 |
+ $(add_frameworks_dep khtml) |
| 26 |
$(add_qt_dep qtcore '' '' '5=') |
| 27 |
dev-libs/kdiagram:5 |
| 28 |
dev-libs/kproperty:5 |
| 29 |
@@ -196,10 +197,17 @@ src_configure() { |
| 30 |
|
| 31 |
local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" ) |
| 32 |
|
| 33 |
+ if [[ ${KDE_BUILD_TYPE} == release ]] ; then |
| 34 |
+ mycmakeargs+=( |
| 35 |
+ -DRELEASE_BUILD=ON |
| 36 |
+ -DBUILD_UNMAINTAINED=${experimental} |
| 37 |
+ ) |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
mycmakeargs+=( |
| 41 |
-DPACKAGERS_BUILD=OFF |
| 42 |
- -DBUILD_UNMAINTAINED=${experimental} |
| 43 |
-DWITH_Iconv=ON |
| 44 |
+ $(cmake-utils_use_find_package activities KF5Activities) |
| 45 |
-DWITH_Qca-qt5=$(usex crypt) |
| 46 |
-DWITH_Eigen3=$(usex eigen) |
| 47 |
-DWITH_Fontconfig=$(usex fontconfig) |
Archives