public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: app-office/calligra/
Date: Sun, 28 Jun 2020 16:18:09 +0000 (UTC)	[thread overview]
Message-ID: <1593360810.11221b8974932885eb93bbc77911326af6551ec5.asturm@gentoo> (raw)

commit:     11221b8974932885eb93bbc77911326af6551ec5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 16:04:49 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 16:13:30 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=11221b89

app-office/calligra: Add okular to myproducts to build the feature

Bug: https://bugs.gentoo.org/722416
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index abbe914de8..240ca9b02e 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -22,7 +22,7 @@ CAL_FTS=( karbon sheets stage words )
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr
 	+pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
@@ -91,6 +91,7 @@ COMMON_DEPEND="
 		media-libs/ilmbase:=
 		media-libs/lcms:2
 	)
+	okular? ( kde-apps/okular:5 )
 	openexr? ( media-libs/openexr )
 	pdf? ( app-text/poppler:=[qt5] )
 	phonon? ( media-libs/phonon[qt5(+)] )
@@ -101,11 +102,7 @@ COMMON_DEPEND="
 		x11-libs/libX11
 	)
 	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_stage? ( okular? ( kde-apps/okular:5 ) )
-	calligra_features_words? (
-		dev-libs/libxslt
-		okular? ( kde-apps/okular:5 )
-	)
+	calligra_features_words? ( dev-libs/libxslt )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -118,6 +115,7 @@ RDEPEND="${COMMON_DEPEND}
 		>=kde-frameworks/kirigami-${KFMIN}:5
 	)
 "
+
 RESTRICT+=" test"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
@@ -142,17 +140,6 @@ src_prepare() {
 	# Unconditionally disable deprecated deps (required by QtQuick1)
 	ecm_punt_bogus_dep Qt5 Declarative
 	ecm_punt_bogus_dep Qt5 OpenGL
-
-	# Hack around the excessive use of CMake macros
-	if use okular && ! use calligra_features_words; then
-		sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
-	fi
-
-	if use okular && ! use calligra_features_stage; then
-		sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
-	fi
 }
 
 src_configure() {
@@ -164,6 +151,7 @@ src_configure() {
 	done
 
 	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use okular && myproducts+=( OKULAR )
 	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
 
 	local mycmakeargs=(


             reply	other threads:[~2020-06-28 16:18 UTC|newest]

Thread overview: 104+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-28 16:18 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-18 22:01 [gentoo-commits] proj/kde:master commit in: app-office/calligra/ Andreas Sturmlechner
2025-03-30 19:15 Andreas Sturmlechner
2025-02-12 17:10 Andreas Sturmlechner
2025-02-12 17:06 Andreas Sturmlechner
2025-02-12 17:06 Andreas Sturmlechner
2024-09-19 18:50 Andreas Sturmlechner
2024-09-09 18:34 Andreas Sturmlechner
2024-09-09 18:34 Andreas Sturmlechner
2024-08-11  6:58 Andreas Sturmlechner
2024-03-11  9:55 Andreas Sturmlechner
2023-03-31 19:11 Andreas Sturmlechner
2023-03-31 19:11 Andreas Sturmlechner
2022-10-11 15:18 Andreas Sturmlechner
2022-10-06  9:02 Andreas Sturmlechner
2021-12-20 13:24 Andreas Sturmlechner
2021-12-20 13:24 Andreas Sturmlechner
2021-12-20 13:24 Andreas Sturmlechner
2021-07-22 20:12 Andreas Sturmlechner
2021-05-14 16:05 Andreas Sturmlechner
2021-04-11 20:03 Andreas Sturmlechner
2020-12-13 10:52 Andreas Sturmlechner
2020-10-18 16:01 Andreas Sturmlechner
2020-08-30 19:02 Andreas Sturmlechner
2020-05-20 19:35 Andreas Sturmlechner
2020-04-24 18:42 Andreas Sturmlechner
2020-04-09  8:46 Andreas Sturmlechner
2020-03-09 20:34 Andreas Sturmlechner
2020-03-08 16:31 Andreas Sturmlechner
2020-03-08 13:10 Andreas Sturmlechner
2019-10-24 18:37 Andreas Sturmlechner
2019-08-16 14:47 Andreas Sturmlechner
2019-08-16 14:47 Andreas Sturmlechner
2019-03-03 23:09 Andreas Sturmlechner
2019-02-17 11:11 Andreas Sturmlechner
2019-01-26 20:29 Andreas Sturmlechner
2019-01-01 21:46 Andreas Sturmlechner
2019-01-01 21:46 Andreas Sturmlechner
2018-04-15 14:09 Andreas Sturmlechner
2018-04-05 18:01 Andreas Sturmlechner
2018-03-13 11:50 Michael Palimaka
2018-03-06 22:10 Andreas Sturmlechner
2018-02-22 13:17 Andreas Sturmlechner
2018-01-31 17:49 Andreas Sturmlechner
2017-12-31 21:23 Andreas Sturmlechner
2017-12-31 21:23 Andreas Sturmlechner
2017-09-10 12:21 Johannes Huber
2017-08-23 19:37 Andreas Sturmlechner
2017-08-08 23:49 Andreas Sturmlechner
2017-06-18 12:08 Michael Palimaka
2017-01-07 10:59 Andreas Sturmlechner
2017-01-06 22:46 Andreas Sturmlechner
2016-12-30  0:56 Andreas Sturmlechner
2016-12-23  8:55 Johannes Huber
2016-12-23  8:45 Johannes Huber
2016-12-08  8:31 Johannes Huber
2016-11-12 10:57 Michael Palimaka
2016-08-20 17:22 Michael Palimaka
2016-08-11 18:52 Michael Palimaka
2016-04-04 18:59 Johannes Huber
2016-04-04 18:59 Johannes Huber
2014-11-27  7:58 Michael Palimaka
2014-11-15 14:01 Michael Palimaka
2014-11-14 18:44 Manuel Rüger
2014-06-16 10:48 Michael Palimaka
2014-06-12 19:08 Michael Palimaka
2014-06-12 18:34 Michael Palimaka
2014-06-12 18:34 Michael Palimaka
2014-06-12 18:34 Michael Palimaka
2014-06-12 18:03 Michael Palimaka
2014-06-12 18:00 Michael Palimaka
2014-06-12 17:55 Michael Palimaka
2014-06-12 17:55 Michael Palimaka
2014-05-24 11:31 Johannes Huber
2014-05-13 18:51 Johannes Huber
2014-05-13 11:43 Johannes Huber
2014-05-04 23:44 Johannes Huber
2014-05-04 12:59 Johannes Huber
2014-04-06 11:42 Johannes Huber
2014-04-05 12:53 Johannes Huber
2014-04-05 12:19 Johannes Huber
2014-04-05 12:15 Johannes Huber
2014-03-11 10:21 Johannes Huber
2014-03-06 12:45 David Heidelberger
2013-09-14 13:59 Johannes Huber
2013-08-28 16:05 Michael Palimaka
2013-08-06  7:45 Michael Palimaka
2013-08-03 10:52 David Heidelberger
2013-07-06 15:15 Johannes Huber
2013-06-01 11:35 David Heidelberger
2013-05-09 11:21 David Heidelberger
2011-08-26 20:54 Andreas Hüttel
2011-07-22 15:11 Andreas Hüttel
2011-07-21 20:44 Andreas Hüttel
2011-07-21 20:22 Andreas Hüttel
2011-05-24 10:58 Tomas Chvatal
2011-05-16  9:08 Tomas Chvatal
2011-05-16  8:53 Tomas Chvatal
2011-05-15 20:54 Andreas K. Huettel
2011-05-15 16:55 Tomas Chvatal
2011-05-15 16:53 Tomas Chvatal
2011-05-13  9:16 Tomas Chvatal
2011-05-12  9:33 Tomas Chvatal
2011-05-05 16:47 Tomas Chvatal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1593360810.11221b8974932885eb93bbc77911326af6551ec5.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox