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: dev-libs/plasma-wayland-protocols/
Date: Wed, 18 Dec 2024 21:19:52 +0000 (UTC)	[thread overview]
Message-ID: <1734556768.a2ec2eb2b24170498af2907437a97de04ddf1993.asturm@gentoo> (raw)

commit:     a2ec2eb2b24170498af2907437a97de04ddf1993
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 21:18:55 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 21:19:28 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2ec2eb2

dev-libs/plasma-wayland-protocols: Set QT_MAJOR_VERSION=6

Closes: https://bugs.gentoo.org/946612
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../plasma-wayland-protocols/plasma-wayland-protocols-9999.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-9999.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-9999.ebuild
index c8424eda5d..35ebde149a 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-9999.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-9999.ebuild
@@ -21,16 +21,14 @@ RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-libs/wayland )"
 BDEPEND="
 	dev-libs/libpcre2:*
-	>=kde-frameworks/extra-cmake-modules-5.115.0:*
-	|| (
-		dev-qt/qtbase:6
-		dev-qt/qtcore:5
-	)
+	dev-qt/qtbase:6
+	>=kde-frameworks/extra-cmake-modules-6.0:*
 	test? ( dev-util/wayland-scanner )
 "
 
 src_configure() {
 	local mycmakeargs=(
+		-DQT_MAJOR_VERSION=6
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
 		-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
 		-DBUILD_TESTING=$(usex test)


             reply	other threads:[~2024-12-18 21:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-18 21:19 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-17 17:57 [gentoo-commits] proj/kde:master commit in: dev-libs/plasma-wayland-protocols/ Andreas Sturmlechner
2024-12-07 13:11 Andreas Sturmlechner
2024-03-03 16:27 Andreas Sturmlechner
2023-01-20 14:15 Andreas Sturmlechner
2022-05-08 13:33 Andreas Sturmlechner
2021-09-22 11:12 Andreas Sturmlechner
2021-09-05  7:22 Andreas Sturmlechner
2021-09-05  0:16 Andreas Sturmlechner
2021-04-04 16:55 Andreas Sturmlechner
2020-05-13 22:01 Andreas Sturmlechner
2020-05-03  0:04 Andreas Sturmlechner

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=1734556768.a2ec2eb2b24170498af2907437a97de04ddf1993.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