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-frameworks/extra-cmake-modules/
Date: Tue,  3 Dec 2024 21:05:56 +0000 (UTC)	[thread overview]
Message-ID: <1733259949.0ad3f73b3201c38d56e070f078fbf7cab7552033.asturm@gentoo> (raw)

commit:     0ad3f73b3201c38d56e070f078fbf7cab7552033
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 21:04:09 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 21:05:49 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ad3f73b

kde-frameworks/extra-cmake-modules: Fix test dependencies

Also set QT_MAJOR_VERSION=6 if testing, not going to add any complexity
for optional Qt5 testing.

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

 .../extra-cmake-modules/extra-cmake-modules-9999.ebuild       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
index a0f838b06e..2f7a639451 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
@@ -17,6 +17,12 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/libarchive[bzip2]"
+DEPEND="
+	test? (
+		>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+		>=dev-qt/qtdeclarative-${QTMIN}:6
+	)
+"
 BDEPEND="
 	doc? (
 		${PYTHON_DEPS}
@@ -24,8 +30,8 @@ BDEPEND="
 		>=dev-qt/qttools-${QTMIN}:6[assistant]
 	)
 	test? (
-		>=dev-qt/qttools-${QTMIN}:6[linguist]
 		>=dev-qt/qtbase-${QTMIN}:6
+		>=dev-qt/qttools-${QTMIN}:6[linguist]
 	)
 "
 
@@ -53,6 +59,9 @@ src_configure() {
 		-DBUILD_MAN_DOCS=$(usex doc)
 		-DBUILD_TESTING=$(usex test)
 	)
+	if use test; then
+		mycmakeargs+=( -DQT_MAJOR_VERSION=6 ) # bug 938316
+	fi
 
 	cmake_src_configure
 }


             reply	other threads:[~2024-12-03 21:06 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-03 21:05 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-18 21:38 [gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/ Andreas Sturmlechner
2025-10-11 21:34 Andreas Sturmlechner
2024-07-12 15:13 Andreas Sturmlechner
2023-11-12 10:18 Andreas Sturmlechner
2023-08-15 14:33 Andreas Sturmlechner
2022-08-11 10:19 Sam James
2022-07-03 10:55 Andreas Sturmlechner
2021-06-14  8:24 Andreas Sturmlechner
2021-01-13 23:27 Andreas Sturmlechner
2020-02-12 23:11 Andreas Sturmlechner
2019-12-15 13:44 Andreas Sturmlechner
2019-11-29 19:10 Andreas Sturmlechner
2019-11-11  7:30 Andreas Sturmlechner
2019-10-17 18:10 Andreas Sturmlechner
2019-10-16 13:21 Andreas Sturmlechner
2019-10-11 18:05 Andreas Sturmlechner
2019-03-17 22:45 Andreas Sturmlechner
2019-01-05 22:45 Andreas Sturmlechner
2018-09-30  8:45 Andreas Sturmlechner
2018-09-30  8:45 Andreas Sturmlechner
2018-08-16 20:45 Andreas Sturmlechner
2017-09-03 19:40 Andreas Sturmlechner
2017-08-13 22:13 Andreas Sturmlechner
2017-08-06 22:30 Andreas Sturmlechner
2017-07-10 12:03 Michael Palimaka
2017-07-09 14:14 Michael Palimaka
2017-07-09 14:14 Michael Palimaka
2017-07-09 11:24 Andreas Sturmlechner
2017-07-08 16:48 Andreas Sturmlechner
2017-05-06 22:26 Andreas Sturmlechner
2016-12-23 10:11 Johannes Huber
2016-11-27 11:30 Michael Palimaka
2016-09-01 11:22 Manuel Rüger
2016-07-07 16:56 Michael Palimaka
2016-06-15 16:31 Michael Palimaka
2016-04-16 15:01 Johannes Huber
2016-03-26 17:41 Michael Palimaka
2016-03-26 17:28 Michael Palimaka
2016-01-16 17:37 Michael Palimaka
2015-08-07 18:01 Michael Palimaka
2015-04-05 17:14 Michael Palimaka
2015-04-05 16:41 Michael Palimaka

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=1733259949.0ad3f73b3201c38d56e070f078fbf7cab7552033.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