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 42C11138334 for ; Mon, 28 Oct 2019 23:57:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CC04E0921; Mon, 28 Oct 2019 23:57:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1259BE0921 for ; Mon, 28 Oct 2019 23:57:02 +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 B044534C51D for ; Mon, 28 Oct 2019 23:57:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42F5471A for ; Mon, 28 Oct 2019 23:56:58 +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: <1572303937.79cad2e9942d9115a9f28682d8ce564c0947f5b1.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 79cad2e9942d9115a9f28682d8ce564c0947f5b1 X-VCS-Branch: master Date: Mon, 28 Oct 2019 23:56:58 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b422d66-041d-4c3f-9407-c5c442256dc8 X-Archives-Hash: 4740639383149effcfa876bf47c9cd28 commit: 79cad2e9942d9115a9f28682d8ce564c0947f5b1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 28 23:05:37 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 28 23:05:37 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=79cad2e9 kde-plasma/plasma-workspace: Add subslot operator on qtgui Upstream commit a0a80c67f91cd52baf8f349b71f587c09820054e After Qt change: https://codereview.qt-project.org/c/qt/qtbase/+/273182 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild | 3 ++- kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild index c713f79983..4712dbfc55 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild @@ -14,6 +14,7 @@ IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop sys REQUIRED_USE="gps? ( geolocation )" +# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0 COMMON_DEPEND=" $(add_frameworks_dep kactivities) $(add_frameworks_dep kactivities-stats) @@ -60,7 +61,7 @@ COMMON_DEPEND=" $(add_plasma_dep libkworkspace) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') + $(add_qt_dep qtgui 'jpeg' '' '5=') $(add_qt_dep qtnetwork) $(add_qt_dep qtsql) $(add_qt_dep qtwidgets) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 374e9ed179..e60dcf067b 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -14,6 +14,7 @@ IUSE="appstream +calendar feedback geolocation gps qalculate qrcode +semantic-de REQUIRED_USE="gps? ( geolocation )" +# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0 COMMON_DEPEND=" $(add_frameworks_dep kactivities) $(add_frameworks_dep kactivities-stats) @@ -60,7 +61,7 @@ COMMON_DEPEND=" $(add_plasma_dep libkworkspace) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') + $(add_qt_dep qtgui 'jpeg' '' '5=') $(add_qt_dep qtnetwork) $(add_qt_dep qtsql) $(add_qt_dep qtwidgets)