public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/, kde-plasma/kdeplasma-addons/files/
Date: Wed, 25 Oct 2017 17:32:13 +0000 (UTC)	[thread overview]
Message-ID: <1508952724.45bb6d81c180673d867ce0efba4cfbee75b48512.asturm@gentoo> (raw)

commit:     45bb6d81c180673d867ce0efba4cfbee75b48512
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 17:18:19 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <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
+

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)


             reply	other threads:[~2017-10-25 17:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-25 17:32 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-12-17 23:49 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/, kde-plasma/kdeplasma-addons/files/ Andreas Sturmlechner
2021-11-23 14:59 Andreas Sturmlechner
2022-07-26 12:08 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1508952724.45bb6d81c180673d867ce0efba4cfbee75b48512.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox