diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-12-29 02:22:46 +0100 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2016-01-02 02:25:01 +1100 |
| commit | 59e0da953c3e0b25d90d698632d032aca75faec6 (patch) | |
| tree | caed1cd745f1516524549d1389f6a0e3efc53805 | |
| parent | kde-apps/kdenlive: Drop old (diff) | |
| download | gentoo-59e0da953c3e0b25d90d698632d032aca75faec6.tar.gz gentoo-59e0da953c3e0b25d90d698632d032aca75faec6.tar.bz2 gentoo-59e0da953c3e0b25d90d698632d032aca75faec6.zip | |
kde-apps/kdenlive: Add patch to initialise kcrash
Package-Manager: portage-2.2.24
| -rw-r--r-- | kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch | 63 | ||||
| -rw-r--r-- | kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild | 3 |
2 files changed, 66 insertions, 0 deletions
diff --git a/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch b/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch new file mode 100644 index 000000000000..87bc3f7f83fd --- /dev/null +++ b/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch @@ -0,0 +1,63 @@ +From: Jean-Baptiste Mardelle <jb@kdenlive.org> +Date: Sun, 27 Dec 2015 23:25:59 +0000 +Subject: Open KDE's crash handler on crash (bump KF5 requirement to 5.15) +X-Git-Url: http://quickgit.kde.org/?p=kdenlive.git&a=commitdiff&h=57cb1121da1d7106ebdb73a814c27e54b1711332 +--- +Open KDE's crash handler on crash (bump KF5 requirement to 5.15) +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,9 +74,8 @@ + + find_package(Qt5 CONFIG REQUIRED Core DBus Test Widgets Script Svg) + +-find_package(KF5 REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets +- DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools) +- ++find_package(KF5 5.15 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigWidgets ++ DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools Crash) + + # Search MLT package. + find_package(MLT ${MLT_MIN_VERSION} REQUIRED) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -261,6 +261,7 @@ + KF5::Notifications + KF5::TextWidgets + KF5::IconThemes ++ KF5::Crash + ${Qt5_LIBRARIES} + Qt5::Svg + ${OPENGL_LIBRARIES} + +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -22,6 +22,7 @@ + #include "mainwindow.h" + + #include <KAboutData> ++#include <KCrash> + #include <QDebug> + + #include <QUrl> //new +@@ -37,7 +38,7 @@ + #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) + QCoreApplication::setAttribute(Qt::AA_X11InitThreads); + #endif +- ++ + KLocalizedString::setApplicationDomain("kdenlive"); + + // Init application +@@ -93,6 +94,7 @@ + + // Register DBus service + KDBusService programDBusService; ++ KCrash::initialize(); + + // see if we are starting with session management + if (qApp->isSessionRestored()){ + diff --git a/kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild b/kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild index 24c406c89968..9701bdf859b1 100644 --- a/kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild +++ b/kde-apps/kdenlive/kdenlive-15.12.0-r1.ebuild @@ -21,6 +21,7 @@ RDEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) $(add_frameworks_dep kdbusaddons) $(add_frameworks_dep kguiaddons) $(add_frameworks_dep ki18n) @@ -55,6 +56,8 @@ DEPEND="${RDEPEND} sys-devel/gettext " +PATCHES=( "${FILESDIR}/${PN}-15.12.0-kcrash.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package v4l LibV4L2) |