commit: 3aea2e9156416c9bc22e04c70b08e3e67c35abff Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sat Sep 17 17:49:54 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Sep 17 17:50:09 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3aea2e91
kde-plasma/kwin: backport patch from upstream solving build failure with Qt 5.6 Package-Manager: portage-2.3.0 kde-plasma/kwin/files/kwin-5.7.95-qt56.patch | 52 ++++++++++++++++++++++++++++ kde-plasma/kwin/kwin-5.7.95.ebuild | 2 ++ 2 files changed, 54 insertions(+) diff --git a/kde-plasma/kwin/files/kwin-5.7.95-qt56.patch b/kde-plasma/kwin/files/kwin-5.7.95-qt56.patch new file mode 100644 index 0000000..18eb671 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.7.95-qt56.patch @@ -0,0 +1,52 @@ +From 99f491e79914da85213a899574ae36ad2e3c097c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <se...@kde.org> +Date: Thu, 15 Sep 2016 13:59:25 +0200 +Subject: [PATCH] parent qaction in test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Summary: +My compiler doesn't seem to like this constructor, it bails out with the +following error: + +/home/sebas/kf5/src/kde/workspace/kwin/autotests/integration/globalshortcuts_test.cpp: +In member function ‘void GlobalShortcutsTest::testConsumedShift()’: +/home/sebas/kf5/src/kde/workspace/kwin/autotests/integration/globalshortcuts_test.cpp:79:40: +error: no matching function for call to ‘QAction::QAction()’ + QScopedPointer<QAction> action(new QAction); + ^~~~~~~ + +Using this as first argument fixes the build on my machine. + +Test Plan: screenedges test fails, others pass. (this screenedges test failure seems unrelated) + +Reviewers: graesslin + +Reviewed By: graesslin + +Subscribers: luebking, kwin + +Tags: #kwin + +Differential Revision: https://phabricator.kde.org/D2782 +--- + autotests/integration/globalshortcuts_test.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autotests/integration/globalshortcuts_test.cpp b/autotests/integration/globalshortcuts_test.cpp +index 69dae83..ab46fbd 100644 +--- a/autotests/integration/globalshortcuts_test.cpp ++++ b/autotests/integration/globalshortcuts_test.cpp +@@ -76,7 +76,7 @@ void GlobalShortcutsTest::testConsumedShift() + { + // this test verifies that a shortcut with a consumed shift modifier triggers + // create the action +- QScopedPointer<QAction> action(new QAction); ++ QScopedPointer<QAction> action(new QAction(nullptr)); + action->setProperty("componentName", QStringLiteral(KWIN_NAME)); + action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift")); + QSignalSpy triggeredSpy(action.data(), &QAction::triggered); +-- +2.7.3 + diff --git a/kde-plasma/kwin/kwin-5.7.95.ebuild b/kde-plasma/kwin/kwin-5.7.95.ebuild index 1e8ce63..bb812ee 100644 --- a/kde-plasma/kwin/kwin-5.7.95.ebuild +++ b/kde-plasma/kwin/kwin-5.7.95.ebuild @@ -90,6 +90,8 @@ DEPEND="${COMMON_DEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${P}-qt56.patch" ) + src_prepare() { kde5_src_prepare use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
