| 1 |
commit: 79cad2e9942d9115a9f28682d8ce564c0947f5b1 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 28 23:05:37 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 28 23:05:37 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=79cad2e9 |
| 7 |
|
| 8 |
kde-plasma/plasma-workspace: Add subslot operator on qtgui |
| 9 |
|
| 10 |
Upstream commit a0a80c67f91cd52baf8f349b71f587c09820054e |
| 11 |
After Qt change: https://codereview.qt-project.org/c/qt/qtbase/+/273182 |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild | 3 ++- |
| 17 |
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 3 ++- |
| 18 |
2 files changed, 4 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index c713f79983..4712dbfc55 100644 |
| 22 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild |
| 23 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild |
| 24 |
@@ -14,6 +14,7 @@ IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop sys |
| 25 |
|
| 26 |
REQUIRED_USE="gps? ( geolocation )" |
| 27 |
|
| 28 |
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0 |
| 29 |
COMMON_DEPEND=" |
| 30 |
$(add_frameworks_dep kactivities) |
| 31 |
$(add_frameworks_dep kactivities-stats) |
| 32 |
@@ -60,7 +61,7 @@ COMMON_DEPEND=" |
| 33 |
$(add_plasma_dep libkworkspace) |
| 34 |
$(add_qt_dep qtdbus) |
| 35 |
$(add_qt_dep qtdeclarative 'widgets') |
| 36 |
- $(add_qt_dep qtgui 'jpeg') |
| 37 |
+ $(add_qt_dep qtgui 'jpeg' '' '5=') |
| 38 |
$(add_qt_dep qtnetwork) |
| 39 |
$(add_qt_dep qtsql) |
| 40 |
$(add_qt_dep qtwidgets) |
| 41 |
|
| 42 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 43 |
index 374e9ed179..e60dcf067b 100644 |
| 44 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 45 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 46 |
@@ -14,6 +14,7 @@ IUSE="appstream +calendar feedback geolocation gps qalculate qrcode +semantic-de |
| 47 |
|
| 48 |
REQUIRED_USE="gps? ( geolocation )" |
| 49 |
|
| 50 |
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0 |
| 51 |
COMMON_DEPEND=" |
| 52 |
$(add_frameworks_dep kactivities) |
| 53 |
$(add_frameworks_dep kactivities-stats) |
| 54 |
@@ -60,7 +61,7 @@ COMMON_DEPEND=" |
| 55 |
$(add_plasma_dep libkworkspace) |
| 56 |
$(add_qt_dep qtdbus) |
| 57 |
$(add_qt_dep qtdeclarative 'widgets') |
| 58 |
- $(add_qt_dep qtgui 'jpeg') |
| 59 |
+ $(add_qt_dep qtgui 'jpeg' '' '5=') |
| 60 |
$(add_qt_dep qtnetwork) |
| 61 |
$(add_qt_dep qtsql) |
| 62 |
$(add_qt_dep qtwidgets) |
Archives