summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-10-29 00:05:37 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-10-29 00:05:37 +0100
commit79cad2e9942d9115a9f28682d8ce564c0947f5b1 (patch)
treeb59fdda978c10b2064a6c75698e60cb7637b44c9
parent64758450eed88b6fc70790e2826e26ed85422800 (diff)
downloadkde-79cad2e9942d9115a9f28682d8ce564c0947f5b1.tar.gz
kde-79cad2e9942d9115a9f28682d8ce564c0947f5b1.tar.bz2
kde-79cad2e9942d9115a9f28682d8ce564c0947f5b1.zip
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@gentoo.org>
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild3
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild3
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 c713f799838..4712dbfc554 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 374e9ed179f..e60dcf067b1 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)