diff options
Diffstat (limited to 'kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild')
| -rw-r--r-- | kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index fcf6719a4d..203580bc45 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -7,17 +7,17 @@ ECM_HANDBOOK="forceoptional" ECM_TEST="true" KFMIN=9999 PVCUT=$(ver_cut 1-3) -QTMIN=6.6.2 +QTMIN=6.7.1 inherit ecm plasma.kde.org optfeature DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-3" +XORGHDRS="${PN}-override-include-dirs-4" SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" LICENSE="GPL-2" # TODO: CHECK SLOT="6" KEYWORDS="" -IUSE="ibus kaccounts scim screencast sdl +semantic-desktop X" +IUSE="ibus kaccounts scim screencast sdl +semantic-desktop" RESTRICT="test" # missing selenium-webdriver-at-spi @@ -74,13 +74,11 @@ COMMON_DEPEND=" >=kde-plasma/plasma5support-${PVCUT}:6 media-libs/libcanberra x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcursor x11-libs/libXi - X? ( - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libxkbcommon - x11-libs/libxkbfile - ) + x11-libs/libxkbcommon + x11-libs/libxkbfile ibus? ( app-i18n/ibus dev-libs/glib:2 @@ -105,12 +103,14 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-plasma/kdeplasma-addons-5.25.50 + !<kde-plasma/plasma-workspace-6.0.80 dev-libs/kirigami-addons:6 >=dev-qt/qtwayland-${QTMIN}:6 >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 >=kde-plasma/kde-cli-tools-${PVCUT}:* >=kde-plasma/oxygen-${PVCUT}:6 + kde-plasma/plasma-mimeapps-list media-fonts/noto-emoji sys-apps/util-linux x11-apps/setxkbmap @@ -126,7 +126,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch + "${FILESDIR}/${PN}-6.1.80-override-include-dirs.patch" # downstream patch ) src_prepare() { @@ -145,24 +145,18 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DBUILD_KCM_MOUSE_X11=ON + -DBUILD_KCM_TOUCHPAD_X11=ON + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged $(cmake_use_find_package ibus GLIB2) $(cmake_use_find_package kaccounts AccountsQt6) $(cmake_use_find_package kaccounts KAccounts6) $(cmake_use_find_package sdl SDL2) $(cmake_use_find_package semantic-desktop KF6Baloo) - -DBUILD_KCM_MOUSE_X11=$(usex X) - -DBUILD_KCM_TOUCHPAD_X11=$(usex X) ) - if use X; then - mycmakeargs+=( - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - ) - fi - ecm_src_configure } |