Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/okular/
Date: Sun, 16 Aug 2020 16:01:03
Message-Id: 1597593645.44b47cf0f0a5ac2e2aa5f361d397964051e6989c.asturm@gentoo
1 commit: 44b47cf0f0a5ac2e2aa5f361d397964051e6989c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 16 15:59:47 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 16 16:00:45 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=44b47cf0
7
8 kde-apps/okular: Depend on media-libs/qimageblitz[-qt5]
9
10 This is required to avoid mixing Qt versions at runtime.
11
12 Thanks-to: Stas Cymbalov <dummyunit <AT> gmail.com>
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-apps/okular/okular-16.08.3.ebuild | 4 ++--
16 kde-apps/okular/okular-4.14.3.ebuild | 4 ++--
17 2 files changed, 4 insertions(+), 4 deletions(-)
18
19 diff --git a/kde-apps/okular/okular-16.08.3.ebuild b/kde-apps/okular/okular-16.08.3.ebuild
20 index 49fd93a4..e23e02ae 100644
21 --- a/kde-apps/okular/okular-16.08.3.ebuild
22 +++ b/kde-apps/okular/okular-16.08.3.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2016 Gentoo Foundation
25 +# Copyright 1999-2018 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 @@ -18,7 +18,7 @@ IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
30 DEPEND="
31 media-libs/freetype
32 media-libs/phonon[qt4]
33 - media-libs/qimageblitz
34 + media-libs/qimageblitz[-qt5(+)]
35 sys-libs/zlib
36 chm? ( dev-libs/chmlib )
37 crypt? ( app-crypt/qca:2[qt4] )
38
39 diff --git a/kde-apps/okular/okular-4.14.3.ebuild b/kde-apps/okular/okular-4.14.3.ebuild
40 index b9868b3f..fcc23aa3 100644
41 --- a/kde-apps/okular/okular-4.14.3.ebuild
42 +++ b/kde-apps/okular/okular-4.14.3.ebuild
43 @@ -1,4 +1,4 @@
44 -# Copyright 1999-2016 Gentoo Foundation
45 +# Copyright 1999-2018 Gentoo Foundation
46 # Distributed under the terms of the GNU General Public License v2
47
48 EAPI=5
49 @@ -18,7 +18,7 @@ IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
50
51 DEPEND="
52 media-libs/freetype
53 - media-libs/qimageblitz
54 + media-libs/qimageblitz[-qt5(+)]
55 sys-libs/zlib
56 chm? ( dev-libs/chmlib )
57 crypt? ( app-crypt/qca:2[qt4(+)] )