[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/libkdcraw/, kde-apps/kapptemplate/, ...

2024-05-24 Thread Andreas Sturmlechner 
commit: 5da63f9be27da57a83a2e8da5aecd5d38b2a1f2d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 24 15:27:30 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 24 15:27:30 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5da63f9b

*/*: Bump KDE Gear live KFMIN to 6.2.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-accessibility/kontrast/kontrast-.ebuild | 2 +-
 app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-.ebuild   | 2 +-
 app-cdr/isoimagewriter/isoimagewriter-.ebuild   | 2 +-
 app-crypt/keysmith/keysmith-.ebuild | 2 +-
 app-editors/ghostwriter/ghostwriter-.ebuild | 2 +-
 app-office/merkuro/merkuro-.ebuild  | 2 +-
 app-text/arianna/arianna-.ebuild| 2 +-
 dev-libs/kopeninghours/kopeninghours-.ebuild| 2 +-
 dev-libs/kosmindoormap/kosmindoormap-.ebuild| 2 +-
 dev-libs/kpublictransport/kpublictransport-.ebuild  | 2 +-
 dev-util/kio-perldoc/kio-perldoc-.ebuild| 2 +-
 games-puzzle/skladnik/skladnik-.ebuild  | 2 +-
 kde-apps/akonadi-calendar/akonadi-calendar-.ebuild  | 2 +-
 kde-apps/akonadi-contacts/akonadi-contacts-.ebuild  | 2 +-
 kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild| 2 +-
 kde-apps/akonadi-mime/akonadi-mime-.ebuild  | 2 +-
 kde-apps/akonadi-notes/akonadi-notes-.ebuild| 2 +-
 kde-apps/akonadi-search/akonadi-search-.ebuild  | 2 +-
 kde-apps/akonadi/akonadi-.ebuild| 2 +-
 kde-apps/akonadiconsole/akonadiconsole-.ebuild  | 2 +-
 kde-apps/akregator/akregator-.ebuild| 2 +-
 kde-apps/analitza/analitza-.ebuild  | 2 +-
 kde-apps/ark/ark-.ebuild| 2 +-
 kde-apps/audiocd-kio/audiocd-kio-.ebuild| 2 +-
 kde-apps/baloo-widgets/baloo-widgets-.ebuild| 2 +-
 kde-apps/blinken/blinken-.ebuild| 2 +-
 kde-apps/bomber/bomber-.ebuild  | 2 +-
 kde-apps/bovo/bovo-.ebuild  | 2 +-
 kde-apps/calendarjanitor/calendarjanitor-.ebuild| 2 +-
 kde-apps/calendarsupport/calendarsupport-.ebuild| 2 +-
 kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-.ebuild| 2 +-
 kde-apps/dolphin-plugins-git/dolphin-plugins-git-.ebuild| 2 +-
 .../dolphin-plugins-mercurial/dolphin-plugins-mercurial-.ebuild | 2 +-
 .../dolphin-plugins-subversion/dolphin-plugins-subversion-.ebuild   | 2 +-
 kde-apps/dolphin/dolphin-.ebuild| 2 +-
 kde-apps/dragon/dragon-.ebuild  | 2 +-
 kde-apps/eventviews/eventviews-.ebuild  | 2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild  | 2 +-
 kde-apps/filelight/filelight-.ebuild| 2 +-
 kde-apps/granatier/granatier-.ebuild| 2 +-
 kde-apps/grantlee-editor/grantlee-editor-.ebuild| 2 +-
 kde-apps/grantleetheme/grantleetheme-.ebuild| 2 +-
 kde-apps/gwenview/gwenview-.ebuild  | 2 +-
 kde-apps/incidenceeditor/incidenceeditor-.ebuild| 2 +-
 kde-apps/juk/juk-.ebuild| 2 +-
 kde-apps/k3b/k3b-.ebuild| 2 +-
 kde-apps/kaccounts-integration/kaccounts-integration-.ebuild| 2 +-
 kde-apps/kaccounts-providers/kaccounts-providers-.ebuild| 2 +-
 kde-apps/kaddressbook/kaddressbook-.ebuild  | 2 +-
 kde-apps/kajongg/kajongg-.ebuild| 2 +-
 kde-apps/kalarm/kalarm-.ebuild  | 2 +-
 kde-apps/kalgebra/kalgebra-.ebuild  | 2 +-
 kde-apps/kalzium/kalzium-.ebuild| 2 +-
 kde-apps/kamera/kamera-.ebuild  | 2 +-
 kde-apps/kanagram/kanagram-.ebuild  | 2 +-
 kde-apps/kapman/kapman-.ebuild  | 2 +-
 kde-apps/kapptemplate/kapptemplate-.ebuild  | 2 +-

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2024-04-28 Thread Andreas Sturmlechner 
commit: 1c9fe9b96f7e510523bf915a45567ec2a80320f8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 28 12:04:46 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 28 12:07:36 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c9fe9b9

kde-apps/okular: Rebase tests.patch on top of (24.05) HEAD

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-21.11.80-tests.patch | 101 --
 kde-apps/okular/files/okular-24.01.80-tests.patch |  98 -
 kde-apps/okular/files/okular-24.04.80-tests.patch |  46 ++
 kde-apps/okular/okular-24.05.49..ebuild   |   2 +-
 kde-apps/okular/okular-.ebuild|   2 +-
 5 files changed, 48 insertions(+), 201 deletions(-)

diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch 
b/kde-apps/okular/files/okular-21.11.80-tests.patch
deleted file mode 100644
index a0babcad1c..00
--- a/kde-apps/okular/files/okular-21.11.80-tests.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 323fed918995fe2e01036c74c1498446b4d2f122 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Thu, 12 Oct 2017 14:09:09 +0200
-Subject: [PATCH] Move tests into existing (auto)tests subdirectories
-

- generators/chm/CMakeLists.txt | 12 +++-
- generators/chm/autotests/CMakeLists.txt   |  8 
- generators/chm/autotests/chmgeneratortest.cpp |  2 +-
- generators/comicbook/CMakeLists.txt   | 10 +++---
- generators/comicbook/autotests/CMakeLists.txt |  6 ++
- 8 files changed, 27 insertions(+), 18 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/comicbook/autotests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 0d7452cba..3adb3fd54 100644
 a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -23,15 +23,9 @@ okular_add_generator(okularGenerator_chmlib 
${okularGenerator_chmlib_SRCS})
- target_include_directories(okularGenerator_chmlib PRIVATE ${CHM_INCLUDE_DIR} 
${LIBZIP_INCLUDE_DIR})
- target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF5::KHtml)
- 
--### autotests ###
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/chmgeneratortest.cpp
--TEST_NAME "chmgeneratortest"
--LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
--)
--
--target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
-+if(BUILD_TESTING)
-+   add_subdirectory(autotests)
-+endif()
- 
- ### install files ###
- install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
-new file mode 100644
-index 0..59753ca45
 /dev/null
-+++ b/generators/chm/autotests/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(chmgeneratortest.cpp
-+TEST_NAME "chmgeneratortest"
-+LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
-+)
-+
-+target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
-diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
-index c428fa1b3..68f7a5821 100644
 a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -30,7 +30,7 @@ void ChmGeneratorTest::initTestCase()
- {
- Okular::SettingsCore::instance(QStringLiteral("ChmGeneratorTest"));
- m_document = new Okular::Document(nullptr);
--const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
-+const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
- QMimeDatabase db;
- const QMimeType mime = db.mimeTypeForFile(testFile);
- QCOMPARE(m_document->openDocument(testFile, QUrl(), mime), 
Okular::Document::OpenSuccess);
-diff --git a/generators/comicbook/CMakeLists.txt 
b/generators/comicbook/CMakeLists.txt
-index a0e7569a2..91bcc6ec7 100644
 a/generators/comicbook/CMakeLists.txt
-+++ b/generators/comicbook/CMakeLists.txt
-@@ -25,13 +25,9 @@ if (KArchive_HAVE_LZMA)
- target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1)
- endif()
- 
--### autotests ###
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/comicbooktest.cpp
--TEST_NAME "comicbooktest"
--LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
--)
-+if(BUILD_TESTING)
-+add_subdirectory(autotests)
-+endif()
- 
- ### install files ###
- install( FILES okularComicbook.desktop  DESTINATION  
${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/comicbook/autotests/CMakeLists.txt 
b/generators/comicbook/autotests/CMakeLists.txt
-new file

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2024-02-26 Thread Sam James 
commit: 92e03ecc71fd490b98a1ada1f2eb99c5ba0f2648
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 27 00:18:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 27 00:18:32 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=92e03ecc

kde-apps/okular: add kwindowsystem dep

Meant to add this earlier.

Signed-off-by: Sam James  gentoo.org>

 kde-apps/okular/okular-24.02.0.ebuild   | 1 +
 kde-apps/okular/okular-24.02.49..ebuild | 1 +
 kde-apps/okular/okular-.ebuild  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-apps/okular/okular-24.02.0.ebuild 
b/kde-apps/okular/okular-24.02.0.ebuild
index 9318b4496a..479cb58acf 100644
--- a/kde-apps/okular/okular-24.02.0.ebuild
+++ b/kde-apps/okular/okular-24.02.0.ebuild
@@ -39,6 +39,7 @@ DEPEND="
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6

diff --git a/kde-apps/okular/okular-24.02.49..ebuild 
b/kde-apps/okular/okular-24.02.49..ebuild
index ecc8a7289d..20b883d920 100644
--- a/kde-apps/okular/okular-24.02.49..ebuild
+++ b/kde-apps/okular/okular-24.02.49..ebuild
@@ -39,6 +39,7 @@ DEPEND="
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 6db3b9dacd..bb7a9a6ae9 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -39,6 +39,7 @@ DEPEND="
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2024-02-26 Thread Sam James 
commit: e8811d9abade5742f6ff3e633569146b61b491e8
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 26 23:22:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 26 23:22:00 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8811d9a

kde-apps/okular: refresh deps

See upstream MR https://invent.kde.org/graphics/okular/-/merge_requests/933.

Signed-off-by: Sam James  gentoo.org>

 kde-apps/okular/okular-24.02.0.ebuild   | 3 +++
 kde-apps/okular/okular-24.02.49..ebuild | 3 +++
 kde-apps/okular/okular-.ebuild  | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/kde-apps/okular/okular-24.02.0.ebuild 
b/kde-apps/okular/okular-24.02.0.ebuild
index 043f345e4b..9318b4496a 100644
--- a/kde-apps/okular/okular-24.02.0.ebuild
+++ b/kde-apps/okular/okular-24.02.0.ebuild
@@ -26,6 +26,7 @@ DEPEND="
>=kde-apps/libkexiv2-${PVCUT}:6
>=kde-frameworks/karchive-${KFMIN}:6
>=kde-frameworks/kbookmarks-${KFMIN}:6
+   >=kde-frameworks/kcolorscheme-${KFMIN}:6
>=kde-frameworks/kcompletion-${KFMIN}:6
>=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
@@ -33,9 +34,11 @@ DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemviews-${KFMIN}:6
>=kde-frameworks/kparts-${KFMIN}:6
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6

diff --git a/kde-apps/okular/okular-24.02.49..ebuild 
b/kde-apps/okular/okular-24.02.49..ebuild
index da5d94e2cd..ecc8a7289d 100644
--- a/kde-apps/okular/okular-24.02.49..ebuild
+++ b/kde-apps/okular/okular-24.02.49..ebuild
@@ -26,6 +26,7 @@ DEPEND="
>=kde-apps/libkexiv2-${PVCUT}:6
>=kde-frameworks/karchive-${KFMIN}:6
>=kde-frameworks/kbookmarks-${KFMIN}:6
+   >=kde-frameworks/kcolorscheme-${KFMIN}:6
>=kde-frameworks/kcompletion-${KFMIN}:6
>=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
@@ -33,9 +34,11 @@ DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemviews-${KFMIN}:6
>=kde-frameworks/kparts-${KFMIN}:6
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index e0a06383a6..6db3b9dacd 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -26,6 +26,7 @@ DEPEND="
>=kde-apps/libkexiv2-${PVCUT}:6
>=kde-frameworks/karchive-${KFMIN}:6
>=kde-frameworks/kbookmarks-${KFMIN}:6
+   >=kde-frameworks/kcolorscheme-${KFMIN}:6
>=kde-frameworks/kcompletion-${KFMIN}:6
>=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
@@ -33,9 +34,11 @@ DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemviews-${KFMIN}:6
>=kde-frameworks/kparts-${KFMIN}:6
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2024-02-25 Thread Sam James 
commit: eb40628ed4ffb8653a8ee416fd02741daf43ba78
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 25 19:06:55 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 25 19:09:51 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb40628e

kde-apps/okular: refresh deps

* Needs qtxml (upstream commit c3ee60e0a182ec5431ddd0bf6361f951843be16e)
* Needs kxmlgui (upstream commit 050fa3bd096ef3e3c3d934266c7d47cf4c28d5df)
* Drop jpeg (upstream commit b38040cd74c931bda63fa162c6e2d75707392036,  
only)

Signed-off-by: Sam James  gentoo.org>

 kde-apps/okular/okular-24.02.0.ebuild   | 3 ++-
 kde-apps/okular/okular-24.02.49..ebuild | 3 ++-
 kde-apps/okular/okular-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/okular-24.02.0.ebuild 
b/kde-apps/okular/okular-24.02.0.ebuild
index b0068f6d00..043f345e4b 100644
--- a/kde-apps/okular/okular-24.02.0.ebuild
+++ b/kde-apps/okular/okular-24.02.0.ebuild
@@ -20,7 +20,7 @@ IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript 
qml share speech +ti
 
 # slot op: Uses Qt6::CorePrivate
 DEPEND="
-   >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+   >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,xml]
>=dev-qt/qtdeclarative-${QTMIN}:6
>=dev-qt/qtsvg-${QTMIN}:6
>=kde-apps/libkexiv2-${PVCUT}:6
@@ -36,6 +36,7 @@ DEPEND="
>=kde-frameworks/kparts-${KFMIN}:6
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6
media-libs/freetype

diff --git a/kde-apps/okular/okular-24.02.49..ebuild 
b/kde-apps/okular/okular-24.02.49..ebuild
index 50065082ef..da5d94e2cd 100644
--- a/kde-apps/okular/okular-24.02.49..ebuild
+++ b/kde-apps/okular/okular-24.02.49..ebuild
@@ -20,7 +20,7 @@ IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript 
qml share speech +ti
 
 # slot op: Uses Qt6::CorePrivate
 DEPEND="
-   >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+   >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,xml]
>=dev-qt/qtdeclarative-${QTMIN}:6
>=dev-qt/qtsvg-${QTMIN}:6
>=kde-apps/libkexiv2-${PVCUT}:6
@@ -36,6 +36,7 @@ DEPEND="
>=kde-frameworks/kparts-${KFMIN}:6
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6
media-libs/freetype

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 50065082ef..e0a06383a6 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -20,7 +20,7 @@ IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript 
qml share speech +ti
 
 # slot op: Uses Qt6::CorePrivate
 DEPEND="
-   >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+   >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,xml]
>=dev-qt/qtdeclarative-${QTMIN}:6
>=dev-qt/qtsvg-${QTMIN}:6
>=kde-apps/libkexiv2-${PVCUT}:6
@@ -36,10 +36,10 @@ DEPEND="
>=kde-frameworks/kparts-${KFMIN}:6
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6
media-libs/freetype
-   media-libs/libjpeg-turbo:=
sys-libs/zlib
crypt? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
djvu? ( app-text/djvu )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2024-01-15 Thread Andreas Sturmlechner 
commit: 65a0068393f38c2c474e3a2ba040601c6bb56d86
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 15 20:38:56 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 15 20:38:56 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=65a00683

kde-apps/okular: Backport fixes by upstream request

See also: https://mail.kde.org/pipermail/distributions/2024-January/001476.html

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/okular-24.01.90-fix-compile-path.patch   | 25 +++
 .../okular-24.01.90-fix-loading-okularpart.patch   | 28 ++
 kde-apps/okular/okular-24.01.90.ebuild |  2 ++
 3 files changed, 55 insertions(+)

diff --git a/kde-apps/okular/files/okular-24.01.90-fix-compile-path.patch 
b/kde-apps/okular/files/okular-24.01.90-fix-compile-path.patch
new file mode 100644
index 00..ef5b7e9c13
--- /dev/null
+++ b/kde-apps/okular/files/okular-24.01.90-fix-compile-path.patch
@@ -0,0 +1,25 @@
+From 7aac8a4f9aa8f1c296f6f5c3e68d0404e3925913 Mon Sep 17 00:00:00 2001
+From: Sune Vuorela 
+Date: Fri, 12 Jan 2024 09:43:16 +0100
+Subject: [PATCH] Also fix compile path
+
+(cherry picked from commit 478f6f24fbde4657b7bd13dbc4a58512cbd6eb2a)
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9cb9851731..0a56d74b5d 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -615,6 +615,7 @@ if (KF6Purpose_FOUND)
+ endif()
+ 
+ set_target_properties(okularpart PROPERTIES PREFIX "")
++set_target_properties(okularpart PROPERTIES LIBRARY_OUTPUT_DIRECTORY 
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/kf6/parts)
+ 
+ if (Qt6TextToSpeech_FOUND)
+target_link_libraries(okularpart Qt6::TextToSpeech)
+-- 
+GitLab
+

diff --git a/kde-apps/okular/files/okular-24.01.90-fix-loading-okularpart.patch 
b/kde-apps/okular/files/okular-24.01.90-fix-loading-okularpart.patch
new file mode 100644
index 00..41c1ad3225
--- /dev/null
+++ b/kde-apps/okular/files/okular-24.01.90-fix-loading-okularpart.patch
@@ -0,0 +1,28 @@
+From f23a2448b00e1aa83158bfdb66a1f981afe61938 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella 
+Date: Fri, 12 Jan 2024 01:02:46 +0100
+Subject: [PATCH] Fix loading okularpart
+
+Adapt to the new location
+
+(cherry picked from commit 53fb06d6b4a931b87364a87fcced459b5824b678)
+---
+ shell/shell.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shell/shell.cpp b/shell/shell.cpp
+index 0a006d5cad..9074a16037 100644
+--- a/shell/shell.cpp
 b/shell/shell.cpp
+@@ -201,7 +201,7 @@ Shell::Shell(const QString )
+ // name which is a bad idea usually.. but it's alright in this
+ // case since our Part is made for this Shell
+ 
+-const auto result = 
KPluginFactory::loadFactory(KPluginMetaData(QStringLiteral("okularpart")));
++const auto result = 
KPluginFactory::loadFactory(KPluginMetaData(QStringLiteral("kf6/parts/okularpart")));
+ 
+ if (!result) {
+ // if we couldn't find our Part, we exit since the Shell by
+-- 
+GitLab
+

diff --git a/kde-apps/okular/okular-24.01.90.ebuild 
b/kde-apps/okular/okular-24.01.90.ebuild
index 80a7303bfa..dfc297c282 100644
--- a/kde-apps/okular/okular-24.01.90.ebuild
+++ b/kde-apps/okular/okular-24.01.90.ebuild
@@ -61,6 +61,8 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-24.01.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
+   "${FILESDIR}/${P}-fix-compile-path.patch"
+   "${FILESDIR}/${P}-fix-loading-okularpart.patch"
 )
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2023-12-21 Thread Andreas Sturmlechner 
commit: c0ac9ef00f7db3237beb928632cb818c8a349469
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 21 11:46:06 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 21 11:46:06 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c0ac9ef0

kde-apps/okular: Clear kde-plasma/plasma-activities min version

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index e853d28303..dabdf7eb9a 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -37,7 +37,7 @@ DEPEND="
>=kde-frameworks/kpty-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
>=kde-frameworks/threadweaver-${KFMIN}:6
-   >=kde-plasma/plasma-activities-${KFMIN}:6
+   kde-plasma/plasma-activities:6
media-libs/freetype
media-libs/libjpeg-turbo:=
sys-libs/zlib

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/

2023-12-19 Thread Andreas Sturmlechner 
commit: a58c876a30739c11547d08da178c88bf2d9dc76c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 19 08:59:04 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 19 09:23:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a58c876a

kde-apps/okular: Port to KF6, cleanup IUSE image-backend,plucker

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-24.01.80-tests.patch | 98 +++
 kde-apps/okular/okular-.ebuild| 97 ++
 2 files changed, 139 insertions(+), 56 deletions(-)

diff --git a/kde-apps/okular/files/okular-24.01.80-tests.patch 
b/kde-apps/okular/files/okular-24.01.80-tests.patch
new file mode 100644
index 00..1ae19277b5
--- /dev/null
+++ b/kde-apps/okular/files/okular-24.01.80-tests.patch
@@ -0,0 +1,98 @@
+From 7e5c4aa3760db4dbb76af47e173be3dff229bff7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 19 Dec 2023 10:13:52 +0100
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ generators/chm/CMakeLists.txt | 11 +++
+ generators/chm/autotests/CMakeLists.txt   |  7 +++
+ generators/chm/autotests/chmgeneratortest.cpp |  2 +-
+ generators/comicbook/CMakeLists.txt   |  9 +++--
+ generators/comicbook/autotests/CMakeLists.txt |  5 +
+ 5 files changed, 19 insertions(+), 15 deletions(-)
+ create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/comicbook/autotests/CMakeLists.txt
+
+diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
+index 5d569499f..2784f75fc 100644
+--- a/generators/chm/CMakeLists.txt
 b/generators/chm/CMakeLists.txt
+@@ -24,14 +24,9 @@ target_include_directories(okularGenerator_chmlib PRIVATE 
${CHM_INCLUDE_DIR} ${L
+ target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF6::KHtml)
+ 
+ ### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/chmgeneratortest.cpp
+-TEST_NAME "chmgeneratortest"
+-LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
+-)
+-
+-target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
++if(BUILD_TESTING)
++   add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( PROGRAMS okularApplication_chm.desktop 
org.kde.mobile.okular_chm.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
+new file mode 100644
+index 0..36c468156
+--- /dev/null
 b/generators/chm/autotests/CMakeLists.txt
+@@ -0,0 +1,7 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++ecm_add_test(chmgeneratortest.cpp
++TEST_NAME "chmgeneratortest"
++LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
++)
++
++target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
+diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
+index 2c7696ab1..24742248b 100644
+--- a/generators/chm/autotests/chmgeneratortest.cpp
 b/generators/chm/autotests/chmgeneratortest.cpp
+@@ -30,7 +30,7 @@ void ChmGeneratorTest::initTestCase()
+ {
+ Okular::SettingsCore::instance(QStringLiteral("ChmGeneratorTest"));
+ m_document = new Okular::Document(nullptr);
+-const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
++const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
+ QMimeDatabase db;
+ const QMimeType mime = db.mimeTypeForFile(testFile);
+ QCOMPARE(m_document->openDocument(testFile, QUrl(), mime), 
Okular::Document::OpenSuccess);
+diff --git a/generators/comicbook/CMakeLists.txt 
b/generators/comicbook/CMakeLists.txt
+index 2fc8ff710..d92c75905 100644
+--- a/generators/comicbook/CMakeLists.txt
 b/generators/comicbook/CMakeLists.txt
+@@ -27,12 +27,9 @@ if (KArchive_HAVE_LZMA)
+ endif()
+ 
+ ### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/comicbooktest.cpp
+-TEST_NAME "comicbooktest"
+-LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore okular_comicbook
+-)
++if(BUILD_TESTING)
++add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( PROGRAMS okularApplication_comicbook.desktop 
org.kde.mobile.okular_comicbook.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+diff --git a/generators/comicbook/autotests/CMakeLists.txt 
b/generators/comicbook/autotests/CMakeLists.txt
+new file mode 100644
+index 0..6426105e4
+--- /dev/null
 b/generators/comicbook/autotests/CMakeLists.txt
+@@ -0,0 +1,5 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++ecm_add_test(comicbooktest.cpp
++

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2023-08-06 Thread Andreas Sturmlechner 
commit: eb04ec986b19d9f363691197fb93cdcf2224f0f2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug  6 09:52:02 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug  6 09:54:21 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb04ec98

kde-apps/okular: Update dependencies, add IUSE=phonon

Upstream commits:
7235cd2b9d4fadc7dc212b6c807a0598662ee41d
03368e06f4217459c1823c1da7a74217f744e0b4
617ba7dd0394642c448cfe6436d0a031a2789303
44e758955ca3f0a1a64c675cf3bb7cad421a4f4c

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/metadata.xml   | 1 +
 kde-apps/okular/okular-.ebuild | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index c1de2f50d8..afc63e47dc 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -15,6 +15,7 @@
Enable image viewing support
Enable Markdown support via 
app-text/discount
Enable mobipocket support via 
kde-apps/kdegraphics-mobipocket
+   Enable sound support via 
media-libs/phonon
Enable Plucker E-Book for Palm OS devices 
support
Install Okular Qml components
Enable support for a share menu using 
kde-frameworks/purpose

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index a3c57fddce..67219c84f7 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -16,12 +16,13 @@ HOMEPAGE="https://okular.kde.org 
https://apps.kde.org/okular/;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript 
qml share speech +tiff"
+IUSE="crypt djvu epub +image-backend markdown mobi +pdf phonon +plucker 
+postscript qml share speech +tiff"
 
 # slot op: Uses Qt5::CorePrivate
 DEPEND="
>=dev-qt/qtcore-${QTMIN}:5=
>=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
@@ -37,13 +38,11 @@ DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kjs-${KFMIN}:5
>=kde-frameworks/kparts-${KFMIN}:5
>=kde-frameworks/kpty-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/threadweaver-${KFMIN}:5
media-libs/freetype
-   >=media-libs/phonon-4.11.0
sys-libs/zlib
crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
djvu? ( app-text/djvu )
@@ -55,6 +54,7 @@ DEPEND="
markdown? ( >=app-text/discount-2.2.7-r1:= )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
+   phonon? ( >=media-libs/phonon-4.11.0 )
plucker? ( media-libs/libjpeg-turbo:= )
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
@@ -88,6 +88,7 @@ src_configure() {
$(cmake_use_find_package markdown Discount)
$(cmake_use_find_package mobi QMobipocket)
$(cmake_use_find_package pdf Poppler)
+   $(cmake_use_find_package phonon Phonon4Qt5)
$(cmake_use_find_package plucker JPEG)
$(cmake_use_find_package postscript LibSpectre)
$(cmake_use_find_package share KF5Purpose)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2023-03-23 Thread Andreas Sturmlechner 
commit: 491b1def5e2cf17bdcf19d64f2cb8376822297b3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 23 21:47:48 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 23 21:47:48 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=491b1def

kde-apps/okular: Add new dependency

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index cddc8fc1cb..973f472f6f 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -27,6 +27,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtx11extras-${QTMIN}:5
>=kde-frameworks/kactivities-${KFMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2023-02-18 Thread Andreas Sturmlechner 
commit: 17779f193a38b948016c25d3987e6cb66406a0f7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 18 10:44:02 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 18 10:45:02 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=17779f19

kde-apps/okular: Fix build with >=app-text/discount-3

Bug: https://bugs.gentoo.org/892633
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../okular/files/okular-22.12.2-discount-3.patch   | 47 ++
 kde-apps/okular/okular-22.12.49..ebuild|  1 +
 2 files changed, 48 insertions(+)

diff --git a/kde-apps/okular/files/okular-22.12.2-discount-3.patch 
b/kde-apps/okular/files/okular-22.12.2-discount-3.patch
new file mode 100644
index 00..e9fef2679a
--- /dev/null
+++ b/kde-apps/okular/files/okular-22.12.2-discount-3.patch
@@ -0,0 +1,47 @@
+From f1f638c2c51a6ef699dee22f6e90aff67beff8ec Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Wed, 1 Feb 2023 22:01:52 +0100
+Subject: [PATCH] Compile with discount 3
+
+---
+ generators/markdown/converter.cpp | 17 +
+ 1 file changed, 17 insertions(+)
+
+diff --git a/generators/markdown/converter.cpp 
b/generators/markdown/converter.cpp
+index 20d3c725f..3c8546b32 100644
+--- a/generators/markdown/converter.cpp
 b/generators/markdown/converter.cpp
+@@ -93,6 +93,8 @@ QTextDocument *Converter::convertOpenFile()
+ {
+ rewind(m_markdownFile);
+ 
++#if defined(MKD_NOLINKS)
++// on discount 2 MKD_NOLINKS is a define
+ MMIOT *markdownHandle = mkd_in(m_markdownFile, 0);
+ 
+ int flags = MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK | MKD_TOC | 
MKD_IDANCHOR;
+@@ -103,6 +105,21 @@ QTextDocument *Converter::convertOpenFile()
+ Q_EMIT error(i18n("Failed to compile the Markdown document."), -1);
+ return nullptr;
+ }
++#else
++// on discount 3 MKD_NOLINKS is an enum value
++MMIOT *markdownHandle = mkd_in(m_markdownFile, nullptr);
++
++mkd_flag_t *flags = mkd_flags();
++mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK 
| MKD_TOC | MKD_IDANCHOR);
++if (!m_isFancyPantsEnabled) {
++mkd_set_flag_num(flags, MKD_NOPANTS);
++}
++if (!mkd_compile(markdownHandle, flags)) {
++Q_EMIT error(i18n("Failed to compile the Markdown document."), -1);
++return nullptr;
++}
++mkd_free_flags(flags);
++#endif
+ 
+ char *htmlDocument;
+ const int size = mkd_document(markdownHandle, );
+-- 
+GitLab
+

diff --git a/kde-apps/okular/okular-22.12.49..ebuild 
b/kde-apps/okular/okular-22.12.49..ebuild
index b6cf9d81ad..0b3822df4d 100644
--- a/kde-apps/okular/okular-22.12.49..ebuild
+++ b/kde-apps/okular/okular-22.12.49..ebuild
@@ -72,6 +72,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
+   "${FILESDIR}/${PN}-22.12.2-discount-3.patch" # bug 892633
 )
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/

2023-02-18 Thread Andreas Sturmlechner 
commit: 0149bf3b57d686de6e9388045f1fb26bf53660b0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 18 10:45:18 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 18 10:45:18 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0149bf3b

kde-apps/okular: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/okular-22.04.0-optional-options.patch| 113 -
 1 file changed, 113 deletions(-)

diff --git a/kde-apps/okular/files/okular-22.04.0-optional-options.patch 
b/kde-apps/okular/files/okular-22.04.0-optional-options.patch
deleted file mode 100644
index caaf389b67..00
--- a/kde-apps/okular/files/okular-22.04.0-optional-options.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From f29b89d8ac7fcca1cf74462dcc33da24551c924f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Tue, 31 Aug 2021 16:48:42 +0200
-Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options
-
-Since I was asked to implement this, might as well make it real options,
-not just limited to ANDROID. Even though optional find_package() call is
-already being used for KF5Purpose as well.
-
-KF5DocTools is not made required more often than not.
-
-See also: https://invent.kde.org/graphics/okular/-/issues/61
-Downstream report: https://bugs.gentoo.org/810958
-
-Signed-off-by: Andreas Sturmlechner 

- CMakeLists.txt| 21 -
- config-okular.h.cmake |  6 ++
- core/generator.cpp|  1 +
- core/scripter.cpp |  1 +
- 4 files changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 547671f24..f1e14fa8b 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -91,12 +91,9 @@ ecm_setup_qtplugin_macro_names(
- PACKAGE_SETUP_AUTOMOC_VARIABLES
- )
- 
--set(optionalComponents)
--if (ANDROID)
--#   we want to make sure that generally all components are found
--
--set(optionalComponents "OPTIONAL_COMPONENTS")
--endif()
-+# we want to make sure that generally all components are found
-+option(WITH_KWALLET "Build with desktop-wide storage for password support" ON)
-+option(WITH_KJS "Build with scripting support" ON)
- 
- find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
- Archive
-@@ -110,21 +107,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED 
COMPONENTS
- KIO
- ThreadWeaver
- WindowSystem
--${optionalComponents}
-+OPTIONAL_COMPONENTS
- DocTools
--JS
--Wallet
- )
- 
- if (BUILD_DESKTOP)
- find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash 
IconThemes TextWidgets)
- endif()
- 
--if(KF5Wallet_FOUND)
--add_definitions(-DWITH_KWALLET=1)
-+if(WITH_KWALLET)
-+find_package(KF5Wallet ${KF5_REQUIRED_VERSION} REQUIRED)
- endif()
--if(KF5JS_FOUND)
--add_definitions(-DWITH_KJS=1)
-+if(WITH_KJS)
-+find_package(KF5JS ${KF5_REQUIRED_VERSION} REQUIRED)
- endif()
- 
- if(NOT WIN32 AND NOT ANDROID)
-diff --git a/config-okular.h.cmake b/config-okular.h.cmake
-index 905aac9cb..00e45f77c 100644
 a/config-okular.h.cmake
-+++ b/config-okular.h.cmake
-@@ -1,6 +1,12 @@
- /* Defines if force the use DRM in okular */
- #define OKULAR_FORCE_DRM ${_OKULAR_FORCE_DRM}
- 
-+/* Defines if the KJS framework is available */
-+#cmakedefine WITH_KJS
-+
-+/* Defines if the kwallet framework is available */
-+#cmakedefine WITH_KWALLET
-+
- /* Defines if the purpose framework is available */
- #define PURPOSE_FOUND ${PURPOSE_FOUND}
- 
-diff --git a/core/generator.cpp b/core/generator.cpp
-index 8360bb32b..0871c17ee 100644
 a/core/generator.cpp
-+++ b/core/generator.cpp
-@@ -9,6 +9,7 @@
- */
- 
- #include "generator.h"
-+#include "config-okular.h"
- #include "generator_p.h"
- #include "observer.h"
- 
-diff --git a/core/scripter.cpp b/core/scripter.cpp
-index c60645895..2e6eacc72 100644
 a/core/scripter.cpp
-+++ b/core/scripter.cpp
-@@ -5,6 +5,7 @@
- */
- 
- #include "scripter.h"
-+#include "config-okular.h"
- 
- #include 
- #include 
--- 
-2.35.1
-

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2023-02-02 Thread Andreas Sturmlechner 
commit: 1c8428d22d4758b67aee5bebd6b6421e6947c216
Author: Ben Kohler  gentoo  org>
AuthorDate: Mon Jan 30 14:44:09 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  2 10:26:02 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c8428d2

kde-apps/okular: slot operator dep on app-text/discount

Signed-off-by: Ben Kohler  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/okular/okular-22.12.49..ebuild 
b/kde-apps/okular/okular-22.12.49..ebuild
index af4ae6734d..b6cf9d81ad 100644
--- a/kde-apps/okular/okular-22.12.49..ebuild
+++ b/kde-apps/okular/okular-22.12.49..ebuild
@@ -52,7 +52,7 @@ DEPEND="
>=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
>=kde-apps/libkexiv2-${PVCUT}:5
)
-   markdown? ( >=app-text/discount-2.2.7-r1 )
+   markdown? ( >=app-text/discount-2.2.7-r1:= )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
plucker? ( media-libs/libjpeg-turbo:= )

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index af4ae6734d..b6cf9d81ad 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -52,7 +52,7 @@ DEPEND="
>=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
>=kde-apps/libkexiv2-${PVCUT}:5
)
-   markdown? ( >=app-text/discount-2.2.7-r1 )
+   markdown? ( >=app-text/discount-2.2.7-r1:= )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
plucker? ( media-libs/libjpeg-turbo:= )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2022-12-16 Thread Andreas Sturmlechner 
commit: ec3e954affc0904a9913f5d08142bb5035eec84c
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 01:24:19 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 16 19:30:25 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec3e954a

kde-apps/okular: add media-libs/libtiff subslot dep

libtiff changed SONAME.

Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/okular/okular-22.12.49..ebuild 
b/kde-apps/okular/okular-22.12.49..ebuild
index 496a5d7f03..83935d7a74 100644
--- a/kde-apps/okular/okular-22.12.49..ebuild
+++ b/kde-apps/okular/okular-22.12.49..ebuild
@@ -59,7 +59,7 @@ DEPEND="
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   tiff? ( media-libs/tiff:0 )
+   tiff? ( media-libs/tiff:= )
 "
 RDEPEND="${DEPEND}
image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 496a5d7f03..83935d7a74 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -59,7 +59,7 @@ DEPEND="
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   tiff? ( media-libs/tiff:0 )
+   tiff? ( media-libs/tiff:= )
 "
 RDEPEND="${DEPEND}
image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2022-11-11 Thread Andreas Sturmlechner 
commit: 18f2c8c12ce28c250da370fa3c6b7be2422353ac
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 11 21:47:36 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 11 21:47:36 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=18f2c8c1

kde-apps/okular: Add slot op on dev-qt/qtcore

Upstream commit 80afe26873d5355537d90a144bec23e03fa78fe8

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index f6da383dce..de14f56f83 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -19,7 +19,9 @@ SLOT="5"
 KEYWORDS=""
 IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript 
qml share speech +tiff"
 
+# slot op: Uses Qt5::CorePrivate
 DEPEND="
+   >=dev-qt/qtcore-${QTMIN}:5=
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2022-10-06 Thread Andreas Sturmlechner 
commit: 092d55b8c6fd727e89412d84529b36d751421014
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  6 08:16:37 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  6 09:01:57 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=092d55b8

kde-apps/okular: Add CPE to metadata

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index e4668c73af..c1de2f50d8 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -7,6 +7,7 @@


https://bugs.kde.org/
+   cpe:/a:kde:okular


Enable support for password-encrypted 
documents via kde-frameworks/kwallet

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2022-09-08 Thread Andreas Sturmlechner 
commit: 296e69080e1d25b871106708766eab2e02c998c8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep  8 14:15:37 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep  8 14:21:57 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=296e6908

kde-apps/okular: Prepare for dev-qt/qtgui losing IUSE gif

Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/okular/okular-22.08.49..ebuild 
b/kde-apps/okular/okular-22.08.49..ebuild
index b9bbfec37d..1dee915dd8 100644
--- a/kde-apps/okular/okular-22.08.49..ebuild
+++ b/kde-apps/okular/okular-22.08.49..ebuild
@@ -47,7 +47,7 @@ DEPEND="
djvu? ( app-text/djvu )
epub? ( app-text/ebook-tools )
image-backend? (
-   >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+   >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
>=kde-apps/libkexiv2-${PVCUT}:5
)
markdown? ( >=app-text/discount-2.2.7-r1 )

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index b9bbfec37d..1dee915dd8 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -47,7 +47,7 @@ DEPEND="
djvu? ( app-text/djvu )
epub? ( app-text/ebook-tools )
image-backend? (
-   >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+   >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
>=kde-apps/libkexiv2-${PVCUT}:5
)
markdown? ( >=app-text/discount-2.2.7-r1 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2022-07-17 Thread Andreas Sturmlechner 
commit: cca599478faa2d87b10e37a1526e8d5c1de3e362
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul 17 09:10:03 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 17 11:53:49 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cca59947

kde-apps/okular: Disable failing signunsignedfieldtest

Bug: https://bugs.gentoo.org/852749
Package-Manager: Portage-3.0.32, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-22.07.80.ebuild  | 3 ++-
 kde-apps/okular/okular-22.08.49..ebuild | 3 ++-
 kde-apps/okular/okular-.ebuild  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-22.07.80.ebuild 
b/kde-apps/okular/okular-22.07.80.ebuild
index beaace656a..ac81f56b0b 100644
--- a/kde-apps/okular/okular-22.07.80.ebuild
+++ b/kde-apps/okular/okular-22.07.80.ebuild
@@ -98,8 +98,9 @@ src_configure() {
 src_test() {
# mainshelltest hangs, chmgeneratortest fails, bug #603116
# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug 
#429640
+   # signunsignedfieldtest fails, whatever. bug #852749
local myctestargs=(
-   -E 
"(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
+   -E 
"(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)"
)
 
ecm_src_test

diff --git a/kde-apps/okular/okular-22.08.49..ebuild 
b/kde-apps/okular/okular-22.08.49..ebuild
index 9a848ce6cf..b9bbfec37d 100644
--- a/kde-apps/okular/okular-22.08.49..ebuild
+++ b/kde-apps/okular/okular-22.08.49..ebuild
@@ -98,8 +98,9 @@ src_configure() {
 src_test() {
# mainshelltest hangs, chmgeneratortest fails, bug #603116
# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug 
#429640
+   # signunsignedfieldtest fails, whatever. bug #852749
local myctestargs=(
-   -E 
"(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
+   -E 
"(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)"
)
 
ecm_src_test

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 9a848ce6cf..b9bbfec37d 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -98,8 +98,9 @@ src_configure() {
 src_test() {
# mainshelltest hangs, chmgeneratortest fails, bug #603116
# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug 
#429640
+   # signunsignedfieldtest fails, whatever. bug #852749
local myctestargs=(
-   -E 
"(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
+   -E 
"(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)"
)
 
ecm_src_test

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2022-05-08 Thread Andreas Sturmlechner 
commit: 5ae8e84212b45052fdd9113379c50994657839ff
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May  9 05:33:22 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May  9 05:38:38 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ae8e842

kde-apps/okular: Drop obsolete patch

Upstream commit 913d437822f23730d10bf97c3ed9201f936a33a2

Closes: https://bugs.gentoo.org/829509
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 222d0bef65..8a47d39f2d 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.92.0
@@ -70,7 +70,6 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
-   "${FILESDIR}/${PN}-22.04.0-optional-options.patch" # bug 810958
 )
 
 src_configure() {
@@ -78,8 +77,9 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON
-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
+   
-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;"
-DOKULAR_UI=$(usex qml "both" "desktop")
-   -DWITH_KWALLET=$(usex crypt)
+   $(cmake_use_find_package crypt KF5Wallet)
$(cmake_use_find_package djvu DjVuLibre)
$(cmake_use_find_package epub EPub)
$(cmake_use_find_package image-backend KF5KExiv2)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2022-05-08 Thread Andreas Sturmlechner 
commit: bdc17e906259fabfae9db56b765ee8e49e14eb73
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  8 13:10:46 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  8 13:10:46 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bdc17e90

kde-apps/okular: Switch to media-libs/libjpeg-turbo:=

Away from deprecated virtual/jpeg.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/okular/okular-22.04.49..ebuild 
b/kde-apps/okular/okular-22.04.49..ebuild
index 0952515f4d..222d0bef65 100644
--- a/kde-apps/okular/okular-22.04.49..ebuild
+++ b/kde-apps/okular/okular-22.04.49..ebuild
@@ -53,7 +53,7 @@ DEPEND="
markdown? ( >=app-text/discount-2.2.7-r1 )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
-   plucker? ( virtual/jpeg:0 )
+   plucker? ( media-libs/libjpeg-turbo:= )
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 0952515f4d..222d0bef65 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -53,7 +53,7 @@ DEPEND="
markdown? ( >=app-text/discount-2.2.7-r1 )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
-   plucker? ( virtual/jpeg:0 )
+   plucker? ( media-libs/libjpeg-turbo:= )
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/

2022-03-29 Thread Andreas Sturmlechner 
commit: a626daadc0d9e5626aaa1ee3b52580e523b90b6c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 30 05:47:38 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 30 05:47:38 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a626daad

kde-apps/okular: Rebase optional-options patch on top of 22.07.70

Reported-by: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/836389
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-22.07.70-optional-options.patch | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/files/okular-22.07.70-optional-options.patch 
b/kde-apps/okular/files/okular-22.07.70-optional-options.patch
index 6c83b03e06..0cadfe415d 100644
--- a/kde-apps/okular/files/okular-22.07.70-optional-options.patch
+++ b/kde-apps/okular/files/okular-22.07.70-optional-options.patch
@@ -1,4 +1,4 @@
-From 86729e7698250dcb11ccbec0a6cc9690501ad691 Mon Sep 17 00:00:00 2001
+From f29b89d8ac7fcca1cf74462dcc33da24551c924f Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner 
 Date: Tue, 31 Aug 2021 16:48:42 +0200
 Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options
@@ -21,7 +21,7 @@ Signed-off-by: Andreas Sturmlechner 
  4 files changed, 16 insertions(+), 13 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43a45c7b9..57d0f6f74 100644
+index 547671f24..f1e14fa8b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -91,12 +91,9 @@ ecm_setup_qtplugin_macro_names(
@@ -40,7 +40,7 @@ index 43a45c7b9..57d0f6f74 100644
  
  find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
  Archive
-@@ -111,21 +108,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED 
COMPONENTS
+@@ -110,21 +107,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED 
COMPONENTS
  TextWidgets
  ThreadWeaver
  WindowSystem
@@ -52,7 +52,7 @@ index 43a45c7b9..57d0f6f74 100644
  )
  
  if (BUILD_DESKTOP)
- find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash)
+ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash 
IconThemes)
  endif()
  
 -if(KF5Wallet_FOUND)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2022-03-29 Thread Andreas Sturmlechner 
commit: a8ba387f91de80429faf70dbf3c29b908503e45f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 29 10:37:07 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 29 10:38:32 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8ba387f

kde-apps/okular: Rebase optional-options patch on top of 22.07.70

Reported-by: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/836354
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/okular-22.07.70-optional-options.patch   | 113 +
 kde-apps/okular/okular-.ebuild |   2 +-
 2 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/files/okular-22.07.70-optional-options.patch 
b/kde-apps/okular/files/okular-22.07.70-optional-options.patch
new file mode 100644
index 00..6c83b03e06
--- /dev/null
+++ b/kde-apps/okular/files/okular-22.07.70-optional-options.patch
@@ -0,0 +1,113 @@
+From 86729e7698250dcb11ccbec0a6cc9690501ad691 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 31 Aug 2021 16:48:42 +0200
+Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options
+
+Since I was asked to implement this, might as well make it real options,
+not just limited to ANDROID. Even though optional find_package() call is
+already being used for KF5Purpose as well.
+
+KF5DocTools is not made required more often than not.
+
+See also: https://invent.kde.org/graphics/okular/-/issues/61
+Downstream report: https://bugs.gentoo.org/810958
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt| 21 -
+ config-okular.h.cmake |  6 ++
+ core/generator.cpp|  1 +
+ core/scripter.cpp |  1 +
+ 4 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 43a45c7b9..57d0f6f74 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -91,12 +91,9 @@ ecm_setup_qtplugin_macro_names(
+ PACKAGE_SETUP_AUTOMOC_VARIABLES
+ )
+ 
+-set(optionalComponents)
+-if (ANDROID)
+-#   we want to make sure that generally all components are found
+-
+-set(optionalComponents "OPTIONAL_COMPONENTS")
+-endif()
++# we want to make sure that generally all components are found
++option(WITH_KWALLET "Build with desktop-wide storage for password support" ON)
++option(WITH_KJS "Build with scripting support" ON)
+ 
+ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
+ Archive
+@@ -111,21 +108,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED 
COMPONENTS
+ TextWidgets
+ ThreadWeaver
+ WindowSystem
+-${optionalComponents}
++OPTIONAL_COMPONENTS
+ DocTools
+-JS
+-Wallet
+ )
+ 
+ if (BUILD_DESKTOP)
+ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash)
+ endif()
+ 
+-if(KF5Wallet_FOUND)
+-add_definitions(-DWITH_KWALLET=1)
++if(WITH_KWALLET)
++find_package(KF5Wallet ${KF5_REQUIRED_VERSION} REQUIRED)
+ endif()
+-if(KF5JS_FOUND)
+-add_definitions(-DWITH_KJS=1)
++if(WITH_KJS)
++find_package(KF5JS ${KF5_REQUIRED_VERSION} REQUIRED)
+ endif()
+ 
+ if(NOT WIN32 AND NOT ANDROID)
+diff --git a/config-okular.h.cmake b/config-okular.h.cmake
+index 905aac9cb..00e45f77c 100644
+--- a/config-okular.h.cmake
 b/config-okular.h.cmake
+@@ -1,6 +1,12 @@
+ /* Defines if force the use DRM in okular */
+ #define OKULAR_FORCE_DRM ${_OKULAR_FORCE_DRM}
+ 
++/* Defines if the KJS framework is available */
++#cmakedefine WITH_KJS
++
++/* Defines if the kwallet framework is available */
++#cmakedefine WITH_KWALLET
++
+ /* Defines if the purpose framework is available */
+ #define PURPOSE_FOUND ${PURPOSE_FOUND}
+ 
+diff --git a/core/generator.cpp b/core/generator.cpp
+index 8360bb32b..0871c17ee 100644
+--- a/core/generator.cpp
 b/core/generator.cpp
+@@ -9,6 +9,7 @@
+ */
+ 
+ #include "generator.h"
++#include "config-okular.h"
+ #include "generator_p.h"
+ #include "observer.h"
+ 
+diff --git a/core/scripter.cpp b/core/scripter.cpp
+index c60645895..2e6eacc72 100644
+--- a/core/scripter.cpp
 b/core/scripter.cpp
+@@ -5,6 +5,7 @@
+ */
+ 
+ #include "scripter.h"
++#include "config-okular.h"
+ 
+ #include 
+ #include 
+-- 
+2.35.1
+

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 3f35e47237..d60b536522 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -70,7 +70,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
-   "${FILESDIR}/${PN}-22.03.70-optional-options.patch" # bug 810958
+   "${FILESDIR}/${PN}-22.07.70-optional-options.patch" # bug 810958
 )
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2022-02-04 Thread Andreas Sturmlechner 
commit: 79d1222b7ae749cc0073d8548803992441d956c6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Feb  4 12:37:56 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Feb  4 12:37:56 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=79d1222b

kde-apps/okular: DEPEND on >=app-text/discount-2.2.7-r1

Closes: https://bugs.gentoo.org/832689
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/okular/okular-21.12.49..ebuild 
b/kde-apps/okular/okular-21.12.49..ebuild
index df10904e74..578b7409a2 100644
--- a/kde-apps/okular/okular-21.12.49..ebuild
+++ b/kde-apps/okular/okular-21.12.49..ebuild
@@ -50,7 +50,7 @@ DEPEND="
>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
>=kde-apps/libkexiv2-${PVCUT}:5
)
-   markdown? ( app-text/discount )
+   markdown? ( >=app-text/discount-2.2.7-r1 )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
plucker? ( virtual/jpeg:0 )

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index f8780303ce..f0bd8be92a 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -50,7 +50,7 @@ DEPEND="
>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
>=kde-apps/libkexiv2-${PVCUT}:5
)
-   markdown? ( app-text/discount )
+   markdown? ( >=app-text/discount-2.2.7-r1 )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
plucker? ( virtual/jpeg:0 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2021-12-20 Thread Andreas Sturmlechner 
commit: 704b823c4258625299e78feba50b48112f9532a2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 20 15:40:21 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 20 15:40:21 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=704b823c

kde-apps/okular: Rebase optional-options patch on top of 22.03.70

Reported-by: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/829509
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/okular-22.03.70-optional-options.patch   | 113 +
 kde-apps/okular/okular-.ebuild |   2 +-
 2 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/files/okular-22.03.70-optional-options.patch 
b/kde-apps/okular/files/okular-22.03.70-optional-options.patch
new file mode 100644
index 00..d2a0217fba
--- /dev/null
+++ b/kde-apps/okular/files/okular-22.03.70-optional-options.patch
@@ -0,0 +1,113 @@
+From 8abc1c2090fc5474ef2f21c9ef9bbea2e76578b5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 31 Aug 2021 16:48:42 +0200
+Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options
+
+Since I was asked to implement this, might as well make it real options,
+not just limited to ANDROID. Even though optional find_package() call is
+already being used for KF5Purpose as well.
+
+KF5DocTools is not made required more often than not.
+
+See also: https://invent.kde.org/graphics/okular/-/issues/61
+Downstream report: https://bugs.gentoo.org/810958
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt| 21 -
+ config-okular.h.cmake |  6 ++
+ core/generator.cpp|  1 +
+ core/scripter.cpp |  1 +
+ 4 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 990be62fd..21cdbd9b8 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -84,12 +84,9 @@ ecm_setup_qtplugin_macro_names(
+ PACKAGE_SETUP_AUTOMOC_VARIABLES
+ )
+ 
+-set(optionalComponents)
+-if (ANDROID)
+-#   we want to make sure that generally all components are found
+-
+-set(optionalComponents "OPTIONAL_COMPONENTS")
+-endif()
++# we want to make sure that generally all components are found
++option(WITH_KWALLET "Build with desktop-wide storage for password support" ON)
++option(WITH_KJS "Build with scripting support" ON)
+ 
+ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
+ Archive
+@@ -105,21 +102,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED 
COMPONENTS
+ TextWidgets
+ ThreadWeaver
+ WindowSystem
+-${optionalComponents}
++OPTIONAL_COMPONENTS
+ DocTools
+-JS
+-Wallet
+ )
+ 
+ if (BUILD_DESKTOP)
+ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts)
+ endif()
+ 
+-if(KF5Wallet_FOUND)
+-add_definitions(-DWITH_KWALLET=1)
++if(WITH_KWALLET)
++find_package(KF5Wallet ${KF5_REQUIRED_VERSION} REQUIRED)
+ endif()
+-if(KF5JS_FOUND)
+-add_definitions(-DWITH_KJS=1)
++if(WITH_KJS)
++find_package(KF5JS ${KF5_REQUIRED_VERSION} REQUIRED)
+ endif()
+ 
+ if(NOT WIN32 AND NOT ANDROID)
+diff --git a/config-okular.h.cmake b/config-okular.h.cmake
+index 905aac9cb..00e45f77c 100644
+--- a/config-okular.h.cmake
 b/config-okular.h.cmake
+@@ -1,6 +1,12 @@
+ /* Defines if force the use DRM in okular */
+ #define OKULAR_FORCE_DRM ${_OKULAR_FORCE_DRM}
+ 
++/* Defines if the KJS framework is available */
++#cmakedefine WITH_KJS
++
++/* Defines if the kwallet framework is available */
++#cmakedefine WITH_KWALLET
++
+ /* Defines if the purpose framework is available */
+ #define PURPOSE_FOUND ${PURPOSE_FOUND}
+ 
+diff --git a/core/generator.cpp b/core/generator.cpp
+index 051c2c922..0b60516b8 100644
+--- a/core/generator.cpp
 b/core/generator.cpp
+@@ -9,6 +9,7 @@
+ */
+ 
+ #include "generator.h"
++#include "config-okular.h"
+ #include "generator_p.h"
+ #include "observer.h"
+ 
+diff --git a/core/scripter.cpp b/core/scripter.cpp
+index c60645895..2e6eacc72 100644
+--- a/core/scripter.cpp
 b/core/scripter.cpp
+@@ -5,6 +5,7 @@
+ */
+ 
+ #include "scripter.h"
++#include "config-okular.h"
+ 
+ #include 
+ #include 
+-- 
+2.34.1
+

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 3d1fd5166c..445e7a806f 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -70,7 +70,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
-   "${FILESDIR}/${PN}-21.08.1-optional-options.patch" # bug 810958
+   "${FILESDIR}/${PN}-22.03.70-optional-options.patch" # bug 810958
 )
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/

2021-11-30 Thread Andreas Sturmlechner 
commit: b80df155f4cb5db9c0c2b5c670c6de61a038aad2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 30 12:00:49 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 30 12:00:49 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b80df155

kde-apps/okular: Drop obsolete patch

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-20.11.90-tests.patch | 148 --
 1 file changed, 148 deletions(-)

diff --git a/kde-apps/okular/files/okular-20.11.90-tests.patch 
b/kde-apps/okular/files/okular-20.11.90-tests.patch
deleted file mode 100644
index 633513bd2a..00
--- a/kde-apps/okular/files/okular-20.11.90-tests.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From d9cdea559ffa730fd3592b78f5f8530da3d4c803 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Thu, 12 Oct 2017 14:09:09 +0200
-Subject: [PATCH] Move tests into existing (auto)tests subdirectories
-

- generators/chm/CMakeLists.txt | 12 +++-
- generators/chm/autotests/CMakeLists.txt   |  8 
- generators/chm/autotests/chmgeneratortest.cpp |  2 +-
- generators/comicbook/CMakeLists.txt   | 10 +++---
- generators/comicbook/autotests/CMakeLists.txt |  6 ++
- generators/kimgio/CMakeLists.txt  |  6 +-
- generators/kimgio/tests/CMakeLists.txt|  5 +
- generators/kimgio/tests/kimgiotest.cpp|  2 +-
- 8 files changed, 28 insertions(+), 23 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/comicbook/autotests/CMakeLists.txt
- create mode 100644 generators/kimgio/tests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 9d82b9394..b3a33afe4 100644
 a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
- okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
- target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF5::KHtml)
- 
--### autotests ###
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/chmgeneratortest.cpp
--TEST_NAME "chmgeneratortest"
--LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
--)
--
--target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
-+if(BUILD_TESTING)
-+   add_subdirectory(autotests)
-+endif()
- 
- ### install files ###
- install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
-new file mode 100644
-index 0..59753ca45
 /dev/null
-+++ b/generators/chm/autotests/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(chmgeneratortest.cpp
-+TEST_NAME "chmgeneratortest"
-+LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
-+)
-+
-+target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
-diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
-index 18305913e..b28822d68 100644
 a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -32,7 +32,7 @@ void ChmGeneratorTest::initTestCase()
- {
- Okular::SettingsCore::instance(QStringLiteral("ChmGeneratorTest"));
- m_document = new Okular::Document(nullptr);
--const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
-+const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
- QMimeDatabase db;
- const QMimeType mime = db.mimeTypeForFile(testFile);
- QCOMPARE(m_document->openDocument(testFile, QUrl(), mime), 
Okular::Document::OpenSuccess);
-diff --git a/generators/comicbook/CMakeLists.txt 
b/generators/comicbook/CMakeLists.txt
-index 9a07c7183..316c93152 100644
 a/generators/comicbook/CMakeLists.txt
-+++ b/generators/comicbook/CMakeLists.txt
-@@ -29,13 +29,9 @@ if (KArchive_HAVE_LZMA)
- target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1)
- endif()
- 
--### autotests ###
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/comicbooktest.cpp
--TEST_NAME "comicbooktest"
--LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
--)
-+if(BUILD_TESTING)
-+add_subdirectory(autotests)
-+endif()
- 
- ### install files ###
- install( FILES okularComicbook.desktop  DESTINATION  
${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/comicbook/autotests/CMakeLists.txt 
b/generators/comicbook/autotests/CMakeLists.txt
-new file mode 100644
-index 0..aaacb341a
 /dev/null
-+++

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/

2021-11-30 Thread Andreas Sturmlechner 
commit: 9c8d408fdba995a29d3e9dc83b748acbffce7ba2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 30 12:00:35 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 30 12:00:35 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c8d408f

kde-apps/okular: Drop obsolete part from 21.11.80-tests.patch

Closes: https://bugs.gentoo.org/827875
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-21.11.80-tests.patch | 46 +--
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch 
b/kde-apps/okular/files/okular-21.11.80-tests.patch
index 683a07bc1a..a0babcad1c 100644
--- a/kde-apps/okular/files/okular-21.11.80-tests.patch
+++ b/kde-apps/okular/files/okular-21.11.80-tests.patch
@@ -9,13 +9,9 @@ Subject: [PATCH] Move tests into existing (auto)tests 
subdirectories
  generators/chm/autotests/chmgeneratortest.cpp |  2 +-
  generators/comicbook/CMakeLists.txt   | 10 +++---
  generators/comicbook/autotests/CMakeLists.txt |  6 ++
- generators/kimgio/CMakeLists.txt  |  5 +
- generators/kimgio/tests/CMakeLists.txt|  5 +
- generators/kimgio/tests/kimgiotest.cpp|  2 +-
- 8 files changed, 28 insertions(+), 22 deletions(-)
+ 8 files changed, 27 insertions(+), 18 deletions(-)
  create mode 100644 generators/chm/autotests/CMakeLists.txt
  create mode 100644 generators/comicbook/autotests/CMakeLists.txt
- create mode 100644 generators/kimgio/tests/CMakeLists.txt
 
 diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
 index 0d7452cba..3adb3fd54 100644
@@ -100,46 +96,6 @@ index 0..aaacb341a
 +TEST_NAME "comicbooktest"
 +LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
 +)
-diff --git a/generators/kimgio/CMakeLists.txt 
b/generators/kimgio/CMakeLists.txt
-index 6919bad1a..765f36c0b 100644
 a/generators/kimgio/CMakeLists.txt
-+++ b/generators/kimgio/CMakeLists.txt
-@@ -7,10 +7,7 @@ okular_add_generator(okularGenerator_kimgio 
generator_kimgio.cpp)
- target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
- 
- if(BUILD_TESTING AND BUILD_DESKTOP)
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--set( kimgiotest_SRCS tests/kimgiotest.cpp 
${CMAKE_SOURCE_DIR}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp 
${CMAKE_SOURCE_DIR}/part/debug_ui.cpp )
--ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES 
okularcore okularpart Qt5::Svg Qt5::Test)
--target_compile_definitions(kimgiotest PRIVATE 
-DGENERATOR_PATH="$")
-+   add_subdirectory(tests)
- endif()
- 
- 
-diff --git a/generators/kimgio/tests/CMakeLists.txt 
b/generators/kimgio/tests/CMakeLists.txt
-new file mode 100644
-index 0..844c9096a
 /dev/null
-+++ b/generators/kimgio/tests/CMakeLists.txt
-@@ -0,0 +1,5 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp 
${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp )
-+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES 
okularcore okularpart Qt5::Svg Qt5::Test)
-+target_compile_definitions(kimgiotest PRIVATE 
-DGENERATOR_PATH="$")
-diff --git a/generators/kimgio/tests/kimgiotest.cpp 
b/generators/kimgio/tests/kimgiotest.cpp
-index d521a5a7b..259bb4894 100644
 a/generators/kimgio/tests/kimgiotest.cpp
-+++ b/generators/kimgio/tests/kimgiotest.cpp
-@@ -4,7 +4,7 @@
- SPDX-License-Identifier: GPL-2.0-or-later
- */
- 
--#include "../../settings_core.h"
-+#include "../../../settings_core.h"
- #include "../generator_kimgio.h"
- 
- #include 
 -- 
 2.33.0

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2021-11-24 Thread Andreas Sturmlechner 
commit: 7ffe879af1206d5e6c908622b71b6116f8ee01d1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 24 18:41:47 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 24 19:40:11 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ffe879a

kde-apps/okular: Rename IUSE kwallet -> crypt and fix description

- kwallet was enabled by plasma profile
- crypt is enabled by linux profile, so much wider coverage by default

Closes: https://bugs.gentoo.org/816093
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/metadata.xml| 2 +-
 kde-apps/okular/okular-21.11.80.ebuild  | 6 +++---
 kde-apps/okular/okular-21.12.49..ebuild | 6 +++---
 kde-apps/okular/okular-.ebuild  | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 268f35796c..b894d40b68 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -9,9 +9,9 @@
https://bugs.kde.org/


+   Enable support for password-encrypted 
documents via kde-frameworks/kwallet
Enable E-Book support via 
app-text/ebook-tools
Enable image viewing support
-   Enable encrypted storage of passwords with 
kde-frameworks/kwallet
Enable Markdown support via 
app-text/discount
Enable mobipocket support
Enable Plucker E-Book for Palm OS devices 
support

diff --git a/kde-apps/okular/okular-21.11.80.ebuild 
b/kde-apps/okular/okular-21.11.80.ebuild
index 3646c87679..f09e589468 100644
--- a/kde-apps/okular/okular-21.11.80.ebuild
+++ b/kde-apps/okular/okular-21.11.80.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="djvu epub +image-backend kwallet markdown mobi +pdf +plucker +postscript 
qml share speech +tiff"
+IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript 
qml share speech +tiff"
 
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -43,13 +43,13 @@ DEPEND="
media-libs/freetype
>=media-libs/phonon-4.11.0
sys-libs/zlib
+   crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
djvu? ( app-text/djvu )
epub? ( app-text/ebook-tools )
image-backend? (
>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
>=kde-apps/libkexiv2-${PVCUT}:5
)
-   kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
markdown? ( app-text/discount )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
@@ -79,10 +79,10 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
-DOKULAR_UI=$(usex qml "both" "desktop")
+   -DWITH_KWALLET=$(usex crypt)
$(cmake_use_find_package djvu DjVuLibre)
$(cmake_use_find_package epub EPub)
$(cmake_use_find_package image-backend KF5KExiv2)
-   -DWITH_KWALLET=$(usex kwallet)
$(cmake_use_find_package markdown Discount)
$(cmake_use_find_package mobi QMobipocket)
$(cmake_use_find_package pdf Poppler)

diff --git a/kde-apps/okular/okular-21.12.49..ebuild 
b/kde-apps/okular/okular-21.12.49..ebuild
index 11e7653d7e..3d1fd5166c 100644
--- a/kde-apps/okular/okular-21.12.49..ebuild
+++ b/kde-apps/okular/okular-21.12.49..ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="djvu epub +image-backend kwallet markdown mobi +pdf +plucker +postscript 
qml share speech +tiff"
+IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript 
qml share speech +tiff"
 
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -43,13 +43,13 @@ DEPEND="
media-libs/freetype
>=media-libs/phonon-4.11.0
sys-libs/zlib
+   crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
djvu? ( app-text/djvu )
epub? ( app-text/ebook-tools )
image-backend? (
>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
>=kde-apps/libkexiv2-${PVCUT}:5
)
-   kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
markdown? ( app-text/discount )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
@@ -79,10 +79,10 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
-DOKULAR_UI=$(usex qml "both" "desktop")
+   -DWITH_KWALLET=$(usex crypt)
$(cmake_use_find_package

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2021-11-13 Thread Andreas Sturmlechner 
commit: 3f9362355aa1ea5df3b9cfff39fd3806c4eb0441
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 11 20:31:22 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 11 20:31:22 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f936235

kde-apps/okular: Raise minimum app-text/poppler version

Make sure okular is built with the new feature enabled.

Upstream commit 8b3dfcb3f4ea97512b5940be69bfad9cc7fe6ac5

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 3edb207dc3..908143e1e6 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -52,7 +52,7 @@ DEPEND="
kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
markdown? ( app-text/discount )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-   pdf? ( app-text/poppler[nss,qt5] )
+   pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2021-11-04 Thread Andreas Sturmlechner 
commit: 0fae95db0cb8ca6045da7d0b8516ebd256cbe5c2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov  4 13:22:22 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov  4 13:22:22 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0fae95db

kde-apps/okular: Drop unused local IUSE chm description

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 79a14c030c..268f35796c 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -9,7 +9,6 @@
https://bugs.kde.org/


-   Enable support for Microsoft Compiled HTML 
Help files
Enable E-Book support via 
app-text/ebook-tools
Enable image viewing support
Enable encrypted storage of passwords with 
kde-frameworks/kwallet

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2021-08-22 Thread Andreas Sturmlechner 
commit: 6bf3ae87c13a3c61097fa1c4c4be36e8fa764d7a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 22 23:02:21 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 22 23:02:21 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6bf3ae87

kde-apps/okular: Rebase okular-20.11.90-tests.patch on top of HEAD

Reported-by: jospezial  gmx.de>
Closes: https://bugs.gentoo.org/809674
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-21.11.80-tests.patch | 145 ++
 kde-apps/okular/okular-.ebuild|   2 +-
 2 files changed, 146 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch 
b/kde-apps/okular/files/okular-21.11.80-tests.patch
new file mode 100644
index 00..683a07bc1a
--- /dev/null
+++ b/kde-apps/okular/files/okular-21.11.80-tests.patch
@@ -0,0 +1,145 @@
+From 323fed918995fe2e01036c74c1498446b4d2f122 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 12 Oct 2017 14:09:09 +0200
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+---
+ generators/chm/CMakeLists.txt | 12 +++-
+ generators/chm/autotests/CMakeLists.txt   |  8 
+ generators/chm/autotests/chmgeneratortest.cpp |  2 +-
+ generators/comicbook/CMakeLists.txt   | 10 +++---
+ generators/comicbook/autotests/CMakeLists.txt |  6 ++
+ generators/kimgio/CMakeLists.txt  |  5 +
+ generators/kimgio/tests/CMakeLists.txt|  5 +
+ generators/kimgio/tests/kimgiotest.cpp|  2 +-
+ 8 files changed, 28 insertions(+), 22 deletions(-)
+ create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/comicbook/autotests/CMakeLists.txt
+ create mode 100644 generators/kimgio/tests/CMakeLists.txt
+
+diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
+index 0d7452cba..3adb3fd54 100644
+--- a/generators/chm/CMakeLists.txt
 b/generators/chm/CMakeLists.txt
+@@ -23,15 +23,9 @@ okular_add_generator(okularGenerator_chmlib 
${okularGenerator_chmlib_SRCS})
+ target_include_directories(okularGenerator_chmlib PRIVATE ${CHM_INCLUDE_DIR} 
${LIBZIP_INCLUDE_DIR})
+ target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF5::KHtml)
+ 
+-### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/chmgeneratortest.cpp
+-TEST_NAME "chmgeneratortest"
+-LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+-)
+-
+-target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
++if(BUILD_TESTING)
++   add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
+new file mode 100644
+index 0..59753ca45
+--- /dev/null
 b/generators/chm/autotests/CMakeLists.txt
+@@ -0,0 +1,8 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(chmgeneratortest.cpp
++TEST_NAME "chmgeneratortest"
++LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
++)
++
++target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
+diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
+index c428fa1b3..68f7a5821 100644
+--- a/generators/chm/autotests/chmgeneratortest.cpp
 b/generators/chm/autotests/chmgeneratortest.cpp
+@@ -30,7 +30,7 @@ void ChmGeneratorTest::initTestCase()
+ {
+ Okular::SettingsCore::instance(QStringLiteral("ChmGeneratorTest"));
+ m_document = new Okular::Document(nullptr);
+-const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
++const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
+ QMimeDatabase db;
+ const QMimeType mime = db.mimeTypeForFile(testFile);
+ QCOMPARE(m_document->openDocument(testFile, QUrl(), mime), 
Okular::Document::OpenSuccess);
+diff --git a/generators/comicbook/CMakeLists.txt 
b/generators/comicbook/CMakeLists.txt
+index a0e7569a2..91bcc6ec7 100644
+--- a/generators/comicbook/CMakeLists.txt
 b/generators/comicbook/CMakeLists.txt
+@@ -25,13 +25,9 @@ if (KArchive_HAVE_LZMA)
+ target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1)
+ endif()
+ 
+-### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/comicbooktest.cpp
+-TEST_NAME "comicbooktest"
+-LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
+-)
++if(BUILD_TESTING)
++add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( FILES okularComicbook.desktop  DESTINATION

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2021-08-03 Thread Andreas Sturmlechner 
commit: 028d514c48acb7f98af6daa44a4fcd93062e4925
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  3 14:59:53 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  3 14:59:53 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=028d514c

kde-apps/okular: Drop IUSE=chm from live

Now that we have app-text/kchmviewer back in Gentoo ebuild repo,
drop it here and direct users to the separate package where the okular
code originally came from anyway.

Bug: https://bugs.gentoo.org/806296
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-.ebuild | 13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 8cf916b602..387e337470 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml 
share speech +tiff"
+IUSE="djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml 
share speech +tiff"
 
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -44,11 +44,6 @@ DEPEND="
media-libs/freetype
>=media-libs/phonon-4.11.0
sys-libs/zlib
-   chm? (
-   dev-libs/chmlib
-   dev-libs/libzip:=
-   >=kde-frameworks/khtml-${KFMIN}:5
-   )
djvu? ( app-text/djvu )
epub? ( app-text/ebook-tools )
image-backend? (
@@ -79,10 +74,10 @@ PATCHES=(
 
 src_configure() {
local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON
+   -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
-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)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2020-12-25 Thread Andreas Sturmlechner 
commit: ee407e145f4a302d83950d813c3da8a5b6acbce8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Dec 25 17:40:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 25 17:40:09 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee407e14

kde-apps/okular: DEPEND on app-text/poppler[nss]

Upstream commit f7d6045b9274737fb4f1e87be165f4fc5a4e908d

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 4c1971f848..baae1a4857 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -55,7 +55,7 @@ DEPEND="
)
markdown? ( app-text/discount )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-   pdf? ( app-text/poppler[qt5] )
+   pdf? ( app-text/poppler[nss,qt5] )
plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2020-11-25 Thread Andreas Sturmlechner 
commit: 231bcb57a7460cb6e707e175441b060512467479
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 25 12:55:25 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 25 13:23:29 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=231bcb57

kde-apps/okular: Disable failing annotationtoolbartest

Reported-by: Frank Krömmelbein  gmx.de>
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/okular/okular-20.12.49..ebuild 
b/kde-apps/okular/okular-20.12.49..ebuild
index 24a575bc8c..5e00176a80 100644
--- a/kde-apps/okular/okular-20.12.49..ebuild
+++ b/kde-apps/okular/okular-20.12.49..ebuild
@@ -98,9 +98,9 @@ src_configure() {
 
 src_test() {
# mainshelltest hangs, chmgeneratortest fails, bug #603116
-   # parttest hangs, bug #641728
+   # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug 
#429640
local myctestargs=(
-   -E "(mainshelltest|chmgeneratortest|parttest)"
+   -E 
"(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
)
 
ecm_src_test

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 24a575bc8c..5e00176a80 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -98,9 +98,9 @@ src_configure() {
 
 src_test() {
# mainshelltest hangs, chmgeneratortest fails, bug #603116
-   # parttest hangs, bug #641728
+   # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug 
#429640
local myctestargs=(
-   -E "(mainshelltest|chmgeneratortest|parttest)"
+   -E 
"(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
)
 
ecm_src_test

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2020-10-31 Thread Andreas Sturmlechner 
commit: 4a446dabd938b39c014ce68aa02fdc508f6c934e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct 30 14:57:25 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Oct 30 14:57:25 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4a446dab

kde-apps/okular: Set IUSE="+plucker" default

Dependency wise no sense in having it off by default.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/okular/okular-20.08.49..ebuild 
b/kde-apps/okular/okular-20.08.49..ebuild
index 89e2bee3c4..f5f693e7dc 100644
--- a/kde-apps/okular/okular-20.08.49..ebuild
+++ b/kde-apps/okular/okular-20.08.49..ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org 
https://apps.kde.org/en/okular;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm djvu epub +image-backend markdown mobi +pdf plucker +postscript qml 
share speech +tiff"
+IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml 
share speech +tiff"
 
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 7384692c14..24a575bc8c 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org 
https://apps.kde.org/en/okular;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm djvu epub +image-backend markdown mobi +pdf plucker +postscript qml 
share speech +tiff"
+IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml 
share speech +tiff"
 
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2020-10-24 Thread Andreas Sturmlechner 
commit: dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 24 19:29:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 24 19:29:39 2020 +
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  gentoo.org>

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

diff --git a/kde-apps/okular/okular-20.08.49..ebuild 
b/kde-apps/okular/okular-20.08.49..ebuild
index 813a62c06f..781454848b 100644
--- a/kde-apps/okular/okular-20.08.49..ebuild
+++ b/kde-apps/okular/okular-20.08.49..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-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 23579f5d89..5cd236d78a 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.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)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/

2020-09-17 Thread Andreas Sturmlechner 
commit: 9f0ca6c8ab9c49f68567c728ef6fab403d3222c6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 17 18:22:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 17 18:44:02 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f0ca6c8

kde-apps/okular: Fix IUSE=mobile->qml, fix RDEPENDs, drop src_prepare

Upstream commits:
8dfdfa69fcf1c90092b582ab8db1743458d27b34
c1b396af3e9a528288fe3d74bbaa487c4736d05b
1fb77446a7378368de5288ca9f57627ae2946d84
a96c082d6969c47b5738eb9b02d064a09232f0f9
fd44517bae86dba4c3cc6d2a8ef278998ee40e5a

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/okular-20.08.2-hide-mobile-app.patch | 27 ++
 kde-apps/okular/metadata.xml   |  2 +-
 kde-apps/okular/okular-20.08.49..ebuild| 18 +++
 kde-apps/okular/okular-.ebuild | 19 +++
 4 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch 
b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch
new file mode 100644
index 00..175e5c178c
--- /dev/null
+++ b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch
@@ -0,0 +1,27 @@
+From 6f7f17a24a564ffbf712fd5e0917fcabc8d19229 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 17 Sep 2020 20:36:37 +0200
+Subject: [PATCH] Revert "Don't hide the mobile app"
+
+We have no use for this on the desktop, but need it for peruse.
+
+This reverts commit 0991819a497594233b7564755bbc189009188bd0.
+---
+ mobile/app/package/metadata.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mobile/app/package/metadata.desktop 
b/mobile/app/package/metadata.desktop
+index f9432748b..0fcf20843 100644
+--- a/mobile/app/package/metadata.desktop
 b/mobile/app/package/metadata.desktop
+@@ -110,6 +110,7 @@ GenericName[zh_TW]=文件檢視器
+ Type=Application
+ Exec=okularkirigami
+ Icon=okular
++NoDisplay=true
+ X-KDE-ParentApp=
+ X-KDE-PluginInfo-Author=Marco Martin
+ X-KDE-PluginInfo-Email=m...@kde.org
+-- 
+2.28.0
+

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index b36cde3d0a..f07864be71 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -11,8 +11,8 @@
Enable image viewing support
Enable Markdown support via 
app-text/discount
Enable mobipocket support
-   Enable Plasma mobile support
Enable Plucker E-Book for Palm OS devices 
support
+   Install Okular Qml components
Enable support for a share menu using 
kde-frameworks/purpose
Enable text-to-speech support


diff --git a/kde-apps/okular/okular-20.08.49..ebuild 
b/kde-apps/okular/okular-20.08.49..ebuild
index 2ad5264100..32174dc6b1 100644
--- a/kde-apps/okular/okular-20.08.49..ebuild
+++ b/kde-apps/okular/okular-20.08.49..ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org 
https://kde.org/applications/office/org.kde.oku
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker 
+postscript share speech +tiff"
+IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf plucker 
+postscript qml share speech +tiff"
 
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -64,22 +64,20 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-   mobile? (
-   >=dev-qt/qtquickcontrols-${QTMIN}:5
+   qml? (
+   >=dev-qt/qtquickcontrols2-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-20.07.90-tests.patch" ) # bug 734138
-
-src_prepare() {
-   ecm_src_prepare
-   use mobile || cmake_comment_add_subdirectory mobile
-   use test || cmake_comment_add_subdirectory conf/autotests
-}
+PATCHES=(
+   "${FILESDIR}/${PN}-20.07.90-tests.patch" # bug 734138
+   "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
+)
 
 src_configure() {
local mycmakeargs=(
+   -DOKULAR_UI=$(usex qml "both" "desktop")
$(cmake_use_find_package chm CHM)
$(cmake_use_find_package crypt Qca-qt5)
$(cmake_use_find_package djvu DjVuLibre)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 31ff3ae80a..8fd7c53e3c 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org 
https://kde.org/applications/office/org.kde.oku
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker 
+postscript share speech +tiff"
+IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf plucker

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/

2020-08-01 Thread Andreas Sturmlechner 
commit: ff582f9be402830adf5fbcadd994e03d523b1c44
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug  1 17:05:35 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug  1 17:06:23 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ff582f9b

kde-apps/okular: Re-add modified tests-optional.patch

Closes: https://bugs.gentoo.org/734138
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-20.07.90-tests.patch | 148 ++
 kde-apps/okular/okular-20.07.90.ebuild|   2 +
 kde-apps/okular/okular-20.08.49..ebuild   |   2 +
 kde-apps/okular/okular-.ebuild|   2 +
 4 files changed, 154 insertions(+)

diff --git a/kde-apps/okular/files/okular-20.07.90-tests.patch 
b/kde-apps/okular/files/okular-20.07.90-tests.patch
new file mode 100644
index 00..6bd229fc38
--- /dev/null
+++ b/kde-apps/okular/files/okular-20.07.90-tests.patch
@@ -0,0 +1,148 @@
+From c675ba8bed1e792f351fabf3ba040a86138f9f84 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 12 Oct 2017 14:09:09 +0200
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+---
+ generators/chm/CMakeLists.txt | 12 +++-
+ generators/chm/autotests/CMakeLists.txt   |  8 
+ generators/chm/autotests/chmgeneratortest.cpp |  2 +-
+ generators/comicbook/CMakeLists.txt   | 10 +++---
+ generators/comicbook/autotests/CMakeLists.txt |  6 ++
+ generators/kimgio/CMakeLists.txt  |  6 +-
+ generators/kimgio/tests/CMakeLists.txt|  5 +
+ generators/kimgio/tests/kimgiotest.cpp|  2 +-
+ 8 files changed, 28 insertions(+), 23 deletions(-)
+ create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/comicbook/autotests/CMakeLists.txt
+ create mode 100644 generators/kimgio/tests/CMakeLists.txt
+
+diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
+index 9d82b9394..b3a33afe4 100644
+--- a/generators/chm/CMakeLists.txt
 b/generators/chm/CMakeLists.txt
+@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
+ okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
+ target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF5::KHtml)
+ 
+-### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/chmgeneratortest.cpp
+-TEST_NAME "chmgeneratortest"
+-LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+-)
+-
+-target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
++if(BUILD_TESTING)
++   add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
+new file mode 100644
+index 0..59753ca45
+--- /dev/null
 b/generators/chm/autotests/CMakeLists.txt
+@@ -0,0 +1,8 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(chmgeneratortest.cpp
++TEST_NAME "chmgeneratortest"
++LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
++)
++
++target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
+diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
+index 9245a736f..5a2c487b4 100644
+--- a/generators/chm/autotests/chmgeneratortest.cpp
 b/generators/chm/autotests/chmgeneratortest.cpp
+@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
+ {
+ Okular::SettingsCore::instance(QStringLiteral("ChmGeneratorTest"));
+ m_document = new Okular::Document(nullptr);
+-const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
++const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
+ QMimeDatabase db;
+ const QMimeType mime = db.mimeTypeForFile(testFile);
+ QCOMPARE(m_document->openDocument(testFile, QUrl(), mime), 
Okular::Document::OpenSuccess);
+diff --git a/generators/comicbook/CMakeLists.txt 
b/generators/comicbook/CMakeLists.txt
+index 9a07c7183..316c93152 100644
+--- a/generators/comicbook/CMakeLists.txt
 b/generators/comicbook/CMakeLists.txt
+@@ -29,13 +29,9 @@ if (KArchive_HAVE_LZMA)
+ target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1)
+ endif()
+ 
+-### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/comicbooktest.cpp
+-TEST_NAME "comicbooktest"
+-LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
+-)
++if(BUILD_TESTING)
++add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( FILES okularComicbook.desktop  DESTINATION

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/

2020-07-12 Thread Andreas Sturmlechner 
commit: 5e62be6e74c9db769d52d56ed47122db65b202a3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 11 21:45:45 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 12 22:51:51 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e62be6e

kde-apps/okular: Drop broken tests-optional patch

Now we rely on patched ECMAddTests.cmake to skip them.

Closes: https://bugs.gentoo.org/732312
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-18.12.0-tests.patch  |  17 ---
 kde-apps/okular/files/okular-20.03.70-tests.patch | 148 --
 kde-apps/okular/okular-20.08.49..ebuild   |   5 -
 kde-apps/okular/okular-.ebuild|   5 -
 4 files changed, 175 deletions(-)

diff --git a/kde-apps/okular/files/okular-18.12.0-tests.patch 
b/kde-apps/okular/files/okular-18.12.0-tests.patch
deleted file mode 100644
index 2b61715050..00
--- a/kde-apps/okular/files/okular-18.12.0-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 a/generators/epub/CMakeLists.txt   2018-08-19 21:34:51.151645090 +0200
-+++ b/generators/epub/CMakeLists.txt   2018-08-19 21:36:28.771109586 +0200
-@@ -23,12 +23,13 @@
- 
- ### autotests ###
- 
-+if(BUILD_TESTING)
- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
- ecm_add_test(autotests/epubgeneratortest.cpp
- TEST_NAME "epubgeneratortest"
- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
- )
--
-+endif()
- 
- ### install files ###
- install( FILES okularEPub.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )

diff --git a/kde-apps/okular/files/okular-20.03.70-tests.patch 
b/kde-apps/okular/files/okular-20.03.70-tests.patch
deleted file mode 100644
index d906e2a00f..00
--- a/kde-apps/okular/files/okular-20.03.70-tests.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From c675ba8bed1e792f351fabf3ba040a86138f9f84 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Thu, 12 Oct 2017 14:09:09 +0200
-Subject: [PATCH] Move tests into existing (auto)tests subdirectories
-

- generators/chm/CMakeLists.txt | 12 +++-
- generators/chm/autotests/CMakeLists.txt   |  8 
- generators/chm/autotests/chmgeneratortest.cpp |  2 +-
- generators/comicbook/CMakeLists.txt   | 10 +++---
- generators/comicbook/autotests/CMakeLists.txt |  6 ++
- generators/kimgio/CMakeLists.txt  |  6 +-
- generators/kimgio/tests/CMakeLists.txt|  5 +
- generators/kimgio/tests/kimgiotest.cpp|  2 +-
- 8 files changed, 28 insertions(+), 23 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/comicbook/autotests/CMakeLists.txt
- create mode 100644 generators/kimgio/tests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 9d82b9394..b3a33afe4 100644
 a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
- okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
- target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF5::KHtml)
- 
--### autotests ###
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/chmgeneratortest.cpp
--TEST_NAME "chmgeneratortest"
--LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
--)
--
--target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
-+if(BUILD_TESTING)
-+   add_subdirectory(autotests)
-+endif()
- 
- ### install files ###
- install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
-new file mode 100644
-index 0..59753ca45
 /dev/null
-+++ b/generators/chm/autotests/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(chmgeneratortest.cpp
-+TEST_NAME "chmgeneratortest"
-+LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
-+)
-+
-+target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
-diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
-index 9245a736f..5a2c487b4 100644
 a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
- {
- Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );
- m_document = new Okular::Document( nullptr );
--const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
-+const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
- QMimeDatabase db;
- const QMimeType mime =

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/

2020-03-12 Thread Andreas Sturmlechner 
commit: afc59a3c8ee5e8638a848dc70ba56d7e03e5fa00
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 12 22:56:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 12 23:33:19 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=afc59a3c

kde-apps/okular: Rebase ${PN}-20.03.70-tests.patch on top of HEAD

Necessary after upstream commit 4019ec56e

Thanks-to: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/712218
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-20.03.70-tests.patch | 46 ---
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/kde-apps/okular/files/okular-20.03.70-tests.patch 
b/kde-apps/okular/files/okular-20.03.70-tests.patch
index db7ec3993d..d906e2a00f 100644
--- a/kde-apps/okular/files/okular-20.03.70-tests.patch
+++ b/kde-apps/okular/files/okular-20.03.70-tests.patch
@@ -1,4 +1,4 @@
-From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001
+From c675ba8bed1e792f351fabf3ba040a86138f9f84 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner 
 Date: Thu, 12 Oct 2017 14:09:09 +0200
 Subject: [PATCH] Move tests into existing (auto)tests subdirectories
@@ -7,11 +7,14 @@ Subject: [PATCH] Move tests into existing (auto)tests 
subdirectories
  generators/chm/CMakeLists.txt | 12 +++-
  generators/chm/autotests/CMakeLists.txt   |  8 
  generators/chm/autotests/chmgeneratortest.cpp |  2 +-
+ generators/comicbook/CMakeLists.txt   | 10 +++---
+ generators/comicbook/autotests/CMakeLists.txt |  6 ++
  generators/kimgio/CMakeLists.txt  |  6 +-
  generators/kimgio/tests/CMakeLists.txt|  5 +
  generators/kimgio/tests/kimgiotest.cpp|  2 +-
- 6 files changed, 19 insertions(+), 16 deletions(-)
+ 8 files changed, 28 insertions(+), 23 deletions(-)
  create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/comicbook/autotests/CMakeLists.txt
  create mode 100644 generators/kimgio/tests/CMakeLists.txt
 
 diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
@@ -52,7 +55,7 @@ index 0..59753ca45
 +
 +target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
 diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
-index 6b0b8efc7..25fd6631a 100644
+index 9245a736f..5a2c487b4 100644
 --- a/generators/chm/autotests/chmgeneratortest.cpp
 +++ b/generators/chm/autotests/chmgeneratortest.cpp
 @@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
@@ -64,6 +67,39 @@ index 6b0b8efc7..25fd6631a 100644
  QMimeDatabase db;
  const QMimeType mime = db.mimeTypeForFile( testFile );
  QCOMPARE( m_document->openDocument(testFile, QUrl(), mime), 
Okular::Document::OpenSuccess );
+diff --git a/generators/comicbook/CMakeLists.txt 
b/generators/comicbook/CMakeLists.txt
+index 9a07c7183..316c93152 100644
+--- a/generators/comicbook/CMakeLists.txt
 b/generators/comicbook/CMakeLists.txt
+@@ -29,13 +29,9 @@ if (KArchive_HAVE_LZMA)
+ target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1)
+ endif()
+ 
+-### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/comicbooktest.cpp
+-TEST_NAME "comicbooktest"
+-LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
+-)
++if(BUILD_TESTING)
++add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( FILES okularComicbook.desktop  DESTINATION  
${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/comicbook/autotests/CMakeLists.txt 
b/generators/comicbook/autotests/CMakeLists.txt
+new file mode 100644
+index 0..aaacb341a
+--- /dev/null
 b/generators/comicbook/autotests/CMakeLists.txt
+@@ -0,0 +1,6 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(comicbooktest.cpp
++TEST_NAME "comicbooktest"
++LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
++)
 diff --git a/generators/kimgio/CMakeLists.txt 
b/generators/kimgio/CMakeLists.txt
 index b8cac76df..49f893bc1 100644
 --- a/generators/kimgio/CMakeLists.txt
@@ -95,7 +131,7 @@ index 0..f31bf3fe8
 +ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES 
okularcore okularpart Qt5::Svg Qt5::Test)
 +target_compile_definitions(kimgiotest PRIVATE 
-DGENERATOR_PATH="$")
 diff --git a/generators/kimgio/tests/kimgiotest.cpp 
b/generators/kimgio/tests/kimgiotest.cpp
-index b3039a6bb..78608df9d 100644
+index f2e50641d..a24f7af80 100644
 --- a/generators/kimgio/tests/kimgiotest.cpp
 +++ b/generators/kimgio/tests/kimgiotest.cpp
 @@ -9,7 +9,7 @@
@@ -108,5 +144,5 @@ index b3039a6bb..78608df9d 100644
  #include 
  #include 
 -- 
-2.14.2
+2.25.1

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/

2020-03-03 Thread Andreas Sturmlechner 
commit: b4ba65469a85574f2528d4f8fc829a799d6ebf60
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar  3 11:58:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar  3 11:58:03 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b4ba6546

kde-apps/okular: Re-add accidentally removed patch

okular-18.08.0-tests.patch

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-18.08.0-tests.patch | 112 +++
 1 file changed, 112 insertions(+)

diff --git a/kde-apps/okular/files/okular-18.08.0-tests.patch 
b/kde-apps/okular/files/okular-18.08.0-tests.patch
new file mode 100644
index 00..0e2cdaecd4
--- /dev/null
+++ b/kde-apps/okular/files/okular-18.08.0-tests.patch
@@ -0,0 +1,112 @@
+From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 12 Oct 2017 14:09:09 +0200
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+---
+ generators/chm/CMakeLists.txt | 12 +++-
+ generators/chm/autotests/CMakeLists.txt   |  8 
+ generators/chm/autotests/chmgeneratortest.cpp |  2 +-
+ generators/kimgio/CMakeLists.txt  |  6 +-
+ generators/kimgio/tests/CMakeLists.txt|  5 +
+ generators/kimgio/tests/kimgiotest.cpp|  2 +-
+ 6 files changed, 19 insertions(+), 16 deletions(-)
+ create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/kimgio/tests/CMakeLists.txt
+
+diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
+index 9d82b9394..b3a33afe4 100644
+--- a/generators/chm/CMakeLists.txt
 b/generators/chm/CMakeLists.txt
+@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
+ okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
+ target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF5::KHtml)
+ 
+-### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/chmgeneratortest.cpp
+-TEST_NAME "chmgeneratortest"
+-LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+-)
+-
+-target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
++if(BUILD_TESTING)
++   add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
+new file mode 100644
+index 0..59753ca45
+--- /dev/null
 b/generators/chm/autotests/CMakeLists.txt
+@@ -0,0 +1,8 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(chmgeneratortest.cpp
++TEST_NAME "chmgeneratortest"
++LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
++)
++
++target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
+diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
+index 6b0b8efc7..25fd6631a 100644
+--- a/generators/chm/autotests/chmgeneratortest.cpp
 b/generators/chm/autotests/chmgeneratortest.cpp
+@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
+ {
+ Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );
+ m_document = new Okular::Document( 0 );
+-const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
++const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
+ QMimeDatabase db;
+ const QMimeType mime = db.mimeTypeForFile( testFile );
+ QCOMPARE( m_document->openDocument(testFile, QUrl(), mime), 
Okular::Document::OpenSuccess );
+diff --git a/generators/kimgio/CMakeLists.txt 
b/generators/kimgio/CMakeLists.txt
+index b8cac76df..49f893bc1 100644
+--- a/generators/kimgio/CMakeLists.txt
 b/generators/kimgio/CMakeLists.txt
+@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio 
generator_kimgio.cpp)
+ target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
+ 
+ if(BUILD_TESTING)
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-set( kimgiotest_SRCS tests/kimgiotest.cpp 
${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp 
${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
+-ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES 
okularcore okularpart Qt5::Svg Qt5::Test)
+-target_compile_definitions(kimgiotest PRIVATE 
-DGENERATOR_PATH="$")
++   add_subdirectory(tests)
+ endif()
+ 
+-
+ ### install files ###
+ install( FILES okularKimgio.desktop  DESTINATION  
${KDE_INSTALL_KSERVICES5DIR} )
+ install( PROGRAMS okularApplication_kimgio.desktop 
org.kde.mobile.okular_kimgio.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+diff --git

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2020-02-22 Thread Andreas Sturmlechner 
commit: 59304a3ee7c3a6fd2758865e40de2e8e1b505627
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 22 19:51:57 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 22 19:51:57 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=59304a3e

kde-apps/okular: Sort DEPENDs

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 101fb3c1aa..9f3257f04f 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -20,6 +20,11 @@ KEYWORDS=""
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker 
+postscript share speech +tiff"
 
 DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kactivities-${KFMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
@@ -34,24 +39,19 @@ DEPEND="
>=kde-frameworks/kpty-${KFMIN}:5
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/threadweaver-${KFMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
media-libs/freetype
media-libs/phonon[qt5(+)]
sys-libs/zlib
chm? (
-   >=kde-frameworks/khtml-${KFMIN}:5
dev-libs/chmlib
+   >=kde-frameworks/khtml-${KFMIN}:5
)
crypt? ( app-crypt/qca:2[qt5(+)] )
djvu? ( app-text/djvu )
epub? ( app-text/ebook-tools )
image-backend? (
-   >=kde-apps/libkexiv2-${PVCUT}:5
>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+   >=kde-apps/libkexiv2-${PVCUT}:5
)
markdown? ( app-text/discount )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
@@ -65,8 +65,8 @@ DEPEND="
 RDEPEND="${DEPEND}
image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
mobile? (
-   >=kde-frameworks/kirigami-${KFMIN}:5
>=dev-qt/qtquickcontrols-${QTMIN}:5
+   >=kde-frameworks/kirigami-${KFMIN}:5
)
 "

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2020-02-22 Thread Andreas Sturmlechner 
commit: fdc82bc0a9bbfdea673c0f05b3aa2f49971e0b32
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 22 19:42:28 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 22 19:42:28 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fdc82bc0

kde-apps/okular: Rebase okular-18.08.0-tests.patch on top of HEAD

Closes: https://bugs.gentoo.org/710504
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/{okular-18.08.0-tests.patch => okular-20.03.70-tests.patch}   | 2 +-
 kde-apps/okular/okular-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/files/okular-18.08.0-tests.patch 
b/kde-apps/okular/files/okular-20.03.70-tests.patch
similarity index 99%
rename from kde-apps/okular/files/okular-18.08.0-tests.patch
rename to kde-apps/okular/files/okular-20.03.70-tests.patch
index 0e2cdaecd4..db7ec3993d 100644
--- a/kde-apps/okular/files/okular-18.08.0-tests.patch
+++ b/kde-apps/okular/files/okular-20.03.70-tests.patch
@@ -58,7 +58,7 @@ index 6b0b8efc7..25fd6631a 100644
 @@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
  {
  Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );
- m_document = new Okular::Document( 0 );
+ m_document = new Okular::Document( nullptr );
 -const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
 +const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
  QMimeDatabase db;

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 46ea6f8a8e..101fb3c1aa 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -71,8 +71,8 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}-18.08.0-tests.patch"
"${FILESDIR}/${PN}-18.12.0-tests.patch"
+   "${FILESDIR}/${PN}-20.03.70-tests.patch"
 )
 
 src_prepare() {

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2019-01-16 Thread Andreas Sturmlechner 
commit: 8e0d8afdad0b1e3438b8ce8e3cf15595881ff7be
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 16 08:50:27 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 16 08:50:27 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8e0d8afd

kde-apps/okular: Fix CMake option

Closes: https://bugs.gentoo.org/675562
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/okular/okular-18.12.49..ebuild 
b/kde-apps/okular/okular-18.12.49..ebuild
index 43704a40a1..851e31b0a3 100644
--- a/kde-apps/okular/okular-18.12.49..ebuild
+++ b/kde-apps/okular/okular-18.12.49..ebuild
@@ -35,7 +35,7 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5(+)]
-   sys-libs/zlib:=
+   sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 43704a40a1..4974965c1b 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -35,7 +35,7 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5(+)]
-   sys-libs/zlib:=
+   sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib
@@ -87,7 +87,7 @@ src_configure() {
$(cmake-utils_use_find_package pdf Poppler)
$(cmake-utils_use_find_package plucker JPEG)
$(cmake-utils_use_find_package postscript LibSpectre)
-   $(cmake-utils_use_find_package share KDEExperimentalPurpose)
+   $(cmake-utils_use_find_package share KF5Purpose)
$(cmake-utils_use_find_package speech Qt5TextToSpeech)
$(cmake-utils_use_find_package tiff TIFF)
)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/

2018-12-13 Thread Andreas Sturmlechner 
commit: 9af2c8c0746a3db9ec1cbd0c124e15217c2521de
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 13 17:43:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 13 17:43:29 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9af2c8c0

kde-apps/okular: Sync with tree

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../okular/files/{okular-tests.patch => okular-18.12.0-tests.patch}   | 0
 kde-apps/okular/okular-18.12.49..ebuild   | 2 +-
 kde-apps/okular/okular-.ebuild| 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/files/okular-tests.patch 
b/kde-apps/okular/files/okular-18.12.0-tests.patch
similarity index 100%
rename from kde-apps/okular/files/okular-tests.patch
rename to kde-apps/okular/files/okular-18.12.0-tests.patch

diff --git a/kde-apps/okular/okular-18.12.49..ebuild 
b/kde-apps/okular/okular-18.12.49..ebuild
index ca08c260a9..8907af7df4 100644
--- a/kde-apps/okular/okular-18.12.49..ebuild
+++ b/kde-apps/okular/okular-18.12.49..ebuild
@@ -66,7 +66,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-18.08.0-tests.patch"
-   "${FILESDIR}/${PN}-tests.patch"
+   "${FILESDIR}/${PN}-18.12.0-tests.patch"
 )
 
 src_prepare() {

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 4eaf510647..8907af7df4 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,7 +66,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-18.08.0-tests.patch"
-   "${FILESDIR}/${PN}-tests.patch"
+   "${FILESDIR}/${PN}-18.12.0-tests.patch"
 )
 
 src_prepare() {

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/

2018-08-19 Thread Andreas Sturmlechner 
commit: 43a315f7f04b4111d6f8577c1606c0eefcb63f04
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 19 19:42:16 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 19 19:42:16 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=43a315f7

kde-apps/okular: Fix USE=-test for okular-

Closes: https://bugs.gentoo.org/664020
Package-Manager: Portage-2.3.47, Repoman-2.3.10

 ...ular-tests.patch => okular-18.08.0-tests.patch} |   0
 kde-apps/okular/files/okular-tests.patch   | 119 +++--
 kde-apps/okular/okular-18.08.0.ebuild  |   2 +-
 kde-apps/okular/okular-18.08.49..ebuild|   2 +-
 kde-apps/okular/okular-.ebuild |   5 +-
 5 files changed, 18 insertions(+), 110 deletions(-)

diff --git a/kde-apps/okular/files/okular-tests.patch 
b/kde-apps/okular/files/okular-18.08.0-tests.patch
similarity index 100%
copy from kde-apps/okular/files/okular-tests.patch
copy to kde-apps/okular/files/okular-18.08.0-tests.patch

diff --git a/kde-apps/okular/files/okular-tests.patch 
b/kde-apps/okular/files/okular-tests.patch
index 0e2cdaecd4..2b61715050 100644
--- a/kde-apps/okular/files/okular-tests.patch
+++ b/kde-apps/okular/files/okular-tests.patch
@@ -1,112 +1,17 @@
-From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Thu, 12 Oct 2017 14:09:09 +0200
-Subject: [PATCH] Move tests into existing (auto)tests subdirectories
-

- generators/chm/CMakeLists.txt | 12 +++-
- generators/chm/autotests/CMakeLists.txt   |  8 
- generators/chm/autotests/chmgeneratortest.cpp |  2 +-
- generators/kimgio/CMakeLists.txt  |  6 +-
- generators/kimgio/tests/CMakeLists.txt|  5 +
- generators/kimgio/tests/kimgiotest.cpp|  2 +-
- 6 files changed, 19 insertions(+), 16 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/kimgio/tests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 9d82b9394..b3a33afe4 100644
 a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
- okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
- target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF5::KHtml)
+--- a/generators/epub/CMakeLists.txt   2018-08-19 21:34:51.151645090 +0200
 b/generators/epub/CMakeLists.txt   2018-08-19 21:36:28.771109586 +0200
+@@ -23,12 +23,13 @@
+ 
+ ### autotests ###
  
--### autotests ###
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/chmgeneratortest.cpp
--TEST_NAME "chmgeneratortest"
--LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
--)
--
--target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
 +if(BUILD_TESTING)
-+   add_subdirectory(autotests)
+ add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+ ecm_add_test(autotests/epubgeneratortest.cpp
+ TEST_NAME "epubgeneratortest"
+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+ )
+-
 +endif()
  
  ### install files ###
- install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
-new file mode 100644
-index 0..59753ca45
 /dev/null
-+++ b/generators/chm/autotests/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(chmgeneratortest.cpp
-+TEST_NAME "chmgeneratortest"
-+LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
-+)
-+
-+target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
-diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
-index 6b0b8efc7..25fd6631a 100644
 a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
- {
- Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );
- m_document = new Okular::Document( 0 );
--const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
-+const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
- QMimeDatabase db;
- const QMimeType mime = db.mimeTypeForFile( testFile );
- QCOMPARE( m_document->openDocument(testFile, QUrl(), mime), 
Okular::Document::OpenSuccess );
-diff --git a/generators/kimgio/CMakeLists.txt 
b/generators/kimgio/CMakeLists.txt
-index b8cac76df..49f893bc1 100644
 a/generators/kimgio/CMakeLists.txt
-+++ b/generators/kimgio/CMakeLists.txt
-@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio 
generator_kimgio.cpp)
-

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2018-08-16 Thread Andreas Sturmlechner 
commit: 499b1dc94777aedc3d704820858ef8751f017145
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 16 20:19:54 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 16 20:19:54 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=499b1dc9

kde-apps/okular: Add zlib slot op

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 kde-apps/okular/okular-18.08.0.ebuild   | 2 +-
 kde-apps/okular/okular-18.08.49..ebuild | 2 +-
 kde-apps/okular/okular-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-18.08.0.ebuild 
b/kde-apps/okular/okular-18.08.0.ebuild
index 94de9fbb35..3b0a59ddda 100644
--- a/kde-apps/okular/okular-18.08.0.ebuild
+++ b/kde-apps/okular/okular-18.08.0.ebuild
@@ -35,7 +35,7 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5(+)]
-   sys-libs/zlib
+   sys-libs/zlib:=
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib

diff --git a/kde-apps/okular/okular-18.08.49..ebuild 
b/kde-apps/okular/okular-18.08.49..ebuild
index 0596092ab1..eca8cfddbc 100644
--- a/kde-apps/okular/okular-18.08.49..ebuild
+++ b/kde-apps/okular/okular-18.08.49..ebuild
@@ -35,7 +35,7 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5(+)]
-   sys-libs/zlib
+   sys-libs/zlib:=
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 0596092ab1..eca8cfddbc 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -35,7 +35,7 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5(+)]
-   sys-libs/zlib
+   sys-libs/zlib:=
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2018-04-13 Thread Andreas Sturmlechner 
commit: f55027382e90496757b90f896c295e7ce6f63ebf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 13 20:38:31 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 13 20:38:31 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f5502738

kde-apps/okular: Drop patch, picked for 18.04 branch upstream

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 kde-apps/okular/okular-18.04.0.ebuild   | 5 +
 kde-apps/okular/okular-18.04.49..ebuild | 5 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/kde-apps/okular/okular-18.04.0.ebuild 
b/kde-apps/okular/okular-18.04.0.ebuild
index 31372c0243..94de9fbb35 100644
--- a/kde-apps/okular/okular-18.04.0.ebuild
+++ b/kde-apps/okular/okular-18.04.0.ebuild
@@ -64,10 +64,7 @@ RDEPEND="${DEPEND}
)
 "
 
-PATCHES=(
-   "${FILESDIR}/${PN}-tests.patch"
-   "${FILESDIR}/${PN}-18.03.90-kcrash.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
 
 src_prepare() {
kde5_src_prepare

diff --git a/kde-apps/okular/okular-18.04.49..ebuild 
b/kde-apps/okular/okular-18.04.49..ebuild
index 80d688c222..0596092ab1 100644
--- a/kde-apps/okular/okular-18.04.49..ebuild
+++ b/kde-apps/okular/okular-18.04.49..ebuild
@@ -64,10 +64,7 @@ RDEPEND="${DEPEND}
)
 "
 
-PATCHES=(
-   "${FILESDIR}/${PN}-tests.patch"
-   "${FILESDIR}/${PN}-18.03.90-kcrash.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
 
 src_prepare() {
kde5_src_prepare

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/

2018-04-08 Thread Andreas Sturmlechner 
commit: 228cad863fc6a75564afeafd41a7dfef22d43683
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr  8 12:00:57 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  8 12:00:57 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=228cad86

kde-apps/okular: Initialise kcrash

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 kde-apps/okular/files/okular-18.03.90-kcrash.patch | 60 ++
 kde-apps/okular/okular-18.03.90.ebuild |  6 ++-
 kde-apps/okular/okular-18.04.49..ebuild|  6 ++-
 kde-apps/okular/okular-.ebuild |  1 +
 4 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/files/okular-18.03.90-kcrash.patch 
b/kde-apps/okular/files/okular-18.03.90-kcrash.patch
new file mode 100644
index 00..39ce8c3b03
--- /dev/null
+++ b/kde-apps/okular/files/okular-18.03.90-kcrash.patch
@@ -0,0 +1,60 @@
+From 3e25263d7709524e227207092533397ef65f2c82 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Sun, 8 Apr 2018 11:50:18 +0200
+Subject: Use KCrash
+
+---
+ CMakeLists.txt   | 1 +
+ shell/CMakeLists.txt | 2 +-
+ shell/main.cpp   | 3 +++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b38cac..fd2d55e 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -53,6 +53,7 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
+ Config
+ ConfigWidgets
+ CoreAddons
++Crash
+ DocTools
+ IconThemes
+ JS
+diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
+index ec2f1ba..e85076d 100644
+--- a/shell/CMakeLists.txt
 b/shell/CMakeLists.txt
+@@ -27,7 +27,7 @@ ecm_add_app_icon(okular_SRCS ICONS ${ICONS_SRCS})
+ 
+ add_executable(okular ${okular_SRCS})
+ 
+-target_link_libraries(okular KF5::Parts KF5::WindowSystem)
++target_link_libraries(okular KF5::Parts KF5::WindowSystem KF5::Crash)
+ 
+ if(NOT WIN32)
+   target_link_libraries(okular KF5::Activities)
+diff --git a/shell/main.cpp b/shell/main.cpp
+index 3f8dc43..de8a5c2 100644
+--- a/shell/main.cpp
 b/shell/main.cpp
+@@ -20,6 +20,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -39,6 +40,8 @@ int main(int argc, char** argv)
+ // set icon for shells which do not use desktop file metadata
+ QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular")));
+ 
++KCrash::initialize();
++
+ QCommandLineParser parser;
+ // The KDE4 version accepted flags such as -unique with a single dash -> 
preserve compatibility
+ 
parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+-- 
+cgit v0.11.2
+

diff --git a/kde-apps/okular/okular-18.03.90.ebuild 
b/kde-apps/okular/okular-18.03.90.ebuild
index 950d0b1d6a..60bde14510 100644
--- a/kde-apps/okular/okular-18.03.90.ebuild
+++ b/kde-apps/okular/okular-18.03.90.ebuild
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
@@ -63,7 +64,10 @@ RDEPEND="${DEPEND}
)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-tests.patch"
+   "${FILESDIR}/${P}-kcrash.patch"
+)
 
 src_prepare() {
kde5_src_prepare

diff --git a/kde-apps/okular/okular-18.04.49..ebuild 
b/kde-apps/okular/okular-18.04.49..ebuild
index 1eba56641a..80d688c222 100644
--- a/kde-apps/okular/okular-18.04.49..ebuild
+++ b/kde-apps/okular/okular-18.04.49..ebuild
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
@@ -63,7 +64,10 @@ RDEPEND="${DEPEND}
)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-tests.patch"
+   "${FILESDIR}/${PN}-18.03.90-kcrash.patch"
+)
 
 src_prepare() {
kde5_src_prepare

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 1eba56641a..0596092ab1 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2018-03-19 Thread Andreas Sturmlechner 
commit: 8c26b0f9d5c4ce9a3a077baa8457c020f381f2c5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar 19 17:08:59 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 19 17:08:59 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c26b0f9

kde-apps/okular: Revert bogus poppler-qt5-relaxation

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 kde-apps/okular/okular-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 4674c4ec89..1eba56641a 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -48,7 +48,7 @@ DEPEND="
)
markdown? ( app-text/discount )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-   pdf? ( app-text/poppler[qt5(+)] )
+   pdf? ( app-text/poppler[qt5] )
plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
share? ( $(add_frameworks_dep purpose) )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2018-02-22 Thread Andreas Sturmlechner 
commit: bb5fb9f17d02789c920d3bb8d45949facf47483d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 22 13:01:12 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 13:01:12 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb5fb9f1

kde-apps/okular: Relax poppler/qca qt5-usedeps

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

diff --git a/kde-apps/okular/okular-17.12.49..ebuild 
b/kde-apps/okular/okular-17.12.49..ebuild
index 9f9adeb460..4674c4ec89 100644
--- a/kde-apps/okular/okular-17.12.49..ebuild
+++ b/kde-apps/okular/okular-17.12.49..ebuild
@@ -39,7 +39,7 @@ DEPEND="
$(add_frameworks_dep khtml)
dev-libs/chmlib
)
-   crypt? ( app-crypt/qca:2[qt5] )
+   crypt? ( app-crypt/qca:2[qt5(+)] )
djvu? ( app-text/djvu )
epub? ( app-text/ebook-tools )
image-backend? (
@@ -48,7 +48,7 @@ DEPEND="
)
markdown? ( app-text/discount )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-   pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+   pdf? ( app-text/poppler[qt5(+)] )
plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
share? ( $(add_frameworks_dep purpose) )

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 9f9adeb460..4674c4ec89 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -39,7 +39,7 @@ DEPEND="
$(add_frameworks_dep khtml)
dev-libs/chmlib
)
-   crypt? ( app-crypt/qca:2[qt5] )
+   crypt? ( app-crypt/qca:2[qt5(+)] )
djvu? ( app-text/djvu )
epub? ( app-text/ebook-tools )
image-backend? (
@@ -48,7 +48,7 @@ DEPEND="
)
markdown? ( app-text/discount )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-   pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+   pdf? ( app-text/poppler[qt5(+)] )
plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
share? ( $(add_frameworks_dep purpose) )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2018-01-31 Thread Andreas Sturmlechner 
commit: 94a9fe22f07af8e6bf1f7241932df8236cff404a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 31 23:15:12 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  1 00:08:20 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=94a9fe22

kde-apps/okular: Disable hanging test

Reported-by: Paolo Pedroni  iol.it>
Bug: https://bugs.gentoo.org/641728
Package-Manager: Portage-2.3.21, Repoman-2.3.6

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

diff --git a/kde-apps/okular/okular-17.12.49..ebuild 
b/kde-apps/okular/okular-17.12.49..ebuild
index 1a0378b407..cfc05336d8 100644
--- a/kde-apps/okular/okular-17.12.49..ebuild
+++ b/kde-apps/okular/okular-17.12.49..ebuild
@@ -93,8 +93,9 @@ src_configure() {
 
 src_test() {
# mainshelltest hangs, chmgeneratortest fails, bug #603116
+   # parttest hangs, bug #641728
local myctestargs=(
-   -E "(mainshelltest|chmgeneratortest)"
+   -E "(mainshelltest|chmgeneratortest|parttest)"
)
 
kde5_src_test

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 1a0378b407..cfc05336d8 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -93,8 +93,9 @@ src_configure() {
 
 src_test() {
# mainshelltest hangs, chmgeneratortest fails, bug #603116
+   # parttest hangs, bug #641728
local myctestargs=(
-   -E "(mainshelltest|chmgeneratortest)"
+   -E "(mainshelltest|chmgeneratortest|parttest)"
)
 
kde5_src_test

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-10-19 Thread Andreas Sturmlechner 
commit: 9b7d6c635cf20958529017c70f6541ee921ad5a0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 19 13:25:42 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 19 13:25:42 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b7d6c63

kde-apps/okular: Add USE=share

Upstream commit a5da013a4da20f9230775fdf52275c5136e4f172

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 kde-apps/okular/metadata.xml   | 1 +
 kde-apps/okular/okular-.ebuild | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index cec42c6949..21ae2823da 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -13,6 +13,7 @@
Enable mobipocket support
Enable Plasma mobile support
Enable Plucker E-Book for Palm OS devices 
support
+   Enable support for a share menu using 
dev-libs/purpose
Enable text-to-speech support

 

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 2cf2d02017..5e830356be 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker 
+postscript speech +tiff"
+IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker 
+postscript share speech +tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -51,6 +51,7 @@ DEPEND="
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
+   share? ( dev-libs/purpose:5 )
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
 "
@@ -82,6 +83,7 @@ src_configure() {
$(cmake-utils_use_find_package pdf Poppler)
$(cmake-utils_use_find_package plucker JPEG)
$(cmake-utils_use_find_package postscript LibSpectre)
+   $(cmake-utils_use_find_package share KDEExperimentalPurpose)
$(cmake-utils_use_find_package speech Qt5TextToSpeech)
$(cmake-utils_use_find_package tiff TIFF)
)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2017-10-12 Thread Andreas Sturmlechner 
commit: bc86010e82d00b9edf763f43c1b043feb0aa88ca
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 12 13:40:59 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 12 13:44:32 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bc86010e

kde-apps/okular: Fix build with USE=chm

Reported-by: Eugene Shalygin  gmail.com>
Gentoo-bug: 627448
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 kde-apps/okular/files/okular-tests.patch | 112 +++
 kde-apps/okular/okular-.ebuild   |  12 +++-
 2 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/files/okular-tests.patch 
b/kde-apps/okular/files/okular-tests.patch
new file mode 100644
index 00..0e2cdaecd4
--- /dev/null
+++ b/kde-apps/okular/files/okular-tests.patch
@@ -0,0 +1,112 @@
+From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 12 Oct 2017 14:09:09 +0200
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+---
+ generators/chm/CMakeLists.txt | 12 +++-
+ generators/chm/autotests/CMakeLists.txt   |  8 
+ generators/chm/autotests/chmgeneratortest.cpp |  2 +-
+ generators/kimgio/CMakeLists.txt  |  6 +-
+ generators/kimgio/tests/CMakeLists.txt|  5 +
+ generators/kimgio/tests/kimgiotest.cpp|  2 +-
+ 6 files changed, 19 insertions(+), 16 deletions(-)
+ create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/kimgio/tests/CMakeLists.txt
+
+diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
+index 9d82b9394..b3a33afe4 100644
+--- a/generators/chm/CMakeLists.txt
 b/generators/chm/CMakeLists.txt
+@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
+ okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
+ target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF5::KHtml)
+ 
+-### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/chmgeneratortest.cpp
+-TEST_NAME "chmgeneratortest"
+-LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+-)
+-
+-target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
++if(BUILD_TESTING)
++   add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
+new file mode 100644
+index 0..59753ca45
+--- /dev/null
 b/generators/chm/autotests/CMakeLists.txt
+@@ -0,0 +1,8 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(chmgeneratortest.cpp
++TEST_NAME "chmgeneratortest"
++LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
++)
++
++target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
+diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
+index 6b0b8efc7..25fd6631a 100644
+--- a/generators/chm/autotests/chmgeneratortest.cpp
 b/generators/chm/autotests/chmgeneratortest.cpp
+@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
+ {
+ Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );
+ m_document = new Okular::Document( 0 );
+-const QString testFile = QStringLiteral(KDESRCDIR 
"autotests/data/test.chm");
++const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
+ QMimeDatabase db;
+ const QMimeType mime = db.mimeTypeForFile( testFile );
+ QCOMPARE( m_document->openDocument(testFile, QUrl(), mime), 
Okular::Document::OpenSuccess );
+diff --git a/generators/kimgio/CMakeLists.txt 
b/generators/kimgio/CMakeLists.txt
+index b8cac76df..49f893bc1 100644
+--- a/generators/kimgio/CMakeLists.txt
 b/generators/kimgio/CMakeLists.txt
+@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio 
generator_kimgio.cpp)
+ target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
+ 
+ if(BUILD_TESTING)
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-set( kimgiotest_SRCS tests/kimgiotest.cpp 
${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp 
${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
+-ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES 
okularcore okularpart Qt5::Svg Qt5::Test)
+-target_compile_definitions(kimgiotest PRIVATE 
-DGENERATOR_PATH="$")
++   add_subdirectory(tests)
+ endif()
+ 
+-
+ ### install files ###
+ install( FILES okularKimgio.desktop  DESTINATION  
${KDE_INSTALL_KSERVICES5DIR} )
+ install( PROGRAMS okularApplication_kimgio.desktop 
org.kde.mobile.okular_kimgio.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/kalgebra/

2017-10-02 Thread Andreas Sturmlechner 
commit: 0a1b8100767c4dab95cdeb446fceadbb3c3781d1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct  2 16:22:46 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct  2 16:22:46 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a1b8100

kde-apps: Cleanup kirigami dep

Package-Manager: Portage-2.3.10, Repoman-2.3.3

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

diff --git a/kde-apps/kalgebra/kalgebra-17.08.49..ebuild 
b/kde-apps/kalgebra/kalgebra-17.08.49..ebuild
index f0fa7cc02c..32f76ff7a1 100644
--- a/kde-apps/kalgebra/kalgebra-17.08.49..ebuild
+++ b/kde-apps/kalgebra/kalgebra-17.08.49..ebuild
@@ -28,7 +28,7 @@ DEPEND="
readline? ( sys-libs/readline:0= )
 "
 RDEPEND="${DEPEND}
-   $(add_frameworks_dep kirigami '' 2.2.0)
+   $(add_frameworks_dep kirigami)
$(add_qt_dep qtquickcontrols)
!kde-apps/analitza:4
 "

diff --git a/kde-apps/kalgebra/kalgebra-.ebuild 
b/kde-apps/kalgebra/kalgebra-.ebuild
index f0fa7cc02c..32f76ff7a1 100644
--- a/kde-apps/kalgebra/kalgebra-.ebuild
+++ b/kde-apps/kalgebra/kalgebra-.ebuild
@@ -28,7 +28,7 @@ DEPEND="
readline? ( sys-libs/readline:0= )
 "
 RDEPEND="${DEPEND}
-   $(add_frameworks_dep kirigami '' 2.2.0)
+   $(add_frameworks_dep kirigami)
$(add_qt_dep qtquickcontrols)
!kde-apps/analitza:4
 "

diff --git a/kde-apps/okular/okular-17.08.49..ebuild 
b/kde-apps/okular/okular-17.08.49..ebuild
index 8796e377d8..035cd9953d 100644
--- a/kde-apps/okular/okular-17.08.49..ebuild
+++ b/kde-apps/okular/okular-17.08.49..ebuild
@@ -56,8 +56,8 @@ DEPEND="
 RDEPEND="${DEPEND}
image-backend? ( $(add_frameworks_dep kimageformats) )
mobile? (
+   $(add_frameworks_dep kirigami)
$(add_qt_dep qtquickcontrols)
-   $(add_frameworks_dep kirigami '' 2.2.0)
)
 "
 

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index dff7120525..9e97a956c6 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -57,8 +57,8 @@ DEPEND="
 RDEPEND="${DEPEND}
image-backend? ( $(add_frameworks_dep kimageformats) )
mobile? (
+   $(add_frameworks_dep kirigami)
$(add_qt_dep qtquickcontrols)
-   $(add_frameworks_dep kirigami '' 2.2.0)
)
 "

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-08-25 Thread Andreas Sturmlechner 
commit: 48a4c7248cac73b07a67a4c969d7921be463725c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 25 18:33:39 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 25 18:33:39 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=48a4c724

kde-apps/okular: Add USE=markdown

Upstream commit 4931385777ce9fa55c8b52f5009603b2b6d58d7f

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/okular/metadata.xml   | 5 +++--
 kde-apps/okular/okular-.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 386d732f69..cec42c6949 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -7,9 +7,10 @@


Enable support for Microsoft Compiled HTML 
Help files
-   Add E-Book support via 
app-text/ebook-tools
+   Enable E-Book support via 
app-text/ebook-tools
Enable image viewing support
-   Add mobipocket support
+   Enable Markdown support via 
app-text/discount
+   Enable mobipocket support
Enable Plasma mobile support
Enable Plucker E-Book for Palm OS devices 
support
Enable text-to-speech support

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index b2e9978343..2d1ba1ef3c 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu epub +image-backend mobi mobile +pdf plucker +postscript 
speech +tiff"
+IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker 
+postscript speech +tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -46,6 +46,7 @@ DEPEND="
$(add_kdeapps_dep libkexiv2)
$(add_qt_dep qtgui 'gif,jpeg,png')
)
+   markdown? ( app-text/discount )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
plucker? ( virtual/jpeg:0 )
@@ -77,6 +78,7 @@ src_configure() {
$(cmake-utils_use_find_package djvu DjVuLibre)
$(cmake-utils_use_find_package epub EPub)
$(cmake-utils_use_find_package image-backend KF5KExiv2)
+   $(cmake-utils_use_find_package markdown Discount)
$(cmake-utils_use_find_package mobi QMobipocket)
$(cmake-utils_use_find_package pdf Poppler)
$(cmake-utils_use_find_package plucker JPEG)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-07-13 Thread Andreas Sturmlechner 
commit: 882ffcdbfde67dcf5bf01335a910c1af8649b80b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul 13 17:47:07 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul 13 17:47:07 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=882ffcdb

kde-apps/okular: Fix RDEPENDs

Upstream commit caf8820cf773316ce41d9a8c1f7357b3ffc3ef86

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/okular/okular-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index d17193bc39..4cb6dbb5f4 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -55,7 +55,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
image-backend? ( $(add_frameworks_dep kimageformats) )
-   mobile? ( dev-libs/kirigami:1 )
+   mobile? (
+   $(add_qt_dep qtquickcontrols)
+   dev-libs/kirigami:2
+   )
 "
 
 # bug 603116

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-07-13 Thread Andreas Sturmlechner 
commit: 8e8cbe390626d85ce6f4b47683138983b7f5f26b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul 13 17:48:18 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul 13 17:48:18 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8e8cbe39

kde-apps/okular: Add missing RDEPEND

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/okular/okular-17.04.3.ebuild   | 5 -
 kde-apps/okular/okular-17.04.49..ebuild | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-17.04.3.ebuild 
b/kde-apps/okular/okular-17.04.3.ebuild
index c9f7f35e22..5dad52c5ae 100644
--- a/kde-apps/okular/okular-17.04.3.ebuild
+++ b/kde-apps/okular/okular-17.04.3.ebuild
@@ -55,7 +55,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
image-backend? ( $(add_frameworks_dep kimageformats) )
-   mobile? ( dev-libs/kirigami:1 )
+   mobile? (
+   $(add_qt_dep qtquickcontrols)
+   dev-libs/kirigami:1
+   )
 "
 
 # bug 603116

diff --git a/kde-apps/okular/okular-17.04.49..ebuild 
b/kde-apps/okular/okular-17.04.49..ebuild
index d17193bc39..a77e9201b3 100644
--- a/kde-apps/okular/okular-17.04.49..ebuild
+++ b/kde-apps/okular/okular-17.04.49..ebuild
@@ -55,7 +55,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
image-backend? ( $(add_frameworks_dep kimageformats) )
-   mobile? ( dev-libs/kirigami:1 )
+   mobile? (
+   $(add_qt_dep qtquickcontrols)
+   dev-libs/kirigami:1
+   )
 "
 
 # bug 603116

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-06-24 Thread Andreas Sturmlechner 
commit: 4b8ed2bbe3d30adcda189116a937c0c6bf8b0578
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 24 14:39:23 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 24 14:39:23 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4b8ed2bb

kde-apps/okular: USE=ebook -> epub

Gentoo-bug: 600162

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/okular/metadata.xml| 2 +-
 kde-apps/okular/okular-17.04.49..ebuild | 6 +++---
 kde-apps/okular/okular-.ebuild  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 0a06fc744c..386d732f69 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -7,7 +7,7 @@


Enable support for Microsoft Compiled HTML 
Help files
-   Add E-Book support
+   Add E-Book support via 
app-text/ebook-tools
Enable image viewing support
Add mobipocket support
Enable Plasma mobile support

diff --git a/kde-apps/okular/okular-17.04.49..ebuild 
b/kde-apps/okular/okular-17.04.49..ebuild
index 3b6ff6bc60..d17193bc39 100644
--- a/kde-apps/okular/okular-17.04.49..ebuild
+++ b/kde-apps/okular/okular-17.04.49..ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +image-backend mobi mobile +pdf plucker +postscript 
speech +tiff"
+IUSE="chm crypt djvu epub +image-backend mobi mobile +pdf plucker +postscript 
speech +tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -41,7 +41,7 @@ DEPEND="
)
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
-   ebook? ( app-text/ebook-tools )
+   epub? ( app-text/ebook-tools )
image-backend? (
$(add_kdeapps_dep libkexiv2)
$(add_qt_dep qtgui 'gif,jpeg,png')
@@ -72,7 +72,7 @@ src_configure() {
$(cmake-utils_use_find_package chm CHM)
$(cmake-utils_use_find_package crypt Qca-qt5)
$(cmake-utils_use_find_package djvu DjVuLibre)
-   $(cmake-utils_use_find_package ebook EPub)
+   $(cmake-utils_use_find_package epub EPub)
$(cmake-utils_use_find_package image-backend KF5KExiv2)
$(cmake-utils_use_find_package mobi QMobipocket)
$(cmake-utils_use_find_package pdf Poppler)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 3b6ff6bc60..d17193bc39 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +image-backend mobi mobile +pdf plucker +postscript 
speech +tiff"
+IUSE="chm crypt djvu epub +image-backend mobi mobile +pdf plucker +postscript 
speech +tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -41,7 +41,7 @@ DEPEND="
)
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
-   ebook? ( app-text/ebook-tools )
+   epub? ( app-text/ebook-tools )
image-backend? (
$(add_kdeapps_dep libkexiv2)
$(add_qt_dep qtgui 'gif,jpeg,png')
@@ -72,7 +72,7 @@ src_configure() {
$(cmake-utils_use_find_package chm CHM)
$(cmake-utils_use_find_package crypt Qca-qt5)
$(cmake-utils_use_find_package djvu DjVuLibre)
-   $(cmake-utils_use_find_package ebook EPub)
+   $(cmake-utils_use_find_package epub EPub)
$(cmake-utils_use_find_package image-backend KF5KExiv2)
$(cmake-utils_use_find_package mobi QMobipocket)
$(cmake-utils_use_find_package pdf Poppler)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-04-23 Thread Andreas Sturmlechner 
commit: f01f9bd74beb60314ae9e6872df0bd7aff634878
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 23 13:34:38 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 23 13:34:38 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f01f9bd7

kde-apps/okular: Add USE=image-backend, fix USE=plucker

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/metadata.xml|  1 +
 kde-apps/okular/okular-17.04.49..ebuild | 17 -
 kde-apps/okular/okular-.ebuild  | 17 -
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index e29d704c14..0a06fc744c 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -8,6 +8,7 @@

Enable support for Microsoft Compiled HTML 
Help files
Add E-Book support
+   Enable image viewing support
Add mobipocket support
Enable Plasma mobile support
Enable Plucker E-Book for Palm OS devices 
support

diff --git a/kde-apps/okular/okular-17.04.49..ebuild 
b/kde-apps/okular/okular-17.04.49..ebuild
index 670f65e0a5..3b6ff6bc60 100644
--- a/kde-apps/okular/okular-17.04.49..ebuild
+++ b/kde-apps/okular/okular-17.04.49..ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech 
+tiff"
+IUSE="chm crypt djvu ebook +image-backend mobi mobile +pdf plucker +postscript 
speech +tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -34,6 +34,7 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5]
+   sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib
@@ -41,21 +42,19 @@ DEPEND="
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
ebook? ( app-text/ebook-tools )
-   exif? (
+   image-backend? (
$(add_kdeapps_dep libkexiv2)
-   virtual/jpeg:0
+   $(add_qt_dep qtgui 'gif,jpeg,png')
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
-   plucker? (
-   sys-libs/zlib
-   virtual/jpeg:0
-   )
+   plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
 "
 RDEPEND="${DEPEND}
+   image-backend? ( $(add_frameworks_dep kimageformats) )
mobile? ( dev-libs/kirigami:1 )
 "
 
@@ -74,10 +73,10 @@ src_configure() {
$(cmake-utils_use_find_package crypt Qca-qt5)
$(cmake-utils_use_find_package djvu DjVuLibre)
$(cmake-utils_use_find_package ebook EPub)
-   $(cmake-utils_use_find_package exif KF5KExiv2)
+   $(cmake-utils_use_find_package image-backend KF5KExiv2)
$(cmake-utils_use_find_package mobi QMobipocket)
$(cmake-utils_use_find_package pdf Poppler)
-   $(cmake-utils_use_find_package plucker ZLIB)
+   $(cmake-utils_use_find_package plucker JPEG)
$(cmake-utils_use_find_package postscript LibSpectre)
$(cmake-utils_use_find_package speech Qt5TextToSpeech)
$(cmake-utils_use_find_package tiff TIFF)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 670f65e0a5..3b6ff6bc60 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech 
+tiff"
+IUSE="chm crypt djvu ebook +image-backend mobi mobile +pdf plucker +postscript 
speech +tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -34,6 +34,7 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5]
+   sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib
@@ -41,21 +42,19 @@ DEPEND="
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
ebook? ( app-text/ebook-tools )
-   exif? (
+   image-backend? (
$(add_kdeapps_dep libkexiv2)
-   virtual/jpeg:0
+   $(add_qt_dep qtgui 'gif,jpeg,png')
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
-   plucker? (
-

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-04-22 Thread Andreas Sturmlechner 
commit: 348a9547be3c56b183ca515417e5fc3cbfaa3f27
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 22 12:27:49 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 22 12:27:49 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=348a9547

kde-apps/okular: Sort DEPENDs

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/kde-apps/okular/okular-17.04.49..ebuild 
b/kde-apps/okular/okular-17.04.49..ebuild
index a99e614c07..670f65e0a5 100644
--- a/kde-apps/okular/okular-17.04.49..ebuild
+++ b/kde-apps/okular/okular-17.04.49..ebuild
@@ -24,8 +24,8 @@ DEPEND="
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
-   $(add_frameworks_dep kwallet)
$(add_frameworks_dep kpty)
+   $(add_frameworks_dep kwallet)
$(add_frameworks_dep threadweaver)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index a99e614c07..670f65e0a5 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -24,8 +24,8 @@ DEPEND="
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
-   $(add_frameworks_dep kwallet)
$(add_frameworks_dep kpty)
+   $(add_frameworks_dep kwallet)
$(add_frameworks_dep threadweaver)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-04-22 Thread Andreas Sturmlechner 
commit: e164b679524099ffc915af8c48ebb162c5af5df0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 22 08:08:31 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 22 08:31:42 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e164b679

kde-apps/okular: USE=jpeg->exif, add USE=plucker

Reported-by: Ostashevskyi Viktor  ostash.kiev.ua>
Gentoo-bug: 616266

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/metadata.xml|  1 +
 kde-apps/okular/okular-17.04.49..ebuild | 13 -
 kde-apps/okular/okular-.ebuild  | 13 -
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 0d0cb081aa..e29d704c14 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -10,6 +10,7 @@
Add E-Book support
Add mobipocket support
Enable Plasma mobile support
+   Enable Plucker E-Book for Palm OS devices 
support
Enable text-to-speech support

 

diff --git a/kde-apps/okular/okular-17.04.49..ebuild 
b/kde-apps/okular/okular-17.04.49..ebuild
index adc3e749a6..a99e614c07 100644
--- a/kde-apps/okular/okular-17.04.49..ebuild
+++ b/kde-apps/okular/okular-17.04.49..ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
+IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech 
+tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -21,7 +21,6 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
@@ -35,7 +34,6 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5]
-   sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib
@@ -43,12 +41,16 @@ DEPEND="
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
ebook? ( app-text/ebook-tools )
-   jpeg? (
+   exif? (
$(add_kdeapps_dep libkexiv2)
virtual/jpeg:0
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+   plucker? (
+   sys-libs/zlib
+   virtual/jpeg:0
+   )
postscript? ( app-text/libspectre )
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
@@ -72,9 +74,10 @@ src_configure() {
$(cmake-utils_use_find_package crypt Qca-qt5)
$(cmake-utils_use_find_package djvu DjVuLibre)
$(cmake-utils_use_find_package ebook EPub)
-   $(cmake-utils_use_find_package jpeg KF5KExiv2)
+   $(cmake-utils_use_find_package exif KF5KExiv2)
$(cmake-utils_use_find_package mobi QMobipocket)
$(cmake-utils_use_find_package pdf Poppler)
+   $(cmake-utils_use_find_package plucker ZLIB)
$(cmake-utils_use_find_package postscript LibSpectre)
$(cmake-utils_use_find_package speech Qt5TextToSpeech)
$(cmake-utils_use_find_package tiff TIFF)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index adc3e749a6..a99e614c07 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
+IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech 
+tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -21,7 +21,6 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
@@ -35,7 +34,6 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5]
-   sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib
@@ -43,12 +41,16 @@ DEPEND="
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
ebook? ( app-text/ebook-tools )
-   jpeg? (
+   exif? (
$(add_kdeapps_dep

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-02-10 Thread Andreas Sturmlechner 
commit: 67b7990689204d9039eb13044b341855a427b22c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Feb 10 11:13:01 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Feb 10 11:13:01 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=67b79906

kde-apps/okular: Move kde-frameworks/khtml dep behind USE=chm

Upstream commit 7a013e3869367fdc2dd4e5b452ed2d6e9b037a9e

Package-Manager: portage-2.3.3

 kde-apps/okular/okular-.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 75719f0669..48c3fb79a9 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -23,7 +23,6 @@ DEPEND="
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep khtml)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
@@ -38,7 +37,10 @@ DEPEND="
media-libs/freetype
media-libs/phonon[qt5]
sys-libs/zlib
-   chm? ( dev-libs/chmlib )
+   chm? (
+   $(add_frameworks_dep khtml)
+   dev-libs/chmlib
+   )
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
ebook? ( app-text/ebook-tools )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-01-10 Thread Johannes Huber 
commit: 0292226f20b01ff738a9ce86bfdce6ee892fa02c
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jan 10 08:32:48 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jan 10 08:32:48 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0292226f

kde-apps/okular: Restore KEYWORDS

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/okular-16.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-16.12.1.ebuild 
b/kde-apps/okular/okular-16.12.1.ebuild
index 75719f0..59bc85b 100644
--- a/kde-apps/okular/okular-16.12.1.ebuild
+++ b/kde-apps/okular/okular-16.12.1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
 
 DEPEND="

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-01-10 Thread Johannes Huber 
commit: 98ab6fd99e4a9d53dc8eccad3f8cb4083484f0af
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jan 10 08:16:37 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jan 10 08:16:37 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=98ab6fd9

kde-apps/okular: Backport changes after merge

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/okular-16.12.1.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-16.12.1.ebuild 
b/kde-apps/okular/okular-16.12.1.ebuild
index 83f289c..75719f0 100644
--- a/kde-apps/okular/okular-16.12.1.ebuild
+++ b/kde-apps/okular/okular-16.12.1.ebuild
@@ -11,8 +11,8 @@ inherit kde5
 
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
+KEYWORDS=""
+IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -52,13 +52,16 @@ DEPEND="
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   mobile? ( dev-libs/kirigami:1 )
+"
 
 # bug 603116
 RESTRICT+=" test"
 
 src_prepare() {
kde5_src_prepare
+   use mobile || cmake_comment_add_subdirectory mobile
use test || cmake_comment_add_subdirectory conf/autotests
 }

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2017-01-10 Thread Johannes Huber 
commit: 003eb0efb09382dea6fb46b0733a8bb2077972b5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan  9 00:58:09 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jan  9 10:09:36 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=003eb0ef

kde-apps/okular: Add USE=mobile

Gentoo-bug: 604782

Package-Manager: portage-2.3.0

 kde-apps/okular/metadata.xml| 1 +
 kde-apps/okular/okular-16.12.49..ebuild | 7 +--
 kde-apps/okular/okular-.ebuild  | 7 +--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index f94e8fb..0d0cb08 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -9,6 +9,7 @@
Enable support for Microsoft Compiled HTML 
Help files
Add E-Book support
Add mobipocket support
+   Enable Plasma mobile support
Enable text-to-speech support

 

diff --git a/kde-apps/okular/okular-16.12.49..ebuild 
b/kde-apps/okular/okular-16.12.49..ebuild
index 6917a35..75719f0 100644
--- a/kde-apps/okular/okular-16.12.49..ebuild
+++ b/kde-apps/okular/okular-16.12.49..ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
+IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -52,13 +52,16 @@ DEPEND="
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   mobile? ( dev-libs/kirigami:1 )
+"
 
 # bug 603116
 RESTRICT+=" test"
 
 src_prepare() {
kde5_src_prepare
+   use mobile || cmake_comment_add_subdirectory mobile
use test || cmake_comment_add_subdirectory conf/autotests
 }
 

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 6917a35..75719f0 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
+IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
 
 DEPEND="
$(add_frameworks_dep kactivities)
@@ -52,13 +52,16 @@ DEPEND="
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   mobile? ( dev-libs/kirigami:1 )
+"
 
 # bug 603116
 RESTRICT+=" test"
 
 src_prepare() {
kde5_src_prepare
+   use mobile || cmake_comment_add_subdirectory mobile
use test || cmake_comment_add_subdirectory conf/autotests
 }

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-12-20 Thread Johannes Huber 
commit: bdf42741330210d240d5fc22ec692a50445c6480
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Dec 20 18:26:53 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Dec 20 18:26:53 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bdf42741

kde-apps/okular: Sync with tree

Gentoo-bug: 603084

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/okular-16.12.49..ebuild | 1 +
 kde-apps/okular/okular-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/okular/okular-16.12.49..ebuild 
b/kde-apps/okular/okular-16.12.49..ebuild
index 63aa9f6..b7ec098 100644
--- a/kde-apps/okular/okular-16.12.49..ebuild
+++ b/kde-apps/okular/okular-16.12.49..ebuild
@@ -28,6 +28,7 @@ DEPEND="
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
$(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kpty)
$(add_frameworks_dep threadweaver)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 63aa9f6..b7ec098 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -28,6 +28,7 @@ DEPEND="
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
$(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kpty)
$(add_frameworks_dep threadweaver)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-12-19 Thread Johannes Huber 
commit: 7a292b37f1e8c982d6585d69ee0c84d0e1af85e9
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Dec 19 20:16:33 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Dec 19 20:16:33 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7a292b37

kde-apps/okular: Restrict tests

Gentoo-bug: 603116
Reported-by: Paolo Pedroni  iol.it>

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/okular-16.12.49..ebuild | 4 
 kde-apps/okular/okular-.ebuild  | 4 
 2 files changed, 8 insertions(+)

diff --git a/kde-apps/okular/okular-16.12.49..ebuild 
b/kde-apps/okular/okular-16.12.49..ebuild
index 324abb4..63aa9f6 100644
--- a/kde-apps/okular/okular-16.12.49..ebuild
+++ b/kde-apps/okular/okular-16.12.49..ebuild
@@ -6,6 +6,7 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
@@ -52,6 +53,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+# bug 603116
+RESTRICT+=" test"
+
 src_prepare() {
kde5_src_prepare
use test || cmake_comment_add_subdirectory conf/autotests

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 324abb4..63aa9f6 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
@@ -52,6 +53,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+# bug 603116
+RESTRICT+=" test"
+
 src_prepare() {
kde5_src_prepare
use test || cmake_comment_add_subdirectory conf/autotests

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-11-05 Thread Johannes Huber 
commit: 2f1db326148771567e84363222f18b72370febf7
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Nov  5 12:26:30 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Nov  5 12:26:30 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2f1db326

kde-apps/okular: Update dependency

Package-Manager: portage-2.3.2

 kde-apps/okular/metadata.xml| 2 +-
 kde-apps/okular/okular-16.08.49..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 7ea11e7..0a6890e 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -7,7 +7,7 @@


Enable support for Microsoft Compiled HTML 
Help files
-   DPI detection support for PDF rendering via 
x11-libs/libkscreen
+   DPI detection support for PDF rendering via 
kde-plasma/libkscreen
Add E-Book support
Add mobipocket support
Enable text-to-speech support

diff --git a/kde-apps/okular/okular-16.08.49..ebuild 
b/kde-apps/okular/okular-16.08.49..ebuild
index 4962501..f1dc5a3 100644
--- a/kde-apps/okular/okular-16.08.49..ebuild
+++ b/kde-apps/okular/okular-16.08.49..ebuild
@@ -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)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-11-03 Thread Johannes Huber 
commit: f14944854e99909634f8ae7bb8c02d7f00e70fe6
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Nov  3 21:52:56 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Nov  3 22:07:08 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f1494485

kde-apps/okular: Frameworks merged to master

Package-Manager: portage-2.3.0

Signed-off-by: Johannes Huber  gentoo.org>

 kde-apps/okular/okular-5..ebuild | 76 
 kde-apps/okular/okular-.ebuild   | 71 -
 2 files changed, 44 insertions(+), 103 deletions(-)

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
deleted file mode 100644
index ff291a9..000
--- a/kde-apps/okular/okular-5..ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
-KEYWORDS=""
-IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
-
-DEPEND="
-   $(add_frameworks_dep kactivities)
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep khtml)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kjs)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep threadweaver)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   media-libs/freetype
-   media-libs/phonon[qt5]
-   sys-libs/zlib
-   chm? ( dev-libs/chmlib )
-   crypt? ( app-crypt/qca:2[qt5] )
-   djvu? ( app-text/djvu )
-   ebook? ( app-text/ebook-tools )
-   jpeg? (
-   $(add_kdeapps_dep libkexiv2)
-   virtual/jpeg:0
-   )
-   mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-   pdf? ( app-text/poppler[qt5,-exceptions(-)] )
-   postscript? ( app-text/libspectre )
-   speech? ( $(add_qt_dep qtspeech) )
-   tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   kde5_src_prepare
-   use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package chm CHM)
-   $(cmake-utils_use_find_package crypt Qca-qt5)
-   $(cmake-utils_use_find_package djvu DjVuLibre)
-   $(cmake-utils_use_find_package ebook EPub)
-   $(cmake-utils_use_find_package jpeg KF5KExiv2)
-   $(cmake-utils_use_find_package mobi QMobipocket)
-   $(cmake-utils_use_find_package pdf Poppler)
-   $(cmake-utils_use_find_package postscript LibSpectre)
-   $(cmake-utils_use_find_package speech Qt5TextToSpeech)
-   $(cmake-utils_use_find_package tiff TIFF)
-   )
-
-   kde5_src_configure
-}

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 4962501..324abb4 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -4,55 +4,72 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-#VIRTUALX_REQUIRED=test
-RESTRICT=test
-# test 2: parttest hangs
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
 
-inherit kde4-base
-
-DESCRIPTION="Universal document viewer based on KPDF"
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
+IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
 
 DEPEND="
+   $(add_frameworks_dep kactivities)
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kjs)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep threadweaver)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
media-libs/freetype
-   media-libs/phonon[qt4]
-

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-11-02 Thread Johannes Huber 
commit: 6fc1e45e2f91b7fccca186ead55220c98e0370e2
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Nov  2 19:00:51 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Nov  2 19:01:01 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fc1e45e

kde-apps/okular: Drop deprecated Plasma 4 support

Package-Manager: portage-2.3.2

 kde-apps/okular/metadata.xml| 1 -
 kde-apps/okular/okular-16.08.49..ebuild | 5 ++---
 kde-apps/okular/okular-.ebuild  | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 49b367d..7ea11e7 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -9,7 +9,6 @@
Enable support for Microsoft Compiled HTML 
Help files
DPI detection support for PDF rendering via 
x11-libs/libkscreen
Add E-Book support
-   Enable kactivities support
Add mobipocket support
Enable text-to-speech support


diff --git a/kde-apps/okular/okular-16.08.49..ebuild 
b/kde-apps/okular/okular-16.08.49..ebuild
index ebb2860..4962501 100644
--- a/kde-apps/okular/okular-16.08.49..ebuild
+++ b/kde-apps/okular/okular-16.08.49..ebuild
@@ -14,7 +14,7 @@ inherit kde4-base
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
 
 DEPEND="
media-libs/freetype
@@ -30,7 +30,6 @@ DEPEND="
$(add_kdeapps_dep libkexiv2)
virtual/jpeg:0
)
-   kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
postscript? ( app-text/libspectre )
@@ -40,6 +39,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(
+   -DWITH_KActivities=OFF
-DWITH_CHM=$(usex chm)
-DWITH_QCA2=$(usex crypt)
-DWITH_DjVuLibre=$(usex djvu)
@@ -47,7 +47,6 @@ src_configure() {
-DWITH_EPub=$(usex ebook)
-DWITH_JPEG=$(usex jpeg)
-DWITH_Kexiv2=$(usex jpeg)
-   -DWITH_KActivities=$(usex kde)
-DWITH_QMobipocket=$(usex mobi)
-DWITH_LibSpectre=$(usex postscript)
-DWITH_PopplerQt4=$(usex pdf)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index ebb2860..4962501 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -14,7 +14,7 @@ inherit kde4-base
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
 
 DEPEND="
media-libs/freetype
@@ -30,7 +30,6 @@ DEPEND="
$(add_kdeapps_dep libkexiv2)
virtual/jpeg:0
)
-   kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
postscript? ( app-text/libspectre )
@@ -40,6 +39,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(
+   -DWITH_KActivities=OFF
-DWITH_CHM=$(usex chm)
-DWITH_QCA2=$(usex crypt)
-DWITH_DjVuLibre=$(usex djvu)
@@ -47,7 +47,6 @@ src_configure() {
-DWITH_EPub=$(usex ebook)
-DWITH_JPEG=$(usex jpeg)
-DWITH_Kexiv2=$(usex jpeg)
-   -DWITH_KActivities=$(usex kde)
-DWITH_QMobipocket=$(usex mobi)
-DWITH_LibSpectre=$(usex postscript)
-DWITH_PopplerQt4=$(usex pdf)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-07-25 Thread Michael Palimaka 
commit: dbf1dc49c4cb29246bcb6e97cd62f2a4a29f8ff4
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Jul 24 23:13:51 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jul 25 15:35:51 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dbf1dc49

kde-apps/okular: Add USE=speech, fix DEPENDs, improve DESCRIPTION

Delete obsolete comments, qimageblitz function was re-implemented.
Simplify autotests commenting.

Package-Manager: portage-2.2.28

 kde-apps/okular/metadata.xml |  9 +
 kde-apps/okular/okular-5..ebuild | 25 +++--
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 33cf4df..49b367d 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -1,15 +1,16 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   k...@gentoo.org
+   Gentoo KDE Project
+   

Enable support for Microsoft Compiled HTML 
Help files
DPI detection support for PDF rendering via 
x11-libs/libkscreen
Add E-Book support
Enable kactivities support
Add mobipocket support
+   Enable text-to-speech support

-   
-   k...@gentoo.org
-   Gentoo KDE Project
-   
 

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
index f36fd65..ff291a9 100644
--- a/kde-apps/okular/okular-5..ebuild
+++ b/kde-apps/okular/okular-5..ebuild
@@ -9,16 +9,12 @@ KDE_TEST="forceoptional"
 EGIT_BRANCH="frameworks"
 inherit kde5
 
-DESCRIPTION="Universal document viewer based on KPDF"
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript +tiff"
-# TODO:
-# * Deactivated media-libs/qimageblitz as there is no Qt5 version yet
-# * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet
-# * Not packaged: Qt5TextToSpeech
+IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
 
-COMMON_DEPEND="
+DEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
@@ -27,7 +23,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep khtml)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
@@ -53,21 +48,14 @@ COMMON_DEPEND="
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
postscript? ( app-text/libspectre )
+   speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
 "
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
kde5_src_prepare
-
-   if ! use test ; then
-   sed -i \
-   -e "/^add_subdirectory.*conf\/autotests/ s/^/#DONT/" \
-   CMakeLists.txt || die
-   fi
+   use test || cmake_comment_add_subdirectory conf/autotests
 }
 
 src_configure() {
@@ -80,6 +68,7 @@ src_configure() {
$(cmake-utils_use_find_package mobi QMobipocket)
$(cmake-utils_use_find_package pdf Poppler)
$(cmake-utils_use_find_package postscript LibSpectre)
+   $(cmake-utils_use_find_package speech Qt5TextToSpeech)
$(cmake-utils_use_find_package tiff TIFF)
)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-06-19 Thread Michael Palimaka 
commit: ab2dcbe096fea49f2f61b96e7e34d8ed50e9d692
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Jun 19 13:17:40 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 19 13:29:02 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab2dcbe0

kde-apps/okular: Add back USE=mobi

Package-Manager: portage-2.2.28

 kde-apps/okular/okular-5..ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
index ef0f70e..f36fd65 100644
--- a/kde-apps/okular/okular-5..ebuild
+++ b/kde-apps/okular/okular-5..ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +jpeg +pdf +postscript +tiff"
+IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript +tiff"
 # TODO:
 # * Deactivated media-libs/qimageblitz as there is no Qt5 version yet
 # * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet
@@ -50,6 +50,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep libkexiv2)
virtual/jpeg:0
)
+   mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
postscript? ( app-text/libspectre )
tiff? ( media-libs/tiff:0 )
@@ -76,6 +77,7 @@ src_configure() {
$(cmake-utils_use_find_package djvu DjVuLibre)
$(cmake-utils_use_find_package ebook EPub)
$(cmake-utils_use_find_package jpeg KF5KExiv2)
+   $(cmake-utils_use_find_package mobi QMobipocket)
$(cmake-utils_use_find_package pdf Poppler)
$(cmake-utils_use_find_package postscript LibSpectre)
$(cmake-utils_use_find_package tiff TIFF)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-04-07 Thread Johannes Huber 
commit: 90c7d0c3339a5549dfb9b845e94fc534446efa35
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Apr  7 19:21:57 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Apr  7 19:23:27 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=90c7d0c3

kde-apps/okular: EAPI 6

Package-Manager: portage-2.2.28

 kde-apps/okular/okular-16.03.90.ebuild  | 31 ++---
 kde-apps/okular/okular-16.04.49..ebuild | 31 ++---
 kde-apps/okular/okular-.ebuild  | 31 ++---
 3 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/kde-apps/okular/okular-16.03.90.ebuild 
b/kde-apps/okular/okular-16.03.90.ebuild
index e498013..2503d18 100644
--- a/kde-apps/okular/okular-16.03.90.ebuild
+++ b/kde-apps/okular/okular-16.03.90.ebuild
@@ -2,17 +2,16 @@
 # 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 ~x86"
 IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
@@ -40,19 +39,19 @@ 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 kde KActivities)
-   $(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_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_KActivities=$(usex kde)
+   -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-16.04.49..ebuild 
b/kde-apps/okular/okular-16.04.49..ebuild
index 953a1b9..c9d9c67 100644
--- a/kde-apps/okular/okular-16.04.49..ebuild
+++ b/kde-apps/okular/okular-16.04.49..ebuild
@@ -2,17 +2,16 @@
 # 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=""
 IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
@@ -40,19 +39,19 @@ 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 kde KActivities)
-   $(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_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_KActivities=$(usex kde)
+   -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

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-03-08 Thread Michael Palimaka 
commit: 174fdea6477bbd4173ca6357c864363206734239
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 11 21:32:58 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Mar  9 05:01:24 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=174fdea6

kde-apps/okular: Bump KF5 min version, EAPI=6

Package-Manager: portage-2.2.27

 kde-apps/okular/okular-5..ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
index b22f607..4518dc2 100644
--- a/kde-apps/okular/okular-5..ebuild
+++ b/kde-apps/okular/okular-5..ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 EGIT_BRANCH="frameworks"
-FRAMEWORKS_MINIMAL="5.18.0"
+FRAMEWORKS_MINIMAL="5.19.0"
 inherit kde5
 
 DESCRIPTION="Universal document viewer based on KPDF"
@@ -79,7 +79,7 @@ src_configure() {
$(cmake-utils_use_find_package jpeg KF5KExiv2)
$(cmake-utils_use_find_package pdf Poppler)
$(cmake-utils_use_find_package postscript LibSpectre)
-   $(cmake-utils_use_find_package tiff)
+   $(cmake-utils_use_find_package tiff TIFF)
)
 
kde5_src_configure

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-01-31 Thread Michael Palimaka 
commit: 9b27ab2d916d89a9476f9faf8fa1f2112bf991be
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Jan 31 01:31:54 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jan 31 15:52:57 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b27ab2d

kde-apps/okular: Fix DEPENDs, tests succeed

Package-Manager: portage-2.2.27

 kde-apps/okular/okular-5..ebuild | 31 ---
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
index ad53d64..e08e661 100644
--- a/kde-apps/okular/okular-5..ebuild
+++ b/kde-apps/okular/okular-5..ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
 EGIT_BRANCH="frameworks"
 FRAMEWORKS_MINIMAL="5.18.0"
 inherit kde5
@@ -12,15 +13,17 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
 KEYWORDS=""
-IUSE="chm crypt dpi djvu ebook +jpeg +pdf +postscript +tiff"
+IUSE="chm crypt djvu ebook +jpeg +pdf +postscript +tiff"
 # TODO:
-# * Deactivated dependency media-libs/qimageblitz as there is no Qt5 version
-#   yet
+# * Deactivated media-libs/qimageblitz as there is no Qt5 version yet
+# * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet
+# * Not packaged: Qt5TextToSpeech
 
-DEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
@@ -39,12 +42,10 @@ DEPEND="
dev-qt/qtwidgets:5
media-libs/freetype
media-libs/phonon[qt5]
-   sys-devel/gettext
sys-libs/zlib
chm? ( dev-libs/chmlib )
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
-   dpi? ( $(add_plasma_dep libkscreen) )
ebook? ( app-text/ebook-tools )
jpeg? (
$(add_kdeapps_dep libkexiv2)
@@ -54,18 +55,26 @@ DEPEND="
postscript? ( app-text/libspectre )
tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}
-   !kde-base/okular:4
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
 "
-RESTRICT=test
-# test 2: parttest hangs
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+   kde5_src_prepare
+
+   if ! use test ; then
+   sed -i \
+   -e "/^add_subdirectory.*conf\/autotests/ s/^/#DONT/" \
+   CMakeLists.txt || die
+   fi
+}
 
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package chm CHM)
$(cmake-utils_use_find_package crypt Qca-qt5)
$(cmake-utils_use_find_package djvu DjVuLibre)
-   $(cmake-utils_use_find_package dpi KF5Screen)
$(cmake-utils_use_find_package ebook EPub)
$(cmake-utils_use_find_package jpeg KF5KExiv2)
$(cmake-utils_use_find_package pdf Poppler)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2016-01-10 Thread Michael Palimaka 
commit: 74a7974d7a8653f5e471cbb537b7312614df6540
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Jan 10 15:11:27 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jan 10 15:11:27 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=74a7974d

kde-apps/okular: Depend on >=KF-5.18

Package-Manager: portage-2.2.26

 kde-apps/okular/okular-5..ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
index bad8f93..ad53d64 100644
--- a/kde-apps/okular/okular-5..ebuild
+++ b/kde-apps/okular/okular-5..ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 KDE_HANDBOOK="forceoptional"
 EGIT_BRANCH="frameworks"
+FRAMEWORKS_MINIMAL="5.18.0"
 inherit kde5
 
 DESCRIPTION="Universal document viewer based on KPDF"

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2015-12-09 Thread Michael Palimaka 
commit: b4ab4d43cdb6e64c9ee8bc9ecdb06540c5a18a49
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Dec  9 23:17:24 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Dec 10 06:41:56 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b4ab4d43

kde-apps/okular: Add USE=kde, fix CamelCase switch

Package-Manager: portage-2.2.24

 kde-apps/okular/metadata.xml| 1 +
 kde-apps/okular/okular-15.11.90.ebuild  | 6 --
 kde-apps/okular/okular-15.12.49..ebuild | 6 --
 kde-apps/okular/okular-.ebuild  | 6 --
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index d12e0cd..11fa99e 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -5,6 +5,7 @@
Enable support for Microsoft Compiled HTML 
Help files
DPI detection support for PDF rendering via 
x11-libs/libkscreen
Add E-Book support
+   Enable kactivities support
Add mobipocket support

kde

diff --git a/kde-apps/okular/okular-15.11.90.ebuild 
b/kde-apps/okular/okular-15.11.90.ebuild
index df20169..6486c13 100644
--- a/kde-apps/okular/okular-15.11.90.ebuild
+++ b/kde-apps/okular/okular-15.11.90.ebuild
@@ -15,7 +15,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 ~x86"
-IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
 
 DEPEND="
media-libs/freetype
@@ -30,6 +30,7 @@ DEPEND="
$(add_kdeapps_dep libkexiv2)
virtual/jpeg:0
)
+   kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
postscript? ( app-text/libspectre )
@@ -46,7 +47,8 @@ src_configure() {
$(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 kde KActivities)
+   $(cmake-utils_use_with mobi QMobipocket)
$(cmake-utils_use_with postscript LibSpectre)
$(cmake-utils_use_with pdf PopplerQt4)
$(cmake-utils_use_with pdf Poppler)

diff --git a/kde-apps/okular/okular-15.12.49..ebuild 
b/kde-apps/okular/okular-15.12.49..ebuild
index 6950150..e800fd5 100644
--- a/kde-apps/okular/okular-15.12.49..ebuild
+++ b/kde-apps/okular/okular-15.12.49..ebuild
@@ -15,7 +15,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=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
 
 DEPEND="
media-libs/freetype
@@ -30,6 +30,7 @@ DEPEND="
$(add_kdeapps_dep libkexiv2)
virtual/jpeg:0
)
+   kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
postscript? ( app-text/libspectre )
@@ -46,7 +47,8 @@ src_configure() {
$(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 kde KActivities)
+   $(cmake-utils_use_with mobi QMobipocket)
$(cmake-utils_use_with postscript LibSpectre)
$(cmake-utils_use_with pdf PopplerQt4)
$(cmake-utils_use_with pdf Poppler)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 6950150..e800fd5 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -15,7 +15,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=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
 
 DEPEND="
media-libs/freetype
@@ -30,6 +30,7 @@ DEPEND="
$(add_kdeapps_dep libkexiv2)
virtual/jpeg:0
)
+   kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? (

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2015-04-16 Thread Michael Palimaka 
commit: e94bc0a13ca9dde47fa0d4348e7a9de174fded27
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Apr 16 17:48:07 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Apr 16 17:48:07 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e94bc0a1

[kde-apps/okular] Punt bogus deps wrt bug #546118.

Package-Manager: portage-2.2.18

 .../okular/files/okular-5.-tests-optional.patch | 21 -
 kde-apps/okular/okular-5..ebuild|  8 +---
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/kde-apps/okular/files/okular-5.-tests-optional.patch 
b/kde-apps/okular/files/okular-5.-tests-optional.patch
deleted file mode 100644
index 309c092..000
--- a/kde-apps/okular/files/okular-5.-tests-optional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 a/CMakeLists.txt   2015-02-23 23:12:24.420881583 +0100
-+++ b/CMakeLists.txt   2015-02-23 23:17:07.173858317 +0100
-@@ -18,7 +18,17 @@
- include(ECMAddTests)
- 
- 
--find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets 
PrintSupport Svg Qml Quick)
-+find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Widgets PrintSupport 
Svg Qml Quick)
-+
-+find_package(Qt5Test CONFIG QUIET)
-+set_package_properties(Qt5Test PROPERTIES
-+PURPOSE Required for tests
-+TYPE OPTIONAL)
-+add_feature_info(Qt5Test Qt5Test_FOUND Required for building tests)
-+if (NOT Qt5Test_FOUND)
-+set(BUILD_TESTING OFF CACHE BOOL Build the testing tree.)
-+endif()
-+
- find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
- if (NOT Qt5TextToSpeech_FOUND)
- message(STATUS Qt5TextToSpeech not found, speech features will be 
disabled)

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
index e898d1c..24767e2 100644
--- a/kde-apps/okular/okular-5..ebuild
+++ b/kde-apps/okular/okular-5..ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK=true
+KDE_PUNT_BOGUS_DEPS=true
 EGIT_BRANCH=frameworks
 inherit kde5
 
@@ -59,13 +60,6 @@ RDEPEND=${DEPEND}
 RESTRICT=test
 # test 2: parttest hangs
 
-src_prepare() {
-   # whole patch should be upstreamed, doesn't work in PATCHES
-   epatch ${FILESDIR}/${PN}-5.-tests-optional.patch
-
-   kde5_src_prepare
-}
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package chm CHM)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/

2015-02-24 Thread Johannes Huber 
commit: 3934ef31af8d45b378ad9f0fe4c0338f7a58a391
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Mon Feb 23 22:22:10 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Tue Feb 24 22:35:02 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3934ef31

[kde-apps/okular] Fix tests-optional.patch

Package-Manager: portage-2.2.17

---
 .../files/okular-5.-tests-optional.patch   | 31 ++
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/kde-apps/okular/files/okular-5.-tests-optional.patch 
b/kde-apps/okular/files/okular-5.-tests-optional.patch
index 9494cbc..309c092 100644
--- a/kde-apps/okular/files/okular-5.-tests-optional.patch
+++ b/kde-apps/okular/files/okular-5.-tests-optional.patch
@@ -1,24 +1,21 @@
 a/CMakeLists.txt   2015-01-25 14:40:33.935040773 +0100
-+++ b/CMakeLists.txt   2015-01-25 14:42:53.287043165 +0100
-@@ -20,7 +20,7 @@
+--- a/CMakeLists.txt   2015-02-23 23:12:24.420881583 +0100
 b/CMakeLists.txt   2015-02-23 23:17:07.173858317 +0100
+@@ -18,7 +18,17 @@
  include(ECMAddTests)
  
  
 -find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets 
PrintSupport Svg Qml Quick)
 +find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Widgets PrintSupport 
Svg Qml Quick)
- find_package(KF5 REQUIRED COMPONENTS
- Activities
- Archive
-@@ -68,7 +68,11 @@
- add_subdirectory( ui )
- add_subdirectory( shell )
- add_subdirectory( generators )
--add_subdirectory( autotests )
 +
-+if(BUILD_TESTING)
-+find_package(Qt5Test CONFIG REQUIRED)
-+add_subdirectory( autotests )
++find_package(Qt5Test CONFIG QUIET)
++set_package_properties(Qt5Test PROPERTIES
++PURPOSE Required for tests
++TYPE OPTIONAL)
++add_feature_info(Qt5Test Qt5Test_FOUND Required for building tests)
++if (NOT Qt5Test_FOUND)
++set(BUILD_TESTING OFF CACHE BOOL Build the testing tree.)
 +endif()
- 
- add_subdirectory(doc)
- 
++
+ find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
+ if (NOT Qt5TextToSpeech_FOUND)
+ message(STATUS Qt5TextToSpeech not found, speech features will be 
disabled)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2015-02-17 Thread Michael Palimaka 
commit: 7aaa3efe0d462a87ccc38ee9fd6bc7da333651e3
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Feb 17 13:48:18 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Feb 17 13:48:18 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7aaa3efe

[kde-apps/okular] Add missing dependency SLOT.

Package-Manager: portage-2.2.14

---
 kde-apps/okular/okular-14.12.1.ebuild | 2 +-
 kde-apps/okular/okular-14.12.2.ebuild | 2 +-
 kde-apps/okular/okular-5..ebuild  | 2 +-
 kde-apps/okular/okular-.ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/okular-14.12.1.ebuild 
b/kde-apps/okular/okular-14.12.1.ebuild
index a368b72..4c8544a 100644
--- a/kde-apps/okular/okular-14.12.1.ebuild
+++ b/kde-apps/okular/okular-14.12.1.ebuild
@@ -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}
 

diff --git a/kde-apps/okular/okular-14.12.2.ebuild 
b/kde-apps/okular/okular-14.12.2.ebuild
index a368b72..4c8544a 100644
--- a/kde-apps/okular/okular-14.12.2.ebuild
+++ b/kde-apps/okular/okular-14.12.2.ebuild
@@ -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}
 

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
index c1e7170..e898d1c 100644
--- a/kde-apps/okular/okular-5..ebuild
+++ b/kde-apps/okular/okular-5..ebuild
@@ -51,7 +51,7 @@ DEPEND=
)
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
postscript? ( app-text/libspectre )
-   tiff? ( media-libs/tiff )
+   tiff? ( media-libs/tiff:0 )
 
 RDEPEND=${DEPEND}
!kde-base/okular:4

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 41d0f11..e5f73a0 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -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}

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2015-01-28 Thread Johannes Huber 
commit: a44d7663a553acf21e18cea3c2c6387e86d1ffe7
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Jan 28 23:51:41 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Jan 28 23:51:41 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a44d7663

[kde-apps/okular] Adjust use dependencies to handle =app-crypt/qca-2.1

Package-Manager: portage-2.2.15

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

diff --git a/kde-apps/okular/okular-14.12.1.ebuild 
b/kde-apps/okular/okular-14.12.1.ebuild
index 8902df4..a368b72 100644
--- a/kde-apps/okular/okular-14.12.1.ebuild
+++ b/kde-apps/okular/okular-14.12.1.ebuild
@@ -22,7 +22,7 @@ DEPEND=
media-libs/qimageblitz
sys-libs/zlib
chm? ( dev-libs/chmlib )
-   crypt? ( app-crypt/qca:2 )
+   crypt? ( app-crypt/qca:2[qt4] )
djvu? ( app-text/djvu )
dpi? ( x11-libs/libkscreen:4 )
ebook? ( app-text/ebook-tools )

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 048efaf..41d0f11 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -22,7 +22,7 @@ DEPEND=
media-libs/qimageblitz
sys-libs/zlib
chm? ( dev-libs/chmlib )
-   crypt? ( app-crypt/qca:2 )
+   crypt? ( app-crypt/qca:2[qt4] )
djvu? ( app-text/djvu )
dpi? ( x11-libs/libkscreen:4 )
ebook? ( app-text/ebook-tools )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

2015-01-28 Thread Michael Palimaka 
commit: 13fd83c572ae6c5453e137fbdb445ea8b6b9de65
Author: Eugene Shalygin eugene.shalygin AT gmail DOT com
AuthorDate: Wed Jan 28 14:08:14 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Jan 28 14:10:47 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=13fd83c5

[kde-apps/okular] Upstream has switched to find_package wrt bug #536858.

Upstream commit: 93918b1ec8f585dd135db1449e1b22b878f82fbc

Package-Manager: portage-2.2.14

---
 kde-apps/okular/okular-5..ebuild | 27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
index 54e3c2e..12f2da3 100644
--- a/kde-apps/okular/okular-5..ebuild
+++ b/kde-apps/okular/okular-5..ebuild
@@ -11,11 +11,8 @@ inherit kde5
 DESCRIPTION=Universal document viewer based on KPDF
 HOMEPAGE=http://okular.kde.org 
http://www.kde.org/applications/graphics/okular;
 KEYWORDS=
-IUSE=chm crypt dpi djvu ebook +jpeg +pdf +tiff
+IUSE=chm crypt dpi djvu ebook +jpeg +pdf +postscript +tiff
 # TODO:
-# * Temporarily deactivated +postscript USE as upstream has it deactivated.
-#   postscript? ( app-text/libspectre )
-#  $(cmake-utils_use_with postscript LibSpectre)
 # * Deactivated dependency media-libs/qimageblitz as there is no Qt5 version
 #   yet
 
@@ -48,8 +45,12 @@ DEPEND=
djvu? ( app-text/djvu )
dpi? ( $(add_kdeplasma_dep libkscreen) )
ebook? ( app-text/ebook-tools )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? (
+   $(add_kdeapps_dep libkexiv2)
+   virtual/jpeg:0
+   )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+   postscript? ( app-text/libspectre )
tiff? ( media-libs/tiff )
 
 RDEPEND=${DEPEND}
@@ -67,15 +68,15 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_with chm)
-   $(cmake-utils_use_with crypt QCA2)
-   $(cmake-utils_use_with djvu DjVuLibre)
+   $(cmake-utils_use_find_package chm CHM)
+   $(cmake-utils_use_find_package crypt Qca-qt5)
+   $(cmake-utils_use_find_package djvu DjVuLibre)
$(cmake-utils_use_find_package dpi KF5Screen)
-   $(cmake-utils_use_with ebook EPub)
-   $(cmake-utils_use_with jpeg)
-   $(cmake-utils_use_with jpeg Kexiv2)
-   $(cmake-utils_use_with pdf Poppler)
-   $(cmake-utils_use_with tiff)
+   $(cmake-utils_use_find_package ebook EPub)
+   $(cmake-utils_use_find_package jpeg KF5KExiv2)
+   $(cmake-utils_use_find_package pdf Poppler)
+   $(cmake-utils_use_find_package postscript LibSpectre)
+   $(cmake-utils_use_find_package tiff)
)
 
kde5_src_configure

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

2015-01-25 Thread Johannes Huber 
commit: 4b1760efed8701b8029c6ca973087a131c410d7a
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Fri Jan 23 19:32:59 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sun Jan 25 19:24:43 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4b1760ef

[kde-apps/okular] Make tests optional

---
 .../files/okular-5.-tests-optional.patch   | 24 ++
 kde-apps/okular/okular-5..ebuild   |  7 +++
 2 files changed, 31 insertions(+)

diff --git a/kde-apps/okular/files/okular-5.-tests-optional.patch 
b/kde-apps/okular/files/okular-5.-tests-optional.patch
new file mode 100644
index 000..9494cbc
--- /dev/null
+++ b/kde-apps/okular/files/okular-5.-tests-optional.patch
@@ -0,0 +1,24 @@
+--- a/CMakeLists.txt   2015-01-25 14:40:33.935040773 +0100
 b/CMakeLists.txt   2015-01-25 14:42:53.287043165 +0100
+@@ -20,7 +20,7 @@
+ include(ECMAddTests)
+ 
+ 
+-find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets 
PrintSupport Svg Qml Quick)
++find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Widgets PrintSupport 
Svg Qml Quick)
+ find_package(KF5 REQUIRED COMPONENTS
+ Activities
+ Archive
+@@ -68,7 +68,11 @@
+ add_subdirectory( ui )
+ add_subdirectory( shell )
+ add_subdirectory( generators )
+-add_subdirectory( autotests )
++
++if(BUILD_TESTING)
++find_package(Qt5Test CONFIG REQUIRED)
++add_subdirectory( autotests )
++endif()
+ 
+ add_subdirectory(doc)
+ 

diff --git a/kde-apps/okular/okular-5..ebuild 
b/kde-apps/okular/okular-5..ebuild
index ec6c217..54e3c2e 100644
--- a/kde-apps/okular/okular-5..ebuild
+++ b/kde-apps/okular/okular-5..ebuild
@@ -58,6 +58,13 @@ RDEPEND=${DEPEND}
 RESTRICT=test
 # test 2: parttest hangs
 
+src_prepare() {
+   # whole patch should be upstreamed, doesn't work in PATCHES
+   epatch ${FILESDIR}/${PN}-5.-tests-optional.patch
+
+   kde5_src_prepare
+}
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with chm)