commit: 228cad863fc6a75564afeafd41a7dfef22d43683
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 8 12:00:57 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 12:00:57 2018 +0000
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.9999.ebuild | 6 ++-
kde-apps/okular/okular-9999.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 0000000000..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 <aa...@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.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.9999.ebuild
b/kde-apps/okular/okular-18.04.49.9999.ebuild
index 1eba56641a..80d688c222 100644
--- a/kde-apps/okular/okular-18.04.49.9999.ebuild
+++ b/kde-apps/okular/okular-18.04.49.9999.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-9999.ebuild
b/kde-apps/okular/okular-9999.ebuild
index 1eba56641a..0596092ab1 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.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)
