commit:     687d27307f68d760a9bcf7b46082319e5fae6974
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  9 21:47:54 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 17:50:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687d2730

kde-plasma/plasma-desktop: Backport various 5.27.5 fixes

Fushan Wen (5):
      applets/taskmanager: reset `parentTask` after a task was moved
      applets/taskmanager: also match row index before skipping updating 
bindings
      kcms/landingpage: use explanation label as accessible description
      kcms/landingpage: add accessible name to animation speed slider
      CompactApplet: show tabbar for Breeze Twilight

Prajna Sariputra (1):
      applets/taskmanager: Improve scrolling usability

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=452187
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=467709
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=468313

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

 kde-plasma/plasma-desktop/Manifest                 |   1 +
 .../plasma-desktop/plasma-desktop-5.27.4-r1.ebuild | 181 +++++++++++++++++++++
 2 files changed, 182 insertions(+)

diff --git a/kde-plasma/plasma-desktop/Manifest 
b/kde-plasma/plasma-desktop/Manifest
index 89e1560ab9a2..2da720fe7a43 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,5 @@
 DIST plasma-desktop-5.26.5.tar.xz 6352588 BLAKE2B 
093d559830719ac011d5aea33beb86c6fb39403a44416da97646c1f890373cfcd570ae6015dfacf0d4cd2448b44e03f814376a3897351178c582bc865e110fce
 SHA512 
6d58bc09c7f0e0218d3ffe4609fe206012c34d8c1ad64003a51ee3228e2ca203b0131b878f797babc43476bd0cf3e7cbe295e8a11ff1ae97843a61b2183ae182
 DIST plasma-desktop-5.27.3.tar.xz 14331384 BLAKE2B 
7cc83b1cb86eb72df841313cf8351d9c74d2ab4e825b34c778039cd326c179e3c65d02a0a1fc48843c23fb1b01495ef871034b36d8495a6bf42de021e14acb2d
 SHA512 
ac31bedb13c74f3cacd76d099a25da16bc617a7c0c3c9bc0e605eca1754e5f295519372c1c0a0d32c2248e2550159cc0ba97ca349dea43b3be85f32caf69e968
+DIST plasma-desktop-5.27.4-patchset-1.tar.xz 3344 BLAKE2B 
4e8daaa10a1f88fcfbf72346b275d3cf6656460dc05f3c61dae4cdc5b9c9071728cf9cf82a13f69d4b8cb6ca79844c1ca37842540a1acfe2fa799553bd0b6773
 SHA512 
a75e15053134968d805642daeadcf6b3aa321736470d1a04f19f7dc76b513423d97929b36363632bc8eab4167eead2ae58df727bbb69587ef90fcfc0aa94669e
 DIST plasma-desktop-5.27.4.tar.xz 14335168 BLAKE2B 
b45aaa6cc04d3d519e7ccad0cae674f60c6f4c81105deb0a575db7f6c1eeaf19e9ce8e441c4144ac670c722a9413b68e9eb2c111338844e0bed0839e69da69ce
 SHA512 
a9e8dc3244631af50429d05c3ec861396e2b5b58738ebee7dfcc9c912f43ca9865ed8343f585fd665df41a05c401996a97161da10e852970dfc2741e01614162
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 
5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6
 SHA512 
452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.27.4-r1.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-5.27.4-r1.ebuild
new file mode 100644
index 000000000000..146db24195e5
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.4-r1.ebuild
@@ -0,0 +1,181 @@
+# 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.102.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.7
+VIRTUALX_REQUIRED="test"
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-2"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz
+       https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="ibus +kaccounts scim screencast +semantic-desktop"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+COMMON_DEPEND="
+       dev-libs/wayland
+       >=dev-qt/qtconcurrent-${QTMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtnetwork-${QTMIN}:5
+       >=dev-qt/qtprintsupport-${QTMIN}:5
+       >=dev-qt/qtsql-${QTMIN}:5
+       >=dev-qt/qtsvg-${QTMIN}:5
+       >=dev-qt/qtwayland-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
+       >=kde-frameworks/attica-${KFMIN}:5
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/kactivities-stats-${KFMIN}:5
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kauth-${KFMIN}:5
+       >=kde-frameworks/kbookmarks-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcodecs-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kded-${KFMIN}:5
+       >=kde-frameworks/kdelibs4support-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kitemmodels-${KFMIN}:5
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/kjobwidgets-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/knotifyconfig-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/kparts-${KFMIN}:5
+       >=kde-frameworks/krunner-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=kde-frameworks/solid-${KFMIN}:5
+       >=kde-frameworks/sonnet-${KFMIN}:5
+       >=kde-plasma/kwin-${PVCUT}:5
+       >=kde-plasma/libksysguard-${PVCUT}:5
+       >=kde-plasma/libkworkspace-${PVCUT}:5
+       >=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?]
+       >=media-libs/phonon-4.11.0
+       x11-libs/libX11
+       x11-libs/libXcursor
+       x11-libs/libXfixes
+       x11-libs/libXi
+       x11-libs/libxcb
+       x11-libs/libxkbcommon
+       x11-libs/libxkbfile
+       ibus? (
+               app-i18n/ibus
+               dev-libs/glib:2
+               >=dev-qt/qtx11extras-${QTMIN}:5
+               x11-libs/libxcb
+               x11-libs/xcb-util-keysyms
+       )
+       kaccounts? (
+               kde-apps/kaccounts-integration:5
+               net-libs/accounts-qt
+       )
+       scim? ( app-i18n/scim )
+       semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+       >=dev-libs/wayland-protocols-1.25
+       dev-libs/boost
+       x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+       !<kde-plasma/kdeplasma-addons-5.25.50
+       >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+       >=dev-qt/qtquickcontrols2-${QTMIN}:5
+       >=dev-qt/qtwaylandscanner-${QTMIN}:5
+       >=kde-frameworks/kirigami-${KFMIN}:5
+       >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
+       >=kde-plasma/oxygen-${PVCUT}:5
+       media-fonts/noto-emoji
+       sys-apps/util-linux
+       x11-apps/setxkbmap
+       x11-misc/xdg-user-dirs
+       kaccounts? ( net-libs/signon-oauth2 )
+       screencast? ( >=kde-plasma/kpipewire-${PVCUT}:5 )
+"
+BDEPEND="
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       virtual/pkgconfig
+"
+
+PATCHES=(
+       "${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-override-include-dirs.patch" # 
downstream patch
+       "${WORKDIR}/${P}-patchset-1" # KDE-bugs 452187, 467709, 468313
+)
+
+src_prepare() {
+       ecm_src_prepare
+
+       if ! use ibus; then
+               sed -e "s/Qt5X11Extras_FOUND AND 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_PackageKitQt5=ON # not packaged
+               -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+               -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+               -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+               -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+               $(cmake_use_find_package ibus GLIB2)
+               $(cmake_use_find_package kaccounts AccountsQt5)
+               $(cmake_use_find_package kaccounts KAccounts)
+               $(cmake_use_find_package semantic-desktop KF5Baloo)
+       )
+
+       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
+}

Reply via email to