* [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/okular/
@ 2016-11-20 10:00 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2016-11-20 10:00 UTC (permalink / raw
To: gentoo-commits
commit: 4f20b180987dc0788db7653a2e1580d3b271e6e4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 10:00:06 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 10:00:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=4f20b180
kde-apps/okular: Import latest kdelibs4 version
From gentoo main tree.
Package-Manager: portage-2.3.2
kde-apps/okular/metadata.xml | 3 +-
...{okular-4.14.3.ebuild => okular-16.08.3.ebuild} | 41 +++++++++++-----------
kde-apps/okular/okular-4.14.3.ebuild | 8 ++---
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 8c63d8d..9ee1348 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!-- maintainer-needed -->
<use>
<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
<flag name="dpi">DPI detection support for PDF rendering via <pkg>x11-libs/libkscreen</pkg></flag>
<flag name="ebook">Add E-Book support</flag>
- <flag name="kde">Enable kactivities support</flag>
<flag name="mobi">Add mobipocket support</flag>
</use>
- <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/kde-apps/okular/okular-4.14.3.ebuild b/kde-apps/okular/okular-16.08.3.ebuild
similarity index 51%
copy from kde-apps/okular/okular-4.14.3.ebuild
copy to kde-apps/okular/okular-16.08.3.ebuild
index aa029e3..a79841d 100644
--- a/kde-apps/okular/okular-4.14.3.ebuild
+++ b/kde-apps/okular/okular-16.08.3.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_HANDBOOK="optional"
-
#VIRTUALX_REQUIRED=test
RESTRICT=test
# test 2: parttest hangs
inherit kde4-base
-DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
+DESCRIPTION="Universal document viewer based on KPDF"
HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
DEPEND="
media-libs/freetype
+ media-libs/phonon[qt4]
media-libs/qimageblitz
sys-libs/zlib
chm? ( dev-libs/chmlib )
- crypt? ( app-crypt/qca:2[qt4(+)] )
+ crypt? ( app-crypt/qca:2[qt4] )
djvu? ( app-text/djvu )
- dpi? ( x11-libs/libkscreen:4 )
+ dpi? ( kde-plasma/libkscreen:4 )
ebook? ( app-text/ebook-tools )
jpeg? (
$(add_kdeapps_dep libkexiv2)
@@ -33,24 +33,25 @@ DEPEND="
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
postscript? ( app-text/libspectre )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
"
RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_with chm)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with djvu DjVuLibre)
- $(cmake-utils_use_with dpi LibKScreen)
- $(cmake-utils_use_with ebook EPub)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with jpeg Kexiv2)
- $(cmake-utils_use_with mobi QMobiPocket)
- $(cmake-utils_use_with postscript LibSpectre)
- $(cmake-utils_use_with pdf PopplerQt4)
- $(cmake-utils_use_with pdf Poppler)
- $(cmake-utils_use_with tiff)
+ -DWITH_KActivities=OFF
+ -DWITH_CHM=$(usex chm)
+ -DWITH_QCA2=$(usex crypt)
+ -DWITH_DjVuLibre=$(usex djvu)
+ -DWITH_LibKScreen=$(usex dpi)
+ -DWITH_EPub=$(usex ebook)
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_Kexiv2=$(usex jpeg)
+ -DWITH_QMobipocket=$(usex mobi)
+ -DWITH_LibSpectre=$(usex postscript)
+ -DWITH_PopplerQt4=$(usex pdf)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_TIFF=$(usex tiff)
)
kde4-base_src_configure
diff --git a/kde-apps/okular/okular-4.14.3.ebuild b/kde-apps/okular/okular-4.14.3.ebuild
index aa029e3..da136d8 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-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ inherit kde4-base
DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
DEPEND="
@@ -24,7 +24,7 @@ DEPEND="
chm? ( dev-libs/chmlib )
crypt? ( app-crypt/qca:2[qt4(+)] )
djvu? ( app-text/djvu )
- dpi? ( x11-libs/libkscreen:4 )
+ dpi? ( kde-plasma/libkscreen:4 )
ebook? ( app-text/ebook-tools )
jpeg? (
$(add_kdeapps_dep libkexiv2)
@@ -33,7 +33,7 @@ DEPEND="
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
postscript? ( app-text/libspectre )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/okular/
@ 2020-08-16 16:00 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-08-16 16:00 UTC (permalink / raw
To: gentoo-commits
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(+)] )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/okular/
@ 2020-08-25 14:59 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-08-25 14:59 UTC (permalink / raw
To: gentoo-commits
commit: d993d71ce63524eecf9daccc0978beea4fdd0ab5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 15:37:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 14:58:17 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=d993d71c
kde-apps/okular: Fix invalid pkg in metadata.xml
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/okular/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 9ee1348c..bee71525 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -4,7 +4,7 @@
<!-- maintainer-needed -->
<use>
<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
- <flag name="dpi">DPI detection support for PDF rendering via <pkg>x11-libs/libkscreen</pkg></flag>
+ <flag name="dpi">DPI detection support for PDF rendering via <pkg>kde-plasma/libkscreen</pkg></flag>
<flag name="ebook">Add E-Book support</flag>
<flag name="mobi">Add mobipocket support</flag>
</use>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/okular/
@ 2020-12-07 1:01 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-12-07 1:01 UTC (permalink / raw
To: gentoo-commits
commit: 7d06cee78f954d317adb237222500e394aeb9b94
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 6 13:03:25 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 6 23:48:47 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=7d06cee7
kde-apps/okular: Switch to app-text/poppler:0-qt4, fix HOMEPAGE
drop unknown cmake arg
Improve compatibility with Gentoo ebuild repo.
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/okular/okular-16.08.3.ebuild | 12 ++++++------
kde-apps/okular/okular-4.14.3.ebuild | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/kde-apps/okular/okular-16.08.3.ebuild b/kde-apps/okular/okular-16.08.3.ebuild
index 36650ee4..16076785 100644
--- a/kde-apps/okular/okular-16.08.3.ebuild
+++ b/kde-apps/okular/okular-16.08.3.ebuild
@@ -5,16 +5,17 @@ EAPI=6
KDE_HANDBOOK="optional"
#VIRTUALX_REQUIRED=test
-RESTRICT=test
-# test 2: parttest hangs
-
inherit kde4-base
DESCRIPTION="Universal document viewer based on KPDF"
-HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
+HOMEPAGE="https://okular.kde.org https://apps.kde.org/en/okular"
+
KEYWORDS="amd64 x86"
IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
+RESTRICT+=" test"
+# test 2: parttest hangs
+
DEPEND="
media-libs/freetype
media-libs/phonon:0-qt4
@@ -30,7 +31,7 @@ DEPEND="
virtual/jpeg:0
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
- pdf? ( >=app-text/poppler-0.20[qt4(-),-exceptions(-)] )
+ pdf? ( app-text/poppler:0-qt4 )
postscript? ( app-text/libspectre )
tiff? ( media-libs/tiff:0 )
"
@@ -48,7 +49,6 @@ src_configure() {
-DWITH_Kexiv2=$(usex jpeg)
-DWITH_QMobipocket=$(usex mobi)
-DWITH_LibSpectre=$(usex postscript)
- -DWITH_PopplerQt4=$(usex pdf)
-DWITH_Poppler=$(usex pdf)
-DWITH_TIFF=$(usex tiff)
)
diff --git a/kde-apps/okular/okular-4.14.3.ebuild b/kde-apps/okular/okular-4.14.3.ebuild
index 3a038768..280221e6 100644
--- a/kde-apps/okular/okular-4.14.3.ebuild
+++ b/kde-apps/okular/okular-4.14.3.ebuild
@@ -30,7 +30,7 @@ DEPEND="
virtual/jpeg:0
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
- pdf? ( >=app-text/poppler-0.20[qt4(-),-exceptions(-)] )
+ pdf? ( app-text/poppler:0-qt4 )
postscript? ( app-text/libspectre )
tiff? ( media-libs/tiff:0 )
"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-07 1:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-07 1:01 [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/okular/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-08-25 14:59 Andreas Sturmlechner
2020-08-16 16:00 Andreas Sturmlechner
2016-11-20 10:00 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox