kde-plasma/plasma-desktop: 5.91.0 version bump

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

3 files changed, 296 insertions, 0 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 4669de1a8b85..cad74cadbe1f 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,4 @@
 DIST plasma-desktop-5.27.10.tar.xz 14724388 BLAKE2B 59a6bbe524a45b5331d46497fff9d83136906dc094dca571f43641cded5b8a9b9d117a1fcbccfe04c1877d52ee686a2c3949e5194fee611d798548c2d8bb501e SHA512 88d0aa3d4d57aa9286d1d45c1908c5a2fcc7005cc39105085c19cd22657b72b1ea4bfef5be59d3e68fe3851acb68d1b8ac8d4d33305e22c70877d66c266b03e9
 DIST plasma-desktop-5.27.9.tar.xz 14721128 BLAKE2B 5332887ac65df280d8eaa6d834d844a49ba8d3aba38246564e19885aaed86135b95958b7914e69008c1ff1d5b85440a9d8998ca04740c82ddc1cf46399cb9f6f SHA512 ae23ab2e8359345c5ffe3cd2ff8d3aa8e302be49f3686f5f24fd5905990fc2f05a45d69fcb9b3414eae9997b70e0d424b307bc7f02d189158cd7f9ba995c9ec9
+DIST plasma-desktop-5.91.0.tar.xz 15610104 BLAKE2B acebeba90f989a6db42f47a76d7f28ed80a8b82bc5f2b2b2654be63d454db1d9ad5085aea304dd6abe52c1263dc730b7d524ec4c5935f376332265dfbd84f471 SHA512 475bd9487986d44b4782aeffd05d9fd78d43e3ac4d7b602de71a59f7da9d3a3a2e599cac1c12b61b5689d7a2417901012bfec82aa5b7b52c2b0a34c84111ef4c
 DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
new file mode 100644
index 000000000000..de53c25d0114
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
@@ -0,0 +1,117 @@
+From 45f2c2ce1fc9d4b2f0d6418a95f04a71337239d4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 6 Apr 2020 00:41:07 +0200
+Subject: [PATCH] Replace input drivers pkg_check_modules calls with manual
+ targets
+
+All they need is one header each, allow include dir overrides.
+
+Evdev - evdev-properties.h
+XorgLibinput - libinput-properties.h
+XorgServer - xserver-properties.h
+---
+ CMakeLists.txt                   |  8 +-------
+ config-gentoo.cmake              | 22 ++++++++++++++++++++++
+ kcms/mouse/CMakeLists.txt        |  6 ------
+ kcms/touchpad/CMakeLists.txt     |  3 ---
+ kcms/touchpad/backends/x11.cmake |  2 +-
+ 5 files changed, 24 insertions(+), 17 deletions(-)
+ create mode 100644 config-gentoo.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8868a130..ea950b050 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -224,16 +224,10 @@ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
+ add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
+ add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
+ 
+-pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)
+-pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
+-pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
++include(config-gentoo.cmake)
+ 
+ ecm_find_qmlmodule(org.kde.pipewire 0.1)
+ 
+-if(XORGLIBINPUT_FOUND)
+-  set(HAVE_XORGLIBINPUT 1)
+-endif()
+-
+ include(ConfigureChecks.cmake)
+ 
+ find_package(PackageKitQt6)
+diff --git a/config-gentoo.cmake b/config-gentoo.cmake
+new file mode 100644
+index 000000000..0d7353c27
+--- /dev/null
++++ b/config-gentoo.cmake
+@@ -0,0 +1,22 @@
++if(BUILD_KCM_MOUSE_X11)
++    add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
++    set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
++                INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}"
++                )
++
++    add_library(PkgConfig::EVDEV INTERFACE IMPORTED)
++    set_property(TARGET PkgConfig::EVDEV PROPERTY
++                INTERFACE_INCLUDE_DIRECTORIES "${EVDEV_INCLUDE_DIRS}"
++                )
++endif()
++
++if(BUILD_KCM_TOUCHPAD_X11)
++    add_library(PkgConfig::XORGSERVER INTERFACE IMPORTED)
++    set_property(TARGET PkgConfig::XORGSERVER PROPERTY
++                INTERFACE_INCLUDE_DIRECTORIES "${XORGSERVER_INCLUDE_DIRS}"
++                )
++endif()
++
++if(BUILD_KCM_MOUSE_X11 OR BUILD_KCM_TOUCHPAD_X11)
++    set(HAVE_XORGLIBINPUT 1)
++endif()
+diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
+index 639981380..2c9009061 100644
+--- a/kcms/mouse/CMakeLists.txt
++++ b/kcms/mouse/CMakeLists.txt
+@@ -32,12 +32,6 @@ if (BUILD_KCM_MOUSE_KWIN_WAYLAND)
+ endif()
+ 
+ if (BUILD_KCM_MOUSE_X11)
+-    if (NOT EVDEV_FOUND)
+-        list(APPEND MISSING_DEPS "xorg-evdev")
+-    endif()
+-    if (NOT XORGLIBINPUT_FOUND)
+-        list(APPEND MISSING_DEPS "xorg-libinput")
+-    endif()
+     if (NOT X11_Xi_FOUND)
+         list(APPEND MISSING_DEPS "X11_Xi")
+     endif()
+diff --git a/kcms/touchpad/CMakeLists.txt b/kcms/touchpad/CMakeLists.txt
+index 309cb247d..33b4f8428 100644
+--- a/kcms/touchpad/CMakeLists.txt
++++ b/kcms/touchpad/CMakeLists.txt
+@@ -17,9 +17,6 @@ if (BUILD_KCM_TOUCHPAD_X11)
+     if (NOT X11_Xi_FOUND)
+         list(APPEND MISSING_DEPS "X11_Xi")
+     endif()
+-    if (NOT XORGSERVER_FOUND)
+-        list(APPEND MISSING_DEPS "xorg-server")
+-    endif()
+     if (MISSING_DEPS)
+         message(FATAL_ERROR "Missing X11 dependencies for kcm_touchpad: ${MISSING_DEPS}. Install dependencies or set CMake option -DBUILD_KCM_TOUCHPAD_X11=OFF.")
+     endif()
+diff --git a/kcms/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake
+index 88bf0c676..33be94c49 100644
+--- a/kcms/touchpad/backends/x11.cmake
++++ b/kcms/touchpad/backends/x11.cmake
+@@ -10,7 +10,7 @@ SET(backend_SRCS
+     backends/x11/xrecordkeyboardmonitor.cpp
+ )
+ 
+-if (XORGLIBINPUT_FOUND)
++if (HAVE_XORGLIBINPUT)
+ 
+     SET(backend_SRCS
+         ${backend_SRCS}
+-- 
+2.43.0
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.91.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.91.0.ebuild
new file mode 100644
index 000000000000..22dcf0be4ff4
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.91.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.247.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.6.0
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-3"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="ibus scim screencast sdl +semantic-desktop X"
+
+RESTRICT="test" # missing selenium-webdriver-at-spi
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/attica-${KFMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kded-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-plasma/kwin-${PVCUT}:6
+	>=kde-plasma/libksysguard-${PVCUT}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	>=kde-plasma/plasma-activities-stats-${PVCUT}:6
+	>=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?]
+	>=kde-plasma/plasma5support-${PVCUT}:6
+	media-libs/libcanberra
+	x11-libs/libX11
+	x11-libs/libXi
+	X? (
+		x11-libs/libxcb
+		x11-libs/libXcursor
+		x11-libs/libxkbcommon
+		x11-libs/libxkbfile
+	)
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2[joystick] )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/wayland-protocols-1.25
+	dev-libs/boost
+	x11-base/xorg-proto
+	test? (
+		>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+		>=kde-plasma/kactivitymanagerd-${PVCUT}:6
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/kdeplasma-addons-5.25.50
+	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
+	media-fonts/noto-emoji
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	x11-misc/xdg-user-dirs
+	screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 )
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use ibus; then
+		sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use scim; then
+		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
+		$(cmake_use_find_package ibus GLIB2)
+		-DCMAKE_DISABLE_FIND_PACKAGE_AccountsQt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KAccounts6=ON
+		$(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
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# test_kio_fonts needs D-Bus, bug #634166
+	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "screen reader support" "app-accessibility/orca"
+	fi
+	ecm_pkg_postinst
+}