[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/files/, kde-apps/kdenlive/

[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/files/, kde-apps/kdenlive/

[Michael Palimaka]

commit:     d1d0cc1be0f8ed07985235742e8d42cb750a0176
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Dec 28 00:31:23 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 16:22:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1d0cc1b

kde-apps/kdenlive: Fix DEPENDs, add patch to initialise kcrash

Package-Manager: portage-2.2.24

 .../kdenlive/files/kdenlive-15.12.0-kcrash.patch   | 63 ++++++++++++++++++++++
 kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild    |  5 +-
 kde-apps/kdenlive/kdenlive-9999.ebuild             |  3 +-
 3 files changed, 69 insertions(+), 2 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 0000000..87bc3f7
--- /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.49.9999.ebuild b/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild
index 10cf67f..6cc33a8 100644
--- a/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-15.12.49.9999.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)
@@ -46,7 +47,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	>=media-libs/mlt-0.9.8[ffmpeg,-kde,kdenlive,melt,-qt4,sdl,xml]
+	>=media-libs/mlt-0.9.8[ffmpeg,kdenlive,melt,qt5,sdl,xml]
 	virtual/ffmpeg[encode,sdl,X]
 	virtual/opengl
 	v4l? ( media-libs/libv4l )
@@ -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)

diff --git a/kde-apps/kdenlive/kdenlive-9999.ebuild b/kde-apps/kdenlive/kdenlive-9999.ebuild
index 10cf67f..d54dc64 100644
--- a/kde-apps/kdenlive/kdenlive-9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-9999.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)
@@ -46,7 +47,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	>=media-libs/mlt-0.9.8[ffmpeg,-kde,kdenlive,melt,-qt4,sdl,xml]
+	>=media-libs/mlt-0.9.8[ffmpeg,kdenlive,melt,qt5,sdl,xml]
 	virtual/ffmpeg[encode,sdl,X]
 	virtual/opengl
 	v4l? ( media-libs/libv4l )

[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/files/, kde-apps/kdenlive/

[Andreas Sturmlechner]

commit:     c678c0ebbd69bdba0281438cc084a3bf5a9c7dbb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 11:10:39 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 11:12:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c678c0eb

kde-apps/kdenlive: Fix build with Qt 5.14

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kdenlive-19.08.3-qt-5.14-2.patch         | 32 ++++++++++++++++++++++
 kde-apps/kdenlive/kdenlive-19.11.80.ebuild         |  2 ++
 2 files changed, 34 insertions(+)

diff --git a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch
new file mode 100644
index 0000000000..13d2fd39d4
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,32 @@
+From caf88fd638f67b505aa28521b6abda430f03e7c8 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Thu, 31 Oct 2019 20:33:54 +0100
+Subject: [PATCH] Fix build with Qt 5.14
+
+std::hash<QString> is already specialized in Qt 5.14 [1], so we need
+to avoid redifining it with this version.
+
+[1] 4469e36d7203a55a4e158a50f0e9effc3f2fa3c2 in qtbase.git
+---
+ src/definitions.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/definitions.h b/src/definitions.h
+index a55ec8df7..d2f67815b 100644
+--- a/src/definitions.h
++++ b/src/definitions.h
+@@ -252,10 +252,12 @@ QDebug operator<<(QDebug qd, const ItemInfo &info);
+ 
+ // we provide hash function for qstring and QPersistentModelIndex
+ namespace std {
++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ template <> struct hash<QString>
+ {
+     std::size_t operator()(const QString &k) const { return qHash(k); }
+ };
++#endif
+ template <> struct hash<QPersistentModelIndex>
+ {
+     std::size_t operator()(const QPersistentModelIndex &k) const { return qHash(k); }
+-- 
+2.17.1

diff --git a/kde-apps/kdenlive/kdenlive-19.11.80.ebuild b/kde-apps/kdenlive/kdenlive-19.11.80.ebuild
index 852cb478fe..264abfeff9 100644
--- a/kde-apps/kdenlive/kdenlive-19.11.80.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.11.80.ebuild
@@ -66,6 +66,8 @@ RDEPEND="${DEPEND}
 	virtual/ffmpeg[encode,sdl,X]
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-19.08.3-qt-5.14-2.patch ) # not yet upstream
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package freesound Qt5WebKitWidgets)