commit: 4012bcddce5212c8ed04ee2a1f24b7a632c054c9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Feb 18 18:32:44 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 18 19:55:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4012bcdd
kde-plasma/plasma-desktop: Fix default keyboard repeat state Upstream commit 5550af1fd10dccda80be4586f19e3aa0995be2bc KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=431923 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../plasma-desktop-5.21.0-keyboard-repeat.patch | 31 ++++ .../plasma-desktop/plasma-desktop-5.21.0-r1.ebuild | 169 +++++++++++++++++++++ 2 files changed, 200 insertions(+) diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.0-keyboard-repeat.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.0-keyboard-repeat.patch new file mode 100644 index 00000000000..8c7902c0e7d --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.0-keyboard-repeat.patch @@ -0,0 +1,31 @@ +From 5550af1fd10dccda80be4586f19e3aa0995be2bc Mon Sep 17 00:00:00 2001 +From: Jan Blackquill <[email protected]> +Date: Wed, 17 Feb 2021 12:34:15 -0500 +Subject: [PATCH] kcms/keyboard: fix migration + +TriState::STATE_ON is 0, while TriState::STATE_OFF is 1. +We're currently migrating 0 -> disabled, when it should be +1 -> disabled, * -> enabled. + +BUG: 431923 +FIXED-IN: 5.21.1 +--- + kcms/keyboard/kcminputrc_migrate_repeat_value.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kcms/keyboard/kcminputrc_migrate_repeat_value.py b/kcms/keyboard/kcminputrc_migrate_repeat_value.py +index 1440c570e..bd1667969 100755 +--- a/kcms/keyboard/kcminputrc_migrate_repeat_value.py ++++ b/kcms/keyboard/kcminputrc_migrate_repeat_value.py +@@ -4,7 +4,7 @@ import sys + for line in sys.stdin: + line = line.rstrip() + print(line, file=sys.stderr) +- if line.startswith("KeyboardRepeating=0"): ++ if line.startswith("KeyboardRepeating=1"): + print("KeyRepeat=nothing") + elif line.startswith("KeyboardRepeating="): + print("KeyRepeat=repeat") +-- +GitLab + diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.0-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.0-r1.ebuild new file mode 100644 index 00000000000..6da1feff4e5 --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.0-r1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=5.78.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE Plasma desktop" +XORGHDRS="${PN}-override-include-dirs-0" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"; + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop" + +BDEPEND="virtual/pkgconfig" +COMMON_DEPEND=" + >=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/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/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/kparts-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=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 + >=media-libs/phonon-4.11.0 + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxcb[xkb] + x11-libs/libxkbfile + emoji? ( + app-i18n/ibus[emoji] + dev-libs/glib:2 + media-fonts/noto-emoji + ) + 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 + ) + policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) + scim? ( app-i18n/scim ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + !<kde-plasma/kdeplasma-addons-5.15.80 + !kde-plasma/user-manager + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${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 + sys-apps/util-linux + x11-apps/setxkbmap + kaccounts? ( net-libs/signon-oauth2 ) + policykit? ( sys-apps/accountsservice ) +" + +PATCHES=( + "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch + "${FILESDIR}/${P}-keyboard-repeat.patch" +) + +src_prepare() { + ecm_src_prepare + + if ! use policykit; then + ecm_punt_bogus_dep KF5 Wallet + cmake_run_in kcms cmake_comment_add_subdirectory users + fi + + 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 +} + +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 kaccounts AccountsQt5) + $(cmake_use_find_package kaccounts KAccounts) + $(cmake_use_find_package scim SCIM) + $(cmake_use_find_package semantic-desktop KF5Baloo) + ) + if ! use emoji && ! use ibus; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON ) + 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 +}
