public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kscreen/
Date: Thu, 17 Jul 2025 17:55:53 +0000 (UTC)	[thread overview]
Message-ID: <1752773401.c2a271e4491db7a1167d5596c419e870d9c20e29.asturm@gentoo> (raw)

commit:     c2a271e4491db7a1167d5596c419e870d9c20e29
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Jul 17 11:46:56 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 17 17:30:01 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2a271e4

kde-plasma/kscreen: add missing wayland requirements

Upstream commit: 7b8ba62fed07826014234f901e6d97e77f219e54

Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/kde/pull/1058
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kscreen/kscreen-6.4.49.9999.ebuild | 19 +++++++++++++++----
 kde-plasma/kscreen/kscreen-9999.ebuild        | 19 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/kde-plasma/kscreen/kscreen-6.4.49.9999.ebuild b/kde-plasma/kscreen/kscreen-6.4.49.9999.ebuild
index b7c43eaba2..624aa1954e 100644
--- a/kde-plasma/kscreen/kscreen-6.4.49.9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-6.4.49.9999.ebuild
@@ -19,8 +19,9 @@ IUSE="X"
 # bug #580440, last checked 5.6.3
 RESTRICT="test"
 
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+# slot op: Uses Qt6GuiPrivate and Qt6WaylandClientPrivate
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,wayland,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
 	>=dev-qt/qtsensors-${QTMIN}:6
 	>=kde-frameworks/kcmutils-${KFMIN}:6
@@ -41,11 +42,21 @@ DEPEND="
 		x11-libs/libXi
 	)
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qt5compat-${QTMIN}:6[qml]
 	>=kde-plasma/kglobalacceld-${KDE_CATV}:6
 "
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/wayland-protocols-1.41
+"
+BDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[wayland]
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+"
+BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild b/kde-plasma/kscreen/kscreen-9999.ebuild
index d1499be4dd..26d11cbd21 100644
--- a/kde-plasma/kscreen/kscreen-9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-9999.ebuild
@@ -19,8 +19,9 @@ IUSE="X"
 # bug #580440, last checked 5.6.3
 RESTRICT="test"
 
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+# slot op: Uses Qt6GuiPrivate and Qt6WaylandClientPrivate
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,wayland,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
 	>=dev-qt/qtsensors-${QTMIN}:6
 	>=kde-frameworks/kcmutils-${KFMIN}:6
@@ -41,11 +42,21 @@ DEPEND="
 		x11-libs/libXi
 	)
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qt5compat-${QTMIN}:6[qml]
 	>=kde-plasma/kglobalacceld-${KDE_CATV}:6
 "
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/wayland-protocols-1.41
+"
+BDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[wayland]
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+"
+BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
 
 src_configure() {
 	local mycmakeargs=(


             reply	other threads:[~2025-07-17 17:55 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-17 17:55 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-17 17:55 [gentoo-commits] proj/kde:master commit in: kde-plasma/kscreen/ Andreas Sturmlechner
2025-07-17 17:55 Andreas Sturmlechner
2025-03-21 19:09 Andreas Sturmlechner
2025-03-16 23:10 Andreas Sturmlechner
2025-03-16 15:21 Sam James
2024-09-22 20:13 Andreas Sturmlechner
2023-12-16 12:34 Andreas Sturmlechner
2023-09-18 12:50 Andreas Sturmlechner
2023-02-21 17:03 Andreas Sturmlechner
2022-10-09 16:39 Andreas Sturmlechner
2022-09-03 13:05 Andreas Sturmlechner
2020-03-02 17:16 Andreas Sturmlechner
2019-09-08 18:23 Andreas Sturmlechner
2018-02-25 19:50 Andreas Sturmlechner
2018-02-25 19:08 Andreas Sturmlechner
2016-11-22 19:12 Johannes Huber
2016-11-05 12:10 Johannes Huber
2016-04-20  8:48 Johannes Huber
2016-04-20  7:54 Johannes Huber
2016-03-20 14:47 Michael Palimaka
2015-05-13 17:35 Michael Palimaka
2015-04-16 17:16 Michael Palimaka
2015-01-31 23:51 Johannes Huber
2015-01-27 13:25 Manuel Rüger
2015-01-08 23:25 Manuel Rüger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1752773401.c2a271e4491db7a1167d5596c419e870d9c20e29.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox