From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19D5015802C for ; Wed, 18 Dec 2024 21:22:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B575E07D4; Wed, 18 Dec 2024 21:22:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADEFDE07D4 for ; Wed, 18 Dec 2024 21:22:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7A9B340BEA for ; Wed, 18 Dec 2024 21:22:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A3C6D81 for ; Wed, 18 Dec 2024 21:22:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1734556892.2a7973632268fbc42b3825decc799b67f890e5fe.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/plasma-wayland-protocols/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.14.0.ebuild dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.15.0.ebuild X-VCS-Directories: dev-libs/plasma-wayland-protocols/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2a7973632268fbc42b3825decc799b67f890e5fe X-VCS-Branch: master Date: Wed, 18 Dec 2024 21:22:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 913d9d79-3c6c-4eda-867d-6d9909c3a6e6 X-Archives-Hash: 8402ec48d9f0f46a61ecb194802ce13e commit: 2a7973632268fbc42b3825decc799b67f890e5fe Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 18 21:18:55 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 18 21:21:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a797363 dev-libs/plasma-wayland-protocols: Set QT_MAJOR_VERSION=6 Closes: https://bugs.gentoo.org/946612 Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma-wayland-protocols-1.14.0.ebuild | 8 +++----- .../plasma-wayland-protocols-1.15.0.ebuild | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.14.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.14.0.ebuild index 4ce6cc4bde0f..01778a531342 100644 --- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.14.0.ebuild +++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.14.0.ebuild @@ -18,15 +18,13 @@ SLOT="0" 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:* " 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 ) diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.15.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.15.0.ebuild index c8424eda5d2a..35ebde149a5d 100644 --- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.15.0.ebuild +++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.15.0.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)