| 1 |
commit: 11221b8974932885eb93bbc77911326af6551ec5 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 28 16:04:49 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 28 16:13:30 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=11221b89 |
| 7 |
|
| 8 |
app-office/calligra: Add okular to myproducts to build the feature |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/722416 |
| 11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-office/calligra/calligra-9999.ebuild | 24 ++++++------------------ |
| 15 |
1 file changed, 6 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
| 18 |
index abbe914de8..240ca9b02e 100644 |
| 19 |
--- a/app-office/calligra/calligra-9999.ebuild |
| 20 |
+++ b/app-office/calligra/calligra-9999.ebuild |
| 21 |
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Office Suite" |
| 22 |
HOMEPAGE="https://calligra.org/" |
| 23 |
|
| 24 |
if [[ ${KDE_BUILD_TYPE} == release ]]; then |
| 25 |
- SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" |
| 26 |
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" |
| 27 |
KEYWORDS="~amd64 ~x86" |
| 28 |
fi |
| 29 |
|
| 30 |
@@ -22,7 +22,7 @@ CAL_FTS=( karbon sheets stage words ) |
| 31 |
|
| 32 |
LICENSE="GPL-2" |
| 33 |
SLOT="5" |
| 34 |
-IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr |
| 35 |
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr |
| 36 |
+pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" |
| 37 |
|
| 38 |
# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) |
| 39 |
@@ -91,6 +91,7 @@ COMMON_DEPEND=" |
| 40 |
media-libs/ilmbase:= |
| 41 |
media-libs/lcms:2 |
| 42 |
) |
| 43 |
+ okular? ( kde-apps/okular:5 ) |
| 44 |
openexr? ( media-libs/openexr ) |
| 45 |
pdf? ( app-text/poppler:=[qt5] ) |
| 46 |
phonon? ( media-libs/phonon[qt5(+)] ) |
| 47 |
@@ -101,11 +102,7 @@ COMMON_DEPEND=" |
| 48 |
x11-libs/libX11 |
| 49 |
) |
| 50 |
calligra_features_sheets? ( dev-cpp/eigen:3 ) |
| 51 |
- calligra_features_stage? ( okular? ( kde-apps/okular:5 ) ) |
| 52 |
- calligra_features_words? ( |
| 53 |
- dev-libs/libxslt |
| 54 |
- okular? ( kde-apps/okular:5 ) |
| 55 |
- ) |
| 56 |
+ calligra_features_words? ( dev-libs/libxslt ) |
| 57 |
" |
| 58 |
DEPEND="${COMMON_DEPEND} |
| 59 |
dev-libs/boost |
| 60 |
@@ -118,6 +115,7 @@ RDEPEND="${COMMON_DEPEND} |
| 61 |
>=kde-frameworks/kirigami-${KFMIN}:5 |
| 62 |
) |
| 63 |
" |
| 64 |
+ |
| 65 |
RESTRICT+=" test" |
| 66 |
|
| 67 |
PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch ) |
| 68 |
@@ -142,17 +140,6 @@ src_prepare() { |
| 69 |
# Unconditionally disable deprecated deps (required by QtQuick1) |
| 70 |
ecm_punt_bogus_dep Qt5 Declarative |
| 71 |
ecm_punt_bogus_dep Qt5 OpenGL |
| 72 |
- |
| 73 |
- # Hack around the excessive use of CMake macros |
| 74 |
- if use okular && ! use calligra_features_words; then |
| 75 |
- sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ |
| 76 |
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" |
| 77 |
- fi |
| 78 |
- |
| 79 |
- if use okular && ! use calligra_features_stage; then |
| 80 |
- sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \ |
| 81 |
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP" |
| 82 |
- fi |
| 83 |
} |
| 84 |
|
| 85 |
src_configure() { |
| 86 |
@@ -164,6 +151,7 @@ src_configure() { |
| 87 |
done |
| 88 |
|
| 89 |
use lcms && myproducts+=( PLUGIN_COLORENGINES ) |
| 90 |
+ use okular && myproducts+=( OKULAR ) |
| 91 |
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) |
| 92 |
|
| 93 |
local mycmakeargs=( |
Archives