commit: 2a7973632268fbc42b3825decc799b67f890e5fe 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: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 <asturm <AT> 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)
