Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/, kde-plasma/kdeplasma-addons/files/
Date: Wed, 25 Oct 2017 17:32:17
Message-Id: 1508952724.45bb6d81c180673d867ce0efba4cfbee75b48512.asturm@gentoo
1 commit: 45bb6d81c180673d867ce0efba4cfbee75b48512
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 25 17:18:19 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 25 17:32:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45bb6d81
7
8 kde-plasma/kdeplasma-addons: Fix build with Qt-5.7
9
10 Gentoo-bug: 635412
11 Package-Manager: Portage-2.3.12, Repoman-2.3.3
12
13 .../files/kdeplasma-addons-5.11.2-qt-5.7.patch | 26 ++++++++++++++++++++++
14 .../kdeplasma-addons-5.11.2.ebuild | 2 ++
15 2 files changed, 28 insertions(+)
16
17 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
18 new file mode 100644
19 index 00000000000..b4afa3c04f5
20 --- /dev/null
21 +++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch
22 @@ -0,0 +1,26 @@
23 +From 961078337c823e22691d74925a698d1f28f20ac0 Mon Sep 17 00:00:00 2001
24 +From: Kai Uwe Broulik <kde@××××××××××××××.de>
25 +Date: Wed, 25 Oct 2017 12:36:08 +0200
26 +Subject: Use wakeOne() instead of notify_one()
27 +
28 +The latter was only introduced in Qt 5.8
29 +---
30 + runners/dictionary/dictionarymatchengine.cpp | 2 +-
31 + 1 file changed, 1 insertion(+), 1 deletion(-)
32 +
33 +diff --git a/runners/dictionary/dictionarymatchengine.cpp b/runners/dictionary/dictionarymatchengine.cpp
34 +index 85346d5..27d2228 100644
35 +--- a/runners/dictionary/dictionarymatchengine.cpp
36 ++++ b/runners/dictionary/dictionarymatchengine.cpp
37 +@@ -73,7 +73,7 @@ void DictionaryMatchEngine::dataUpdated(const QString &source, const Plasma::Dat
38 + /* Because of QString's CoW semantics, we don't have to worry about
39 + * the overhead of assigning this to every item. */
40 + data->definition = definition;
41 +- data->waitCondition.notify_one();
42 ++ data->waitCondition.wakeOne();
43 + }
44 + m_wordLock.unlock();
45 + }
46 +--
47 +cgit v0.11.2
48 +
49
50 diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild
51 index 881f2a38fd2..79320367019 100644
52 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild
53 +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild
54 @@ -47,6 +47,8 @@ RDEPEND="${DEPEND}
55 !kde-plasma/kdeplasma-addons:4
56 "
57
58 +PATCHES=( "${FILESDIR}/${P}-qt-5.7.patch" )
59 +
60 src_configure() {
61 local mycmakeargs=(
62 $(cmake-utils_use_find_package share KDEExperimentalPurpose)