1 |
commit: d1d0cc1be0f8ed07985235742e8d42cb750a0176 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Dec 28 00:31:23 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 1 16:22:42 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1d0cc1b |
7 |
|
8 |
kde-apps/kdenlive: Fix DEPENDs, 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.49.9999.ebuild | 5 +- |
14 |
kde-apps/kdenlive/kdenlive-9999.ebuild | 3 +- |
15 |
3 files changed, 69 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch b/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch |
18 |
new file mode 100644 |
19 |
index 0000000..87bc3f7 |
20 |
--- /dev/null |
21 |
+++ b/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch |
22 |
@@ -0,0 +1,63 @@ |
23 |
+From: Jean-Baptiste Mardelle <jb@××××××××.org> |
24 |
+Date: Sun, 27 Dec 2015 23:25:59 +0000 |
25 |
+Subject: Open KDE's crash handler on crash (bump KF5 requirement to 5.15) |
26 |
+X-Git-Url: http://quickgit.kde.org/?p=kdenlive.git&a=commitdiff&h=57cb1121da1d7106ebdb73a814c27e54b1711332 |
27 |
+--- |
28 |
+Open KDE's crash handler on crash (bump KF5 requirement to 5.15) |
29 |
+--- |
30 |
+ |
31 |
+ |
32 |
+--- a/CMakeLists.txt |
33 |
++++ b/CMakeLists.txt |
34 |
+@@ -74,9 +74,8 @@ |
35 |
+ |
36 |
+ find_package(Qt5 CONFIG REQUIRED Core DBus Test Widgets Script Svg) |
37 |
+ |
38 |
+-find_package(KF5 REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets |
39 |
+- DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools) |
40 |
+- |
41 |
++find_package(KF5 5.15 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigWidgets |
42 |
++ DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools Crash) |
43 |
+ |
44 |
+ # Search MLT package. |
45 |
+ find_package(MLT ${MLT_MIN_VERSION} REQUIRED) |
46 |
+ |
47 |
+--- a/src/CMakeLists.txt |
48 |
++++ b/src/CMakeLists.txt |
49 |
+@@ -261,6 +261,7 @@ |
50 |
+ KF5::Notifications |
51 |
+ KF5::TextWidgets |
52 |
+ KF5::IconThemes |
53 |
++ KF5::Crash |
54 |
+ ${Qt5_LIBRARIES} |
55 |
+ Qt5::Svg |
56 |
+ ${OPENGL_LIBRARIES} |
57 |
+ |
58 |
+--- a/src/main.cpp |
59 |
++++ b/src/main.cpp |
60 |
+@@ -22,6 +22,7 @@ |
61 |
+ #include "mainwindow.h" |
62 |
+ |
63 |
+ #include <KAboutData> |
64 |
++#include <KCrash> |
65 |
+ #include <QDebug> |
66 |
+ |
67 |
+ #include <QUrl> //new |
68 |
+@@ -37,7 +38,7 @@ |
69 |
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) |
70 |
+ QCoreApplication::setAttribute(Qt::AA_X11InitThreads); |
71 |
+ #endif |
72 |
+- |
73 |
++ |
74 |
+ KLocalizedString::setApplicationDomain("kdenlive"); |
75 |
+ |
76 |
+ // Init application |
77 |
+@@ -93,6 +94,7 @@ |
78 |
+ |
79 |
+ // Register DBus service |
80 |
+ KDBusService programDBusService; |
81 |
++ KCrash::initialize(); |
82 |
+ |
83 |
+ // see if we are starting with session management |
84 |
+ if (qApp->isSessionRestored()){ |
85 |
+ |
86 |
|
87 |
diff --git a/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild b/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild |
88 |
index 10cf67f..6cc33a8 100644 |
89 |
--- a/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild |
90 |
+++ b/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild |
91 |
@@ -21,6 +21,7 @@ RDEPEND=" |
92 |
$(add_frameworks_dep kconfig) |
93 |
$(add_frameworks_dep kconfigwidgets) |
94 |
$(add_frameworks_dep kcoreaddons) |
95 |
+ $(add_frameworks_dep kcrash) |
96 |
$(add_frameworks_dep kdbusaddons) |
97 |
$(add_frameworks_dep kguiaddons) |
98 |
$(add_frameworks_dep ki18n) |
99 |
@@ -46,7 +47,7 @@ RDEPEND=" |
100 |
dev-qt/qtsvg:5 |
101 |
dev-qt/qtwidgets:5 |
102 |
dev-qt/qtxml:5 |
103 |
- >=media-libs/mlt-0.9.8[ffmpeg,-kde,kdenlive,melt,-qt4,sdl,xml] |
104 |
+ >=media-libs/mlt-0.9.8[ffmpeg,kdenlive,melt,qt5,sdl,xml] |
105 |
virtual/ffmpeg[encode,sdl,X] |
106 |
virtual/opengl |
107 |
v4l? ( media-libs/libv4l ) |
108 |
@@ -55,6 +56,8 @@ DEPEND="${RDEPEND} |
109 |
sys-devel/gettext |
110 |
" |
111 |
|
112 |
+PATCHES=( "${FILESDIR}/${PN}-15.12.0-kcrash.patch" ) |
113 |
+ |
114 |
src_configure() { |
115 |
local mycmakeargs=( |
116 |
$(cmake-utils_use_find_package v4l LibV4L2) |
117 |
|
118 |
diff --git a/kde-apps/kdenlive/kdenlive-9999.ebuild b/kde-apps/kdenlive/kdenlive-9999.ebuild |
119 |
index 10cf67f..d54dc64 100644 |
120 |
--- a/kde-apps/kdenlive/kdenlive-9999.ebuild |
121 |
+++ b/kde-apps/kdenlive/kdenlive-9999.ebuild |
122 |
@@ -21,6 +21,7 @@ RDEPEND=" |
123 |
$(add_frameworks_dep kconfig) |
124 |
$(add_frameworks_dep kconfigwidgets) |
125 |
$(add_frameworks_dep kcoreaddons) |
126 |
+ $(add_frameworks_dep kcrash) |
127 |
$(add_frameworks_dep kdbusaddons) |
128 |
$(add_frameworks_dep kguiaddons) |
129 |
$(add_frameworks_dep ki18n) |
130 |
@@ -46,7 +47,7 @@ RDEPEND=" |
131 |
dev-qt/qtsvg:5 |
132 |
dev-qt/qtwidgets:5 |
133 |
dev-qt/qtxml:5 |
134 |
- >=media-libs/mlt-0.9.8[ffmpeg,-kde,kdenlive,melt,-qt4,sdl,xml] |
135 |
+ >=media-libs/mlt-0.9.8[ffmpeg,kdenlive,melt,qt5,sdl,xml] |
136 |
virtual/ffmpeg[encode,sdl,X] |
137 |
virtual/opengl |
138 |
v4l? ( media-libs/libv4l ) |