commit: 79cad2e9942d9115a9f28682d8ce564c0947f5b1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Oct 28 23:05:37 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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)
