| 1 |
commit: 1c81b6921e00cd424d677419a42b50858fbb6dd7 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 31 17:49:38 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 31 17:49:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c81b692 |
| 7 |
|
| 8 |
app-office/calligra: Fix CALLIGRA_EXPERIMENTAL_FEATURES_STAGE |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.21, Repoman-2.3.6 |
| 11 |
|
| 12 |
app-office/calligra/calligra-9999.ebuild | 24 +++++++--------------- |
| 13 |
...atch => calligra-3.1.0-no-arch-detection.patch} | 0 |
| 14 |
2 files changed, 7 insertions(+), 17 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
| 17 |
index 5a1cab4cd2..834247c72f 100644 |
| 18 |
--- a/app-office/calligra/calligra-9999.ebuild |
| 19 |
+++ b/app-office/calligra/calligra-9999.ebuild |
| 20 |
@@ -137,7 +137,7 @@ RDEPEND="${COMMON_DEPEND} |
| 21 |
" |
| 22 |
RESTRICT+=" test" |
| 23 |
|
| 24 |
-PATCHES=( "${FILESDIR}/${PN}"-3.0.90-no-arch-detection.patch ) |
| 25 |
+PATCHES=( "${FILESDIR}/${PN}"-3.1.0-no-arch-detection.patch ) |
| 26 |
|
| 27 |
pkg_pretend() { |
| 28 |
check-reqs_pkg_pretend |
| 29 |
@@ -188,30 +188,19 @@ src_configure() { |
| 30 |
|
| 31 |
# applications |
| 32 |
for cal_ft in ${CAL_FTS[@]}; do |
| 33 |
- if use calligra_features_${cal_ft} ; then |
| 34 |
- myproducts+=( "${cal_ft^^}" ) |
| 35 |
- fi |
| 36 |
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) |
| 37 |
done |
| 38 |
|
| 39 |
- [[ ${KDE_BUILD_TYPE} == release ]] && \ |
| 40 |
- use calligra_experimental_features_stage && \ |
| 41 |
- myproducts+=( CALLIGRA_FEATURES_STAGE ) |
| 42 |
+ use calligra_experimental_features_stage && myproducts+=( STAGE ) |
| 43 |
|
| 44 |
use lcms && myproducts+=( PLUGIN_COLORENGINES ) |
| 45 |
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) |
| 46 |
|
| 47 |
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" ) |
| 48 |
- |
| 49 |
- if [[ ${KDE_BUILD_TYPE} == release ]] ; then |
| 50 |
- mycmakeargs+=( |
| 51 |
- -DRELEASE_BUILD=ON |
| 52 |
- -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) |
| 53 |
- ) |
| 54 |
- fi |
| 55 |
- |
| 56 |
- mycmakeargs+=( |
| 57 |
+ local mycmakeargs=( |
| 58 |
-DPACKAGERS_BUILD=OFF |
| 59 |
+ -DRELEASE_BUILD=ON |
| 60 |
-DWITH_Iconv=ON |
| 61 |
+ -DPRODUCTSET="${myproducts[*]}" |
| 62 |
$(cmake-utils_use_find_package activities KF5Activities) |
| 63 |
-DWITH_Qca-qt5=$(usex crypt) |
| 64 |
-DWITH_Fontconfig=$(usex fontconfig) |
| 65 |
@@ -233,6 +222,7 @@ src_configure() { |
| 66 |
-DWITH_OpenEXR=$(usex openexr) |
| 67 |
-DWITH_Poppler=$(usex pdf) |
| 68 |
-DWITH_Eigen3=$(usex calligra_features_sheets) |
| 69 |
+ -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) |
| 70 |
-ENABLE_CSTESTER_TESTING=$(usex test) |
| 71 |
-DWITH_Freetype=$(usex truetype) |
| 72 |
) |
| 73 |
|
| 74 |
diff --git a/app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch |
| 75 |
similarity index 100% |
| 76 |
rename from app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch |
| 77 |
rename to app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch |
Archives