Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/frameworkintegration/
Date: Mon, 28 Oct 2019 23:57:04
Message-Id: 1572305860.beb17acd0c7ad6118d3b5a0bafe6bc8123b628ad.asturm@gentoo
1 commit: beb17acd0c7ad6118d3b5a0bafe6bc8123b628ad
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 28 23:37:40 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 28 23:37:40 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=beb17acd
7
8 kde-frameworks/frameworkintegration: Add subslot operator on qtwidgets
9
10 Upstream commit 50593c5618998535cc9f482aa25565c5aeb368ce
11 After Qt change: https://codereview.qt-project.org/c/qt/qtbase/+/254494/
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-frameworks/frameworkintegration/frameworkintegration-9999.ebuild | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19 diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
20 index 8079df8779..95ab7cbc86 100644
21 --- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
22 +++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
23 @@ -12,6 +12,7 @@ LICENSE="LGPL-2+"
24 KEYWORDS=""
25 IUSE="appstream X"
26
27 +# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
28 DEPEND="
29 $(add_frameworks_dep kconfig)
30 $(add_frameworks_dep kconfigwidgets)
31 @@ -22,7 +23,7 @@ DEPEND="
32 $(add_frameworks_dep kpackage)
33 $(add_frameworks_dep kwidgetsaddons)
34 $(add_qt_dep qtgui)
35 - $(add_qt_dep qtwidgets)
36 + $(add_qt_dep qtwidgets '' '' '5=')
37 appstream? (
38 app-admin/packagekit-qt
39 dev-libs/appstream[qt5]