| 1 |
commit: 228cad863fc6a75564afeafd41a7dfef22d43683 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 8 12:00:57 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 8 12:00:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=228cad86 |
| 7 |
|
| 8 |
kde-apps/okular: Initialise kcrash |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
| 11 |
|
| 12 |
kde-apps/okular/files/okular-18.03.90-kcrash.patch | 60 ++++++++++++++++++++++ |
| 13 |
kde-apps/okular/okular-18.03.90.ebuild | 6 ++- |
| 14 |
kde-apps/okular/okular-18.04.49.9999.ebuild | 6 ++- |
| 15 |
kde-apps/okular/okular-9999.ebuild | 1 + |
| 16 |
4 files changed, 71 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/okular/files/okular-18.03.90-kcrash.patch b/kde-apps/okular/files/okular-18.03.90-kcrash.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000000..39ce8c3b03 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-apps/okular/files/okular-18.03.90-kcrash.patch |
| 23 |
@@ -0,0 +1,60 @@ |
| 24 |
+From 3e25263d7709524e227207092533397ef65f2c82 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Albert Astals Cid <aacid@×××.org> |
| 26 |
+Date: Sun, 8 Apr 2018 11:50:18 +0200 |
| 27 |
+Subject: Use KCrash |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ CMakeLists.txt | 1 + |
| 31 |
+ shell/CMakeLists.txt | 2 +- |
| 32 |
+ shell/main.cpp | 3 +++ |
| 33 |
+ 3 files changed, 5 insertions(+), 1 deletion(-) |
| 34 |
+ |
| 35 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 36 |
+index 2b38cac..fd2d55e 100644 |
| 37 |
+--- a/CMakeLists.txt |
| 38 |
++++ b/CMakeLists.txt |
| 39 |
+@@ -53,6 +53,7 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS |
| 40 |
+ Config |
| 41 |
+ ConfigWidgets |
| 42 |
+ CoreAddons |
| 43 |
++ Crash |
| 44 |
+ DocTools |
| 45 |
+ IconThemes |
| 46 |
+ JS |
| 47 |
+diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt |
| 48 |
+index ec2f1ba..e85076d 100644 |
| 49 |
+--- a/shell/CMakeLists.txt |
| 50 |
++++ b/shell/CMakeLists.txt |
| 51 |
+@@ -27,7 +27,7 @@ ecm_add_app_icon(okular_SRCS ICONS ${ICONS_SRCS}) |
| 52 |
+ |
| 53 |
+ add_executable(okular ${okular_SRCS}) |
| 54 |
+ |
| 55 |
+-target_link_libraries(okular KF5::Parts KF5::WindowSystem) |
| 56 |
++target_link_libraries(okular KF5::Parts KF5::WindowSystem KF5::Crash) |
| 57 |
+ |
| 58 |
+ if(NOT WIN32) |
| 59 |
+ target_link_libraries(okular KF5::Activities) |
| 60 |
+diff --git a/shell/main.cpp b/shell/main.cpp |
| 61 |
+index 3f8dc43..de8a5c2 100644 |
| 62 |
+--- a/shell/main.cpp |
| 63 |
++++ b/shell/main.cpp |
| 64 |
+@@ -20,6 +20,7 @@ |
| 65 |
+ #include <kwindowsystem.h> |
| 66 |
+ #include <QApplication> |
| 67 |
+ #include <KAboutData> |
| 68 |
++#include <KCrash> |
| 69 |
+ #include <KMessageBox> |
| 70 |
+ #include <QCommandLineParser> |
| 71 |
+ #include <QCommandLineOption> |
| 72 |
+@@ -39,6 +40,8 @@ int main(int argc, char** argv) |
| 73 |
+ // set icon for shells which do not use desktop file metadata |
| 74 |
+ QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular"))); |
| 75 |
+ |
| 76 |
++ KCrash::initialize(); |
| 77 |
++ |
| 78 |
+ QCommandLineParser parser; |
| 79 |
+ // The KDE4 version accepted flags such as -unique with a single dash -> preserve compatibility |
| 80 |
+ parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); |
| 81 |
+-- |
| 82 |
+cgit v0.11.2 |
| 83 |
+ |
| 84 |
|
| 85 |
diff --git a/kde-apps/okular/okular-18.03.90.ebuild b/kde-apps/okular/okular-18.03.90.ebuild |
| 86 |
index 950d0b1d6a..60bde14510 100644 |
| 87 |
--- a/kde-apps/okular/okular-18.03.90.ebuild |
| 88 |
+++ b/kde-apps/okular/okular-18.03.90.ebuild |
| 89 |
@@ -21,6 +21,7 @@ DEPEND=" |
| 90 |
$(add_frameworks_dep kconfig) |
| 91 |
$(add_frameworks_dep kconfigwidgets) |
| 92 |
$(add_frameworks_dep kcoreaddons) |
| 93 |
+ $(add_frameworks_dep kcrash) |
| 94 |
$(add_frameworks_dep kio) |
| 95 |
$(add_frameworks_dep kjs) |
| 96 |
$(add_frameworks_dep kparts) |
| 97 |
@@ -63,7 +64,10 @@ RDEPEND="${DEPEND} |
| 98 |
) |
| 99 |
" |
| 100 |
|
| 101 |
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" ) |
| 102 |
+PATCHES=( |
| 103 |
+ "${FILESDIR}/${PN}-tests.patch" |
| 104 |
+ "${FILESDIR}/${P}-kcrash.patch" |
| 105 |
+) |
| 106 |
|
| 107 |
src_prepare() { |
| 108 |
kde5_src_prepare |
| 109 |
|
| 110 |
diff --git a/kde-apps/okular/okular-18.04.49.9999.ebuild b/kde-apps/okular/okular-18.04.49.9999.ebuild |
| 111 |
index 1eba56641a..80d688c222 100644 |
| 112 |
--- a/kde-apps/okular/okular-18.04.49.9999.ebuild |
| 113 |
+++ b/kde-apps/okular/okular-18.04.49.9999.ebuild |
| 114 |
@@ -21,6 +21,7 @@ DEPEND=" |
| 115 |
$(add_frameworks_dep kconfig) |
| 116 |
$(add_frameworks_dep kconfigwidgets) |
| 117 |
$(add_frameworks_dep kcoreaddons) |
| 118 |
+ $(add_frameworks_dep kcrash) |
| 119 |
$(add_frameworks_dep kio) |
| 120 |
$(add_frameworks_dep kjs) |
| 121 |
$(add_frameworks_dep kparts) |
| 122 |
@@ -63,7 +64,10 @@ RDEPEND="${DEPEND} |
| 123 |
) |
| 124 |
" |
| 125 |
|
| 126 |
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" ) |
| 127 |
+PATCHES=( |
| 128 |
+ "${FILESDIR}/${PN}-tests.patch" |
| 129 |
+ "${FILESDIR}/${PN}-18.03.90-kcrash.patch" |
| 130 |
+) |
| 131 |
|
| 132 |
src_prepare() { |
| 133 |
kde5_src_prepare |
| 134 |
|
| 135 |
diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild |
| 136 |
index 1eba56641a..0596092ab1 100644 |
| 137 |
--- a/kde-apps/okular/okular-9999.ebuild |
| 138 |
+++ b/kde-apps/okular/okular-9999.ebuild |
| 139 |
@@ -21,6 +21,7 @@ DEPEND=" |
| 140 |
$(add_frameworks_dep kconfig) |
| 141 |
$(add_frameworks_dep kconfigwidgets) |
| 142 |
$(add_frameworks_dep kcoreaddons) |
| 143 |
+ $(add_frameworks_dep kcrash) |
| 144 |
$(add_frameworks_dep kio) |
| 145 |
$(add_frameworks_dep kjs) |
| 146 |
$(add_frameworks_dep kparts) |
Archives