From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- kde-plasma/plasma-integration/Manifest | 3 +- ...e-standard-kde-shortcut-for-move-to-trash.patch | 34 +++++++++++++++ .../plasma-integration-5.19.5-r1.ebuild | 50 ++++++++++++++++++++++ .../plasma-integration-5.19.5.ebuild | 48 --------------------- 4 files changed, 86 insertions(+), 49 deletions(-) create mode 100644 kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch create mode 100644 kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild delete mode 100644 kde-plasma/plasma-integration/plasma-integration-5.19.5.ebuild (limited to 'kde-plasma/plasma-integration') diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest index 57b0a5ac2daa..b1c6e08d6440 100644 --- a/kde-plasma/plasma-integration/Manifest +++ b/kde-plasma/plasma-integration/Manifest @@ -1,5 +1,6 @@ +AUX plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch 1327 BLAKE2B 6a9f02c1fb516bb7d3c5bf261ab4b6b6ea1f4a225df1db8f564b25ec6205db89060451362a18d0facf32637a6af6b25c8101b28f0095970e7a1135f6f8fe5f3a SHA512 f38145990ac03799724d7f579ba98baa0078b4cc07805ad5d12b6266ab0bdf3c4dd4999151d0005b0217430197cef74514b330ee1ac14b9530d63e9c8364ed00 DIST plasma-integration-5.18.5.tar.xz 57656 BLAKE2B 3cf445f5d84de07e82369a3057a0ac390961634f8926d3491ca8dd0d603d4e4ff9e7487b69c1fbea44a4296c8960f4e3ef677e1bfd183154a36799fc95dbf3c8 SHA512 d217c49555ee17e3b18d006368ec7aa4d8585c05070bcf3a3c7e471b1c7dc830080d0405209979d8a27c7c2fc2adcd3d248e595f43f0b4a2928683f93c6d4b48 DIST plasma-integration-5.19.5.tar.xz 57464 BLAKE2B ef5ec9f849087ae738a1ff1de14a77994b4486f89b632777caa8e0aad67cad8553bdf1d0553893361ab4c11ddba0caf32464cb49f08047cf2d40375f789c166e SHA512 9e17e1720e5d5c1d3cada3f1eb891d27fd189eb65378c2e0be6547c79d93d5df2f785a3c67d35a4a374d320b118ad3b7d3fb7d968a7f5b629e505d21c83cfe36 EBUILD plasma-integration-5.18.5.ebuild 1235 BLAKE2B f1f0e5a637021d9d0ae8c0c3b6680a1f4ac63c8e2e4203bb8936f8693839bde3fa9f7e28082b5a4dca7c2dcabca95f7f18f0bb694e60d79421f10286c4446db5 SHA512 4877687f7608f7a8a1c24e6c8823ef4670ec5307996dcfec8e6682be227bb8e06a29e2c456d1e30f711d76f89855e70250904d3a602f2cbf2e9d45bb93e34dfd -EBUILD plasma-integration-5.19.5.ebuild 1238 BLAKE2B 6a27dd2928dadef3f89ded1b45bf2f336522fd0f93dc6a53c789c1f73f7676b7c5d56fc374997596d7813f4148be7bb30bc14e2584fee9a9646f758af7e8ed4c SHA512 bd68e4c0012a9261dfeda4e148a02e3084ee7f3bc5e1bad155e9abff1fcfaefee651fd5e4790f9a012061658a325ea3e0cb60e00f5edd900aa85a1083fb28d13 +EBUILD plasma-integration-5.19.5-r1.ebuild 1320 BLAKE2B 3c50f0efd871c28c18900847e8982231059fb9a66f91669030e0ccaeba9c0b3f790d5261884af7344e03a6b12393aa7f8e3f26be4b97d2139dbdb4a67e57970b SHA512 7bd2a4d97e23f5124fe795eda494fb1e56e89de5b651e7577e1f9300007774a49537358bdb178e6f04ca213e6d4c7af54dc6c3a4d1fd3c0bf79a384b8b8b4c42 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch new file mode 100644 index 000000000000..7405dace6be1 --- /dev/null +++ b/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch @@ -0,0 +1,34 @@ +From 15c7926377065da0fea111be303816dca91d087a Mon Sep 17 00:00:00 2001 +From: Nate Graham +Date: Tue, 15 Sep 2020 13:31:48 -0600 +Subject: [PATCH] Use KDE shortcuts for "move to trash" action coming from + QStandardKey + +QKeySequence::Delete is the Qt "Move to trash" action, which, by +default, includes Ctrl+D as a shortcut. This is something we don't want +in KDE software, so we need to intercept this action in our integration +plugin and give it the standard KDE shortcuts instead, as we do for +other actions. + +BUG: 426573 +FIXED-IN: 5.20 +--- + src/platformtheme/kdeplatformtheme.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/platformtheme/kdeplatformtheme.cpp b/src/platformtheme/kdeplatformtheme.cpp +index 24ac7e7..18b3f6f 100644 +--- a/src/platformtheme/kdeplatformtheme.cpp ++++ b/src/platformtheme/kdeplatformtheme.cpp +@@ -257,6 +257,8 @@ QList KdePlatformTheme::keyBindings(QKeySequence::StandardKey key) + return KStandardShortcut::shortcut(KStandardShortcut::TabNext); + case QKeySequence::PreviousChild: + return KStandardShortcut::shortcut(KStandardShortcut::TabPrev); ++ case QKeySequence::Delete: ++ return KStandardShortcut::shortcut(KStandardShortcut::MoveToTrash); + default: + return QPlatformTheme::keyBindings(key); + } +-- +GitLab + diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild new file mode 100644 index 000000000000..51a301c73ca7 --- /dev/null +++ b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KFMIN=5.71.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.14.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" + +LICENSE="LGPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[dbus] + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-plasma/breeze-${PVCUT}:5 + x11-libs/libXcursor + x11-libs/libxcb +" +RDEPEND="${DEPEND} + media-fonts/hack + media-fonts/noto +" + +# requires running kde environment +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}"/${P}-use-standard-kde-shortcut-for-move-to-trash.patch ) diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.5.ebuild deleted file mode 100644 index fbf43a6fc30e..000000000000 --- a/kde-plasma/plasma-integration/plasma-integration-5.19.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.71.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.14.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" - -LICENSE="LGPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[dbus] - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/breeze-${PVCUT}:5 - x11-libs/libXcursor - x11-libs/libxcb -" -RDEPEND="${DEPEND} - media-fonts/hack - media-fonts/noto -" - -# requires running kde environment -RESTRICT+=" test" -- cgit v1.2.3