kde-plasma/kdeplasma-addons: Fix build with Qt-5.7
authorAndreas Sturmlechner <asturm@gentoo.org>
Wed, 25 Oct 2017 17:18:19 +0000 (19:18 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Wed, 25 Oct 2017 17:32:04 +0000 (19:32 +0200)
Gentoo-bug: 635412
Package-Manager: Portage-2.3.12, Repoman-2.3.3

kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch [new file with mode: 0644]
kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild

diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch
new file mode 100644 (file)
index 0000000..b4afa3c
--- /dev/null
@@ -0,0 +1,26 @@
+From 961078337c823e22691d74925a698d1f28f20ac0 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Wed, 25 Oct 2017 12:36:08 +0200
+Subject: Use wakeOne() instead of notify_one()
+
+The latter was only introduced in Qt 5.8
+---
+ runners/dictionary/dictionarymatchengine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runners/dictionary/dictionarymatchengine.cpp b/runners/dictionary/dictionarymatchengine.cpp
+index 85346d5..27d2228 100644
+--- a/runners/dictionary/dictionarymatchengine.cpp
++++ b/runners/dictionary/dictionarymatchengine.cpp
+@@ -73,7 +73,7 @@ void DictionaryMatchEngine::dataUpdated(const QString &source, const Plasma::Dat
+         /* Because of QString's CoW semantics, we don't have to worry about
+          * the overhead of assigning this to every item. */
+         data->definition = definition;
+-        data->waitCondition.notify_one();
++        data->waitCondition.wakeOne();
+     }
+     m_wordLock.unlock();
+ }
+-- 
+cgit v0.11.2
+
index 881f2a38fd29f093cc043f846fe9368b83735825..79320367019f37800d18192c3fa1c3e47dc2f2ff 100644 (file)
@@ -47,6 +47,8 @@ RDEPEND="${DEPEND}
        !kde-plasma/kdeplasma-addons:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.7.patch" )
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package share KDEExperimentalPurpose)