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-sunset:master commit in: kde-apps/okular/
Date: Sun, 16 Aug 2020 16:00:58 +0000 (UTC)	[thread overview]
Message-ID: <1597593645.44b47cf0f0a5ac2e2aa5f361d397964051e6989c.asturm@gentoo> (raw)

commit:     44b47cf0f0a5ac2e2aa5f361d397964051e6989c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 15:59:47 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 16:00:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=44b47cf0

kde-apps/okular: Depend on media-libs/qimageblitz[-qt5]

This is required to avoid mixing Qt versions at runtime.

Thanks-to: Stas Cymbalov <dummyunit <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-16.08.3.ebuild | 4 ++--
 kde-apps/okular/okular-4.14.3.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/okular-16.08.3.ebuild b/kde-apps/okular/okular-16.08.3.ebuild
index 49fd93a4..e23e02ae 100644
--- a/kde-apps/okular/okular-16.08.3.ebuild
+++ b/kde-apps/okular/okular-16.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
 DEPEND="
 	media-libs/freetype
 	media-libs/phonon[qt4]
-	media-libs/qimageblitz
+	media-libs/qimageblitz[-qt5(+)]
 	sys-libs/zlib
 	chm? ( dev-libs/chmlib )
 	crypt? ( app-crypt/qca:2[qt4] )

diff --git a/kde-apps/okular/okular-4.14.3.ebuild b/kde-apps/okular/okular-4.14.3.ebuild
index b9868b3f..fcc23aa3 100644
--- a/kde-apps/okular/okular-4.14.3.ebuild
+++ b/kde-apps/okular/okular-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
 
 DEPEND="
 	media-libs/freetype
-	media-libs/qimageblitz
+	media-libs/qimageblitz[-qt5(+)]
 	sys-libs/zlib
 	chm? ( dev-libs/chmlib )
 	crypt? ( app-crypt/qca:2[qt4(+)] )


             reply	other threads:[~2020-08-16 16:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-16 16:00 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-12-07  1:01 [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/okular/ Andreas Sturmlechner
2020-08-25 14:59 Andreas Sturmlechner
2016-11-20 10:00 Johannes Huber

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=1597593645.44b47cf0f0a5ac2e2aa5f361d397964051e6989c.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