From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BC451396D9 for ; Wed, 25 Oct 2017 17:32:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E330E0CEB; Wed, 25 Oct 2017 17:32:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A99EE0CEB for ; Wed, 25 Oct 2017 17:32:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1335433BEC7 for ; Wed, 25 Oct 2017 17:32:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98B5631A for ; Wed, 25 Oct 2017 17:32:13 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1508952724.45bb6d81c180673d867ce0efba4cfbee75b48512.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/, kde-plasma/kdeplasma-addons/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild X-VCS-Directories: kde-plasma/kdeplasma-addons/files/ kde-plasma/kdeplasma-addons/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 45bb6d81c180673d867ce0efba4cfbee75b48512 X-VCS-Branch: master Date: Wed, 25 Oct 2017 17:32:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b9f54088-2ecf-4937-8732-74b04add064e X-Archives-Hash: b7a3a057d8e2948cd2db6791b8cf7912 commit: 45bb6d81c180673d867ce0efba4cfbee75b48512 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 25 17:18:19 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Oct 25 17:32:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45bb6d81 kde-plasma/kdeplasma-addons: Fix build with Qt-5.7 Gentoo-bug: 635412 Package-Manager: Portage-2.3.12, Repoman-2.3.3 .../files/kdeplasma-addons-5.11.2-qt-5.7.patch | 26 ++++++++++++++++++++++ .../kdeplasma-addons-5.11.2.ebuild | 2 ++ 2 files changed, 28 insertions(+) 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 index 00000000000..b4afa3c04f5 --- /dev/null +++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch @@ -0,0 +1,26 @@ +From 961078337c823e22691d74925a698d1f28f20ac0 Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik +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 + diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild index 881f2a38fd2..79320367019 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild @@ -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)