[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     6be8379cd01c35e9d7e97b18f9d150c2ca65e6ce
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  8 15:25:29 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 15:35:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be8379c

kde-plasma/plasma-desktop: 6.2.0 version bump

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

 kde-plasma/plasma-desktop/Manifest                 |   1 +
 ...asma-desktop-6.1.80-override-include-dirs.patch | 103 ++++++++++++
 .../plasma-desktop/plasma-desktop-6.2.0.ebuild     | 179 +++++++++++++++++++++
 3 files changed, 283 insertions(+)

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 248ae7be8efa..fea8b2fcc89b 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-desktop-6.1.5.tar.xz 16144320 BLAKE2B 60b8ad791325e506551746790d23347c501caaa1550c470e5157e8902da07162691b30a36c53c6910d1daa32ea3e3801562d4acbf0feceaf35d72ad32662f809 SHA512 db5698874bd66be0194f868cc037af2521b924afb02a56036696504c2b3e8dec3d59ba9228203f7b0d08ffaaa36137f10081207fa79d748c5044b37063507b6f
+DIST plasma-desktop-6.2.0.tar.xz 16321000 BLAKE2B f6827d49e6cc1a1922b34587822bc08b9662840b6eebffd2fd8d629af05e6705cfad2d7d41afbb879892fe4a75e5381be409439cf7de5f80968bae7b8302496d SHA512 bdb37a1330c1e836f8f91fe660d0bbae30453b602a6a3ef5d85a92d85e6af3e5073f9a8309a21080cf8eb883b7410132ca85abf69ee050e227ae4022435bcecf
 DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.1.80-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.1.80-override-include-dirs.patch
new file mode 100644
index 000000000000..6059eeeee48f
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.1.80-override-include-dirs.patch
@@ -0,0 +1,103 @@
+From 803df2e214c199f42a2c88ed7412c4c8db07c882 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.
+
+XorgLibinput - libinput-properties.h
+XorgServer - xserver-properties.h
+---
+ CMakeLists.txt               |  7 +------
+ config-gentoo.cmake          | 17 +++++++++++++++++
+ kcms/mouse/CMakeLists.txt    |  3 ---
+ kcms/touchpad/CMakeLists.txt |  6 ------
+ 4 files changed, 18 insertions(+), 15 deletions(-)
+ create mode 100644 config-gentoo.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc1d57c12..30a893d5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,16 +226,11 @@ 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(XORGSERVER xorg-server IMPORTED_TARGET)
++include(config-gentoo.cmake)
+ pkg_check_modules(XKBREGISTRY xkbregistry REQUIRED IMPORTED_TARGET)
+ 
+ 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..ac2f0c18d
+--- /dev/null
++++ b/config-gentoo.cmake
+@@ -0,0 +1,17 @@
++if(BUILD_KCM_MOUSE_X11)
++    add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
++    set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
++                INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_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 17689e78f..364185c91 100644
+--- a/kcms/mouse/CMakeLists.txt
++++ b/kcms/mouse/CMakeLists.txt
+@@ -2,9 +2,6 @@
+ add_definitions(-DTRANSLATION_DOMAIN=\"kcmmouse\")
+ 
+ if (BUILD_KCM_MOUSE_X11)
+-    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 ced353a60..a1920c574 100644
+--- a/kcms/touchpad/CMakeLists.txt
++++ b/kcms/touchpad/CMakeLists.txt
+@@ -2,18 +2,12 @@
+ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_touchpad\")
+ 
+ if (BUILD_KCM_TOUCHPAD_X11)
+-    if (NOT XORGLIBINPUT_FOUND)
+-        list(APPEND MISSING_DEPS "xorg-libinput")
+-    endif()
+     if (NOT X11_XCB_FOUND)
+         list(APPEND MISSING_DEPS "X11_XCB")
+     endif()
+     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()
+-- 
+2.45.2
+

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.0.ebuild
new file mode 100644
index 000000000000..6b64626f5104
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.0.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=6.6.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+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="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ibus scim screencast sdl +semantic-desktop webengine"
+
+RESTRICT="test" # missing selenium-webdriver-at-spi
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+COMMON_DEPEND="
+	dev-libs/icu:=
+	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/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXi
+	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 )
+	webengine? (
+		kde-apps/kaccounts-integration:6
+		>=net-libs/accounts-qt-1.17[qt6(+)]
+	)
+"
+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
+	!<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/oxygen-${PVCUT}:6
+	kde-plasma/plasma-mimeapps-list
+	media-fonts/noto-emoji
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	x11-misc/xdg-user-dirs
+	screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 )
+	webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6(+)] )
+"
+BDEPEND="
+	dev-util/intltool
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.1.80-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=(
+		-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 sdl SDL2)
+		$(cmake_use_find_package semantic-desktop KF6Baloo)
+		$(cmake_use_find_package webengine AccountsQt6)
+		$(cmake_use_find_package webengine KAccounts6)
+	)
+
+	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
+}