commit: d4df6ac2e34ab74033141e5ad0368f553fd09e5b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 16:57:52 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 17:55:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4df6ac2
kde-plasma/plasma-desktop: Scoop up fixes from 6.1 branch
Akseli Lahtinen (1):
Edit Mode: Fix for blurry icons
Marco Martin (1):
Use a shared QQmlEngine when possible
Xaver Hugl (1):
lockscreen: fix the check for authentication prompts
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-desktop/Manifest | 1 +
.../plasma-desktop/plasma-desktop-6.1.2-r1.ebuild | 183 +++++++++++++++++++++
2 files changed, 184 insertions(+)
diff --git a/kde-plasma/plasma-desktop/Manifest
b/kde-plasma/plasma-desktop/Manifest
index a94d6eb15f6d..726f5c642b33 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,5 @@
DIST plasma-desktop-5.27.11.tar.xz 14729900 BLAKE2B
3c023febf5c6dc72fdd3ca3696d5c5c84c5c099e8d66497e9fccde601a23ec19fc001d6b48f9b1160946ab46e0436e54dc20a91c56dafae455e8455fa558bfc4
SHA512
644bfe2235dcfc591ae66fc7090ca1e67fc8dfe80033c1b0bedc32cd76299a3f47e6c74eadee7ce80241efb31d20b561d9c06af457aa36b6528548b4eaee3eb9
+DIST plasma-desktop-6.1.2-patchset.tar.xz 2680 BLAKE2B
86581e4bd206200ef35971d2bc365de76fee6cfe716388b3dc2628dd7bda37f684a67790bfec2d4789ad6f52eca2683861a1b5a1a67705197a78f71e7a9dbd45
SHA512
d8d12d2f1ea459c2f346a330578f642a0eedd2f2adfeb0244f47a4704b5cf30a9e6455c4607fd95246e5fad88dc8351b28c74fd8731217b1f9d77346f1eae33e
DIST plasma-desktop-6.1.2.tar.xz 16139568 BLAKE2B
46c099be6c1d99669db23a19b299c4f9d56faa6ab13ceb03eb53082df2ccfa52c5b8a2a3252d8b5befba4dffb5a953168691b858064e52efae21f7c5757aeb6b
SHA512
b20441bb210eed3866cc28b962197f4b3f54342de9c4921f512f3b3ee3f9e07143efa7dec73b529c0aa487ee7bbd327ce3b865bb88b05097e2d9bbd0805ea5a4
DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B
f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5
SHA512
fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb
DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B
8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960
SHA512
5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.1.2-r1.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-6.1.2-r1.ebuild
new file mode 100644
index 000000000000..960ba448a509
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.1.2-r1.ebuild
@@ -0,0 +1,183 @@
+# 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.3.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.1
+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";
+PATCHSET="${P}-patchset"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+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.16_p20220803[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/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
+ 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=(
+ "${WORKDIR}/${XORGHDRS}/${PN}-6.0.80-override-include-dirs.patch" #
downstream patch
+ "${WORKDIR}/${PATCHSET}"
+)
+
+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
+}
