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: kde-apps/okular/
Date: Sun, 25 Oct 2020 00:26:41 +0000 (UTC)	[thread overview]
Message-ID: <1603567779.dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002.asturm@gentoo> (raw)

commit:     dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 19:29:39 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 19:29:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dfc36a12

kde-apps/okular: Add missing DEPEND for IUSE="chm"

Bug: https://bugs.gentoo.org/750941
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-20.08.49.9999.ebuild | 4 +++-
 kde-apps/okular/okular-9999.ebuild          | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild
index 813a62c06f..781454848b 100644
--- a/kde-apps/okular/okular-20.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-20.08.49.9999.ebuild
@@ -44,6 +44,7 @@ DEPEND="
 	sys-libs/zlib
 	chm? (
 		dev-libs/chmlib
+		dev-libs/libzip:=
 		>=kde-frameworks/khtml-${KFMIN}:5
 	)
 	djvu? ( app-text/djvu )
@@ -83,6 +84,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DOKULAR_UI=$(usex qml "both" "desktop")
 		$(cmake_use_find_package chm CHM)
+		$(cmake_use_find_package chm KF5KHtml)
+		$(cmake_use_find_package chm LibZip)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)
@@ -95,7 +98,6 @@ src_configure() {
 		$(cmake_use_find_package speech Qt5TextToSpeech)
 		$(cmake_use_find_package tiff TIFF)
 	)
-
 	ecm_src_configure
 }
 

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 23579f5d89..5cd236d78a 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -44,6 +44,7 @@ DEPEND="
 	sys-libs/zlib
 	chm? (
 		dev-libs/chmlib
+		dev-libs/libzip:=
 		>=kde-frameworks/khtml-${KFMIN}:5
 	)
 	djvu? ( app-text/djvu )
@@ -78,6 +79,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DOKULAR_UI=$(usex qml "both" "desktop")
 		$(cmake_use_find_package chm CHM)
+		$(cmake_use_find_package chm KF5KHtml)
+		$(cmake_use_find_package chm LibZip)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)


             reply	other threads:[~2020-10-25  0:26 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-25  0:26 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-10 16:46 [gentoo-commits] proj/kde:master commit in: kde-apps/okular/ Andreas Sturmlechner
2024-11-04 23:01 Andreas Sturmlechner
2024-02-27  0:18 Sam James
2024-02-26 23:22 Sam James
2024-02-25 19:24 Sam James
2023-12-21 11:46 Andreas Sturmlechner
2023-08-06 10:04 Andreas Sturmlechner
2023-03-23 22:10 Andreas Sturmlechner
2023-02-02 10:30 Andreas Sturmlechner
2022-12-16 19:33 Andreas Sturmlechner
2022-11-11 23:18 Andreas Sturmlechner
2022-10-06  9:02 Andreas Sturmlechner
2022-09-08 14:22 Andreas Sturmlechner
2022-07-17 11:54 Andreas Sturmlechner
2022-05-09  5:39 Andreas Sturmlechner
2022-05-08 13:33 Andreas Sturmlechner
2022-02-04 12:38 Andreas Sturmlechner
2021-11-24 19:41 Andreas Sturmlechner
2021-11-13 19:05 Andreas Sturmlechner
2021-11-04 13:22 Andreas Sturmlechner
2021-08-03 15:00 Andreas Sturmlechner
2020-12-25 21:51 Andreas Sturmlechner
2020-11-25 13:23 Andreas Sturmlechner
2020-10-31  9:26 Andreas Sturmlechner
2020-02-22 19:52 Andreas Sturmlechner
2019-01-16  8:50 Andreas Sturmlechner
2018-08-16 20:26 Andreas Sturmlechner
2018-04-13 20:38 Andreas Sturmlechner
2018-03-19 17:15 Andreas Sturmlechner
2018-02-22 13:17 Andreas Sturmlechner
2018-02-01  1:05 Andreas Sturmlechner
2017-10-19 13:34 Andreas Sturmlechner
2017-08-25 18:33 Andreas Sturmlechner
2017-07-13 17:48 Andreas Sturmlechner
2017-07-13 17:48 Andreas Sturmlechner
2017-06-24 14:39 Andreas Sturmlechner
2017-04-23 13:36 Andreas Sturmlechner
2017-04-22 13:15 Andreas Sturmlechner
2017-04-22  8:41 Andreas Sturmlechner
2017-02-10 11:27 Andreas Sturmlechner
2017-01-10  8:33 Johannes Huber
2017-01-10  8:16 Johannes Huber
2017-01-10  8:15 Johannes Huber
2016-12-20 18:28 Johannes Huber
2016-12-19 20:18 Johannes Huber
2016-11-05 12:28 Johannes Huber
2016-11-03 22:07 Johannes Huber
2016-11-02 19:08 Johannes Huber
2016-07-25 15:35 Michael Palimaka
2016-06-19 13:29 Michael Palimaka
2016-04-07 19:23 Johannes Huber
2016-03-09  5:01 Michael Palimaka
2016-01-31 15:53 Michael Palimaka
2016-01-10 15:14 Michael Palimaka
2015-12-10  6:42 Michael Palimaka
2015-02-17 13:48 Michael Palimaka
2015-01-28 23:54 Johannes Huber
2015-01-28 14:11 Michael Palimaka

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=1603567779.dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002.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