diff options
| -rw-r--r-- | kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch | 32 | ||||
| -rw-r--r-- | kde-apps/kdenlive/kdenlive-19.11.80.ebuild | 2 |
2 files changed, 34 insertions, 0 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 new file mode 100644 index 00000000000..13d2fd39d4b --- /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 852cb478fe0..264abfeff9a 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) |