summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-04-19 15:33:18 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-19 15:33:37 +0200
commit1d72a0a1cd87d7401ef850a98513c7e080d7d2e1 (patch)
treecb93e377edcbd097f32d02b97f3a1a9a5d851b10 /kde-apps/okular
parentsys-kernel/gentoo-sources: Linux patch 4.16.3 (diff)
downloadgentoo-1d72a0a1cd87d7401ef850a98513c7e080d7d2e1.tar.gz
gentoo-1d72a0a1cd87d7401ef850a98513c7e080d7d2e1.tar.bz2
gentoo-1d72a0a1cd87d7401ef850a98513c7e080d7d2e1.zip
kde-apps: Add KDE Applications 18.04.0
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'kde-apps/okular')
-rw-r--r--kde-apps/okular/Manifest1
-rw-r--r--kde-apps/okular/files/okular-18.03.90-kcrash.patch60
-rw-r--r--kde-apps/okular/okular-18.04.0.ebuild103
3 files changed, 164 insertions, 0 deletions
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index bd6e0e5df8c8..32067a4d76da 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1 +1,2 @@
DIST okular-17.12.3.tar.xz 5737804 BLAKE2B 959f83cbf7713333319400abefe70390b75bd1fdf5d907c362e4e36d65fba3115d6c4091ae04c2058e557a6df1a8587cb5adbfd345cc4702439db2d837d4ed2d SHA512 803e69a918a385798905eeda15afa817ff145406947abc793c62c26879ed9b98ca601adedeb5133972be50e679cc31cc2ad8ccc97c084c64a3cad791a778d361
+DIST okular-18.04.0.tar.xz 5777760 BLAKE2B 421d16d2e28fc996b96f6572abe0b251d8b935f62a4f1d2337d85fe63aa71551ef27aa81dff6e4cfeb5b6cda1e386b4e7661a2f5ef668fa3367d543a819fb4a9 SHA512 01ae6f4f4370e16fe67b04837e2ff4000d12d0934ae4c442d137cc99ade2dfca376b4b630aecb85a8efd727801f13fbef432ec37a08dec86739c994e202c79a9
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 000000000000..39ce8c3b0354
--- /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 <aacid@kde.org>
+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 <kwindowsystem.h>
+ #include <QApplication>
+ #include <KAboutData>
++#include <KCrash>
+ #include <KMessageBox>
+ #include <QCommandLineParser>
+ #include <QCommandLineOption>
+@@ -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.04.0.ebuild b/kde-apps/okular/okular-18.04.0.ebuild
new file mode 100644
index 000000000000..94de9fbb3559
--- /dev/null
+++ b/kde-apps/okular/okular-18.04.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share 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 kcrash)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kpty)
+ $(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? (
+ $(add_frameworks_dep khtml)
+ dev-libs/chmlib
+ )
+ crypt? ( app-crypt/qca:2[qt5(+)] )
+ djvu? ( app-text/djvu )
+ epub? ( app-text/ebook-tools )
+ image-backend? (
+ $(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] )
+ plucker? ( virtual/jpeg:0 )
+ postscript? ( app-text/libspectre )
+ share? ( $(add_frameworks_dep purpose) )
+ speech? ( $(add_qt_dep qtspeech) )
+ tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+ image-backend? ( $(add_frameworks_dep kimageformats) )
+ mobile? (
+ $(add_frameworks_dep kirigami)
+ $(add_qt_dep qtquickcontrols)
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+
+src_prepare() {
+ kde5_src_prepare
+ use mobile || cmake_comment_add_subdirectory mobile
+ 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 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)
+ $(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)
+ )
+
+ kde5_src_configure
+}
+
+src_test() {
+ # mainshelltest hangs, chmgeneratortest fails, bug #603116
+ # parttest hangs, bug #641728
+ local myctestargs=(
+ -E "(mainshelltest|chmgeneratortest|parttest)"
+ )
+
+ kde5_src_test
+}