1 |
commit: 59e0da953c3e0b25d90d698632d032aca75faec6 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Dec 29 01:22:46 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 1 15:25:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e0da95 |
7 |
|
8 |
kde-apps/kdenlive: Add patch to initialise kcrash |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
.../kdenlive/files/kdenlive-15.12.0-kcrash.patch | 63 ++++++++++++++++++++++ |
13 |
kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild | 3 ++ |
14 |
2 files changed, 66 insertions(+) |
15 |
|
16 |
diff --git a/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch b/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch |
17 |
new file mode 100644 |
18 |
index 0000000..87bc3f7 |
19 |
--- /dev/null |
20 |
+++ b/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch |
21 |
@@ -0,0 +1,63 @@ |
22 |
+From: Jean-Baptiste Mardelle <jb@××××××××.org> |
23 |
+Date: Sun, 27 Dec 2015 23:25:59 +0000 |
24 |
+Subject: Open KDE's crash handler on crash (bump KF5 requirement to 5.15) |
25 |
+X-Git-Url: http://quickgit.kde.org/?p=kdenlive.git&a=commitdiff&h=57cb1121da1d7106ebdb73a814c27e54b1711332 |
26 |
+--- |
27 |
+Open KDE's crash handler on crash (bump KF5 requirement to 5.15) |
28 |
+--- |
29 |
+ |
30 |
+ |
31 |
+--- a/CMakeLists.txt |
32 |
++++ b/CMakeLists.txt |
33 |
+@@ -74,9 +74,8 @@ |
34 |
+ |
35 |
+ find_package(Qt5 CONFIG REQUIRED Core DBus Test Widgets Script Svg) |
36 |
+ |
37 |
+-find_package(KF5 REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets |
38 |
+- DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools) |
39 |
+- |
40 |
++find_package(KF5 5.15 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigWidgets |
41 |
++ DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools Crash) |
42 |
+ |
43 |
+ # Search MLT package. |
44 |
+ find_package(MLT ${MLT_MIN_VERSION} REQUIRED) |
45 |
+ |
46 |
+--- a/src/CMakeLists.txt |
47 |
++++ b/src/CMakeLists.txt |
48 |
+@@ -261,6 +261,7 @@ |
49 |
+ KF5::Notifications |
50 |
+ KF5::TextWidgets |
51 |
+ KF5::IconThemes |
52 |
++ KF5::Crash |
53 |
+ ${Qt5_LIBRARIES} |
54 |
+ Qt5::Svg |
55 |
+ ${OPENGL_LIBRARIES} |
56 |
+ |
57 |
+--- a/src/main.cpp |
58 |
++++ b/src/main.cpp |
59 |
+@@ -22,6 +22,7 @@ |
60 |
+ #include "mainwindow.h" |
61 |
+ |
62 |
+ #include <KAboutData> |
63 |
++#include <KCrash> |
64 |
+ #include <QDebug> |
65 |
+ |
66 |
+ #include <QUrl> //new |
67 |
+@@ -37,7 +38,7 @@ |
68 |
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) |
69 |
+ QCoreApplication::setAttribute(Qt::AA_X11InitThreads); |
70 |
+ #endif |
71 |
+- |
72 |
++ |
73 |
+ KLocalizedString::setApplicationDomain("kdenlive"); |
74 |
+ |
75 |
+ // Init application |
76 |
+@@ -93,6 +94,7 @@ |
77 |
+ |
78 |
+ // Register DBus service |
79 |
+ KDBusService programDBusService; |
80 |
++ KCrash::initialize(); |
81 |
+ |
82 |
+ // see if we are starting with session management |
83 |
+ if (qApp->isSessionRestored()){ |
84 |
+ |
85 |
|
86 |
diff --git a/kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild b/kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild |
87 |
index 24c406c..9701bdf 100644 |
88 |
--- a/kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild |
89 |
+++ b/kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild |
90 |
@@ -21,6 +21,7 @@ RDEPEND=" |
91 |
$(add_frameworks_dep kconfig) |
92 |
$(add_frameworks_dep kconfigwidgets) |
93 |
$(add_frameworks_dep kcoreaddons) |
94 |
+ $(add_frameworks_dep kcrash) |
95 |
$(add_frameworks_dep kdbusaddons) |
96 |
$(add_frameworks_dep kguiaddons) |
97 |
$(add_frameworks_dep ki18n) |
98 |
@@ -55,6 +56,8 @@ DEPEND="${RDEPEND} |
99 |
sys-devel/gettext |
100 |
" |
101 |
|
102 |
+PATCHES=( "${FILESDIR}/${PN}-15.12.0-kcrash.patch" ) |
103 |
+ |
104 |
src_configure() { |
105 |
local mycmakeargs=( |
106 |
$(cmake-utils_use_find_package v4l LibV4L2) |