commit: 31768721ec10e12b216c0f76870c440114c53094 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Dec 6 20:40:05 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 7 11:42:39 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=31768721
kde-apps/kdenlive: Fix build with Qt 5.14.0 RC Upstream commit 699bba9e555aece12b17656152ada929e9fd787d Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/kdenlive-19.08.3-qt-5.14-2.patch | 32 ------------------ .../kdenlive/files/kdenlive-19.12.0-qt-5.14.patch | 39 ++++++++++++++++++++++ kde-apps/kdenlive/kdenlive-19.12.0.ebuild | 2 ++ 3 files changed, 41 insertions(+), 32 deletions(-) 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 deleted file mode 100644 index 13d2fd39d4..0000000000 --- a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch +++ /dev/null @@ -1,32 +0,0 @@ -From caf88fd638f67b505aa28521b6abda430f03e7c8 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <[email protected]> -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/files/kdenlive-19.12.0-qt-5.14.patch b/kde-apps/kdenlive/files/kdenlive-19.12.0-qt-5.14.patch new file mode 100644 index 0000000000..59dc7ffef5 --- /dev/null +++ b/kde-apps/kdenlive/files/kdenlive-19.12.0-qt-5.14.patch @@ -0,0 +1,39 @@ +From 699bba9e555aece12b17656152ada929e9fd787d Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <[email protected]> +Date: Fri, 6 Dec 2019 15:42:10 +0100 +Subject: Fix build with Qt 5.14 RC + +Add missing includes that are no longer pulled transitively + +Differential Revision: https://phabricator.kde.org/D25784 +--- + src/audiomixer/mixerwidget.cpp | 1 + + src/doc/kdenlivedoc.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/audiomixer/mixerwidget.cpp b/src/audiomixer/mixerwidget.cpp +index 08ff50b..d8d6b38 100644 +--- a/src/audiomixer/mixerwidget.cpp ++++ b/src/audiomixer/mixerwidget.cpp +@@ -41,6 +41,7 @@ + #include <QSpinBox> + #include <QDoubleSpinBox> + #include <QLabel> ++#include <QMouseEvent> + #include <QStyle> + #include <QFontDatabase> + +diff --git a/src/doc/kdenlivedoc.h b/src/doc/kdenlivedoc.h +index 7b56308..64cd7b4 100644 +--- a/src/doc/kdenlivedoc.h ++++ b/src/doc/kdenlivedoc.h +@@ -25,6 +25,7 @@ + #ifndef KDENLIVEDOC_H + #define KDENLIVEDOC_H + ++#include <QAction> + #include <QDir> + #include <QList> + #include <QMap> +-- +cgit v1.1 diff --git a/kde-apps/kdenlive/kdenlive-19.12.0.ebuild b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild index ebe92f742c..383bc18ca2 100644 --- a/kde-apps/kdenlive/kdenlive-19.12.0.ebuild +++ b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild @@ -66,6 +66,8 @@ RDEPEND="${DEPEND} virtual/ffmpeg[encode,sdl,X] " +PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch ) # release/19.12 branch + src_configure() { local mycmakeargs=( $(cmake_use_find_package freesound Qt5WebKitWidgets)
