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-plasma/kwin/
Date: Tue, 31 Aug 2021 12:54:21
Message-Id: 1630414433.448c682b054e4ba1f320667e24553f9cc1ceb079.asturm@gentoo
1 commit: 448c682b054e4ba1f320667e24553f9cc1ceb079
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 30 11:05:17 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 31 12:53:53 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=448c682b
7
8 kde-plasma/kwin: RDEPEND-block >=media-libs/libglvnd-1.3.4
9
10 At the same time, DEPEND on <media-libs/libglvnd-1.3.4 to help
11 Portage with dependency resolution, even if this is not a direct
12 dependency of KWin.
13
14 Bug: https://bugs.gentoo.org/810511
15 Package-Manager: Portage-3.0.22, Repoman-3.0.3
16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
17
18 kde-plasma/kwin/kwin-5.22.49.9999.ebuild | 3 +++
19 kde-plasma/kwin/kwin-9999.ebuild | 3 +++
20 2 files changed, 6 insertions(+)
21
22 diff --git a/kde-plasma/kwin/kwin-5.22.49.9999.ebuild b/kde-plasma/kwin/kwin-5.22.49.9999.ebuild
23 index 3c083c2889..f2c44e3e91 100644
24 --- a/kde-plasma/kwin/kwin-5.22.49.9999.ebuild
25 +++ b/kde-plasma/kwin/kwin-5.22.49.9999.ebuild
26 @@ -79,6 +79,7 @@ COMMON_DEPEND="
27 "
28 # TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
29 RDEPEND="${COMMON_DEPEND}
30 + !>=media-libs/libglvnd-1.3.4
31 >=dev-qt/qtquickcontrols-${QTMIN}:5
32 >=dev-qt/qtquickcontrols2-${QTMIN}:5
33 >=dev-qt/qtvirtualkeyboard-${QTMIN}:5
34 @@ -90,9 +91,11 @@ RDEPEND="${COMMON_DEPEND}
35 )
36 multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
37 "
38 +# FIXME: <media-libs/libglvnd-1.3.4 not a dep, only temp. workaround for bug #810511
39 DEPEND="${COMMON_DEPEND}
40 >=dev-qt/designer-${QTMIN}:5
41 >=dev-qt/qtconcurrent-${QTMIN}:5
42 + <media-libs/libglvnd-1.3.4
43 x11-base/xorg-proto
44 test? (
45 >=dev-libs/wayland-protocols-1.19
46
47 diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
48 index 9aa0cd7f82..c897dbd9e6 100644
49 --- a/kde-plasma/kwin/kwin-9999.ebuild
50 +++ b/kde-plasma/kwin/kwin-9999.ebuild
51 @@ -78,6 +78,7 @@ COMMON_DEPEND="
52 "
53 # TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
54 RDEPEND="${COMMON_DEPEND}
55 + !>=media-libs/libglvnd-1.3.4
56 >=dev-qt/qtquickcontrols-${QTMIN}:5
57 >=dev-qt/qtquickcontrols2-${QTMIN}:5
58 >=dev-qt/qtvirtualkeyboard-${QTMIN}:5
59 @@ -89,9 +90,11 @@ RDEPEND="${COMMON_DEPEND}
60 )
61 multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
62 "
63 +# FIXME: <media-libs/libglvnd-1.3.4 not a dep, only temp. workaround for bug #810511
64 DEPEND="${COMMON_DEPEND}
65 >=dev-qt/designer-${QTMIN}:5
66 >=dev-qt/qtconcurrent-${QTMIN}:5
67 + <media-libs/libglvnd-1.3.4
68 x11-base/xorg-proto
69 test? (
70 >=dev-libs/wayland-protocols-1.19