diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /kde-frameworks/kdeclarative | |
parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) |
gentoo resync : 22.01.2021
Diffstat (limited to 'kde-frameworks/kdeclarative')
-rw-r--r-- | kde-frameworks/kdeclarative/Manifest | 7 | ||||
-rw-r--r-- | kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch | 104 | ||||
-rw-r--r-- | kde-frameworks/kdeclarative/kdeclarative-5.77.0.ebuild | 4 | ||||
-rw-r--r-- | kde-frameworks/kdeclarative/kdeclarative-5.78.0.ebuild (renamed from kde-frameworks/kdeclarative/kdeclarative-5.74.0-r2.ebuild) | 9 |
4 files changed, 8 insertions, 116 deletions
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest index 53f3a984a65b..13cd1eacef7f 100644 --- a/kde-frameworks/kdeclarative/Manifest +++ b/kde-frameworks/kdeclarative/Manifest @@ -1,6 +1,5 @@ -AUX kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch 3597 BLAKE2B 366b97d001781e6c471db9cf01c1a11e3c2c22afa78fe9fcf6bf15b456146c5d0c700f6f458d36ca5c7b1c437e2f88418a787fd84d9dd3d08b69bd33d2c482e9 SHA512 e9dddeb06e8776cfbba8de37362a3decdfa103aed0a0bcf8565833d96b4d583986d63d331cd1f5ed8ee3c423dcff784ff361fa4e4019f5ed48b28773f6eb4803 -DIST kdeclarative-5.74.0.tar.xz 190360 BLAKE2B cf4ac587189c4f6fba6a13eaea4eea95e7e8aacf902c8ed809fac03f5ca76c9e42eff9fa74c1dfb0d0618c71bd4109a1c6b8f6964b242659757efadcc149ddb5 SHA512 8428a60146275dff201518764678bb7c5acce473bcfa584ea1b4924db485ade1b45e55f3aa758fbcf326b15e0e24dcb0913fbabbedd795b7b47e3b3f7e897f78 DIST kdeclarative-5.77.0.tar.xz 185036 BLAKE2B 53ce685df457d3e8b33d37efedbd7ba56b430a228c32673ca01cdf401f80a8e3518431d15182dbf28f4fa4a439369e380e65c13cf9fe385f42c98d54d50043a6 SHA512 188dbb2ba5080b2b5cb9815686c0bc619921390389e2865330c6183c3cf0c6f0df6bba7009f9215f2c99759322bf1ed4cae68df5c696fd1c3ecaecbaf327419c -EBUILD kdeclarative-5.74.0-r2.ebuild 1020 BLAKE2B 6726b6689221eb30df6712a857e96abb1985cffd6b770a3e558c18347a48f751a2ba2d60442baf4f4aa123410954eb4755810751028236355fe92abccc9e055f SHA512 85daaf3e370ed0642000a6fce584bd395e8e6748d9c5a44cb47e895917f1d0d657243d91a77cab0020f9b5e4507c0d4db34ba828f3a66f058488b6f1444cf19e -EBUILD kdeclarative-5.77.0.ebuild 940 BLAKE2B 2286676e961764c6bb7560b409e297f2a186f7d73b33612dec223706e18232f8b1aa8ea6a8b4d0123750cd68217faeca4cebed2ab49a749fc3baa488eaca8c73 SHA512 0443619343c16ddde94564f166dbed7dbdd2599c3d303e4219586c62622788f24eb5b5c3dd502b667dfccc50f9a3939cfe02956b17bbfa789a4f5a9a294d75c2 +DIST kdeclarative-5.78.0.tar.xz 185136 BLAKE2B ef206cc43cfa24542ddf1168b3331d3cb7c589c17554501f7a09e1cf526d3afa8ce5eafbc3a932081b743b9fb461e8c5915ec9e3b3bc742253f77f33274b0c6c SHA512 cb98f7041f93c8a21da74a6bcaf463fdd257aa96a5495200c749d60d517817c6d9be2b58e99b0a8e23996861ed9dcd9043da1643062ac94755070fb1d2b13add +EBUILD kdeclarative-5.77.0.ebuild 937 BLAKE2B 21de0ff02bf6b16f8413552e6ae7af9db4aa478004126f36c927bcf120f098ed6841b22d19de3b26c7cd91d6a1e81cf2c3e3f5e4b3a13ecc4e76e97c4b7ecab9 SHA512 df0f435edb48ac38dbb920ef9575cfb226bc8ac2a4bfcf6af6ec65c9678c00117bcbcf395f0ba7ff49202e94831af0679b7e83b28c0081d5b3443637b7ace013 +EBUILD kdeclarative-5.78.0.ebuild 940 BLAKE2B f376d86e2a6c5f81c1ec1d13972739913d0843facdfc0c0a83cc8269d7648b904d3c4ee9096b82566452340ce7a89eaec1409adfe7ba642a2f76524e39b709b9 SHA512 0168dcbd7347bd028a42655d175a9450e00cc9e0aa3c4eef3a6d5844e41f0b0e6444c03cfdb6f950f29d3d23acdeb75a331d7b9828aa2c6952b4008c0c80d286 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch b/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch deleted file mode 100644 index 66808f910bf0..000000000000 --- a/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 88aabf069a0e454777c15227126732a04c8cb8b2 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Fri, 18 Sep 2020 00:13:07 +0100 -Subject: [PATCH] Block shortcuts when recording key sequences - -Otherwise you can't select alt+a as a shortcut without triggering the -nmenomic generated shortcut on the "add application" button. - -Testing done: -- clicked "Add custom shortcut", pressed alt+a, it was recorded -successfully - -- focussed "Add custom shortcut", pressed alt+a, the relevant shortcut -activated - -Note that isRecording was already declared, but not defined, which is -why it looks like my diff misses something. - -BUG: 425979 ---- - src/qmlcontrols/kquickcontrols/KeySequenceItem.qml | 7 +++++++ - .../kquickcontrols/private/keysequencehelper.cpp | 8 +++++++- - .../kquickcontrols/private/keysequencehelper.h | 7 +++++++ - 3 files changed, 21 insertions(+), 1 deletion(-) - -diff --git a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml -index 9d8e035..d1fbc02 100644 ---- a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml -+++ b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml -@@ -83,6 +83,13 @@ RowLayout { - } - } - -+ Keys.onShortcutOverride: { -+ if (_helper.isRecording) { -+ _helper.keyPressed(event.key, event.modifiers); -+ event.accepted = true; -+ } -+ } -+ - Keys.onPressed: { - _helper.keyPressed(event.key, event.modifiers); - event.accepted = true; -diff --git a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp -index ba7ce01..26b0331 100644 ---- a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp -+++ b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp -@@ -237,7 +237,10 @@ void KeySequenceHelper::setCheckAgainstShortcutTypes(KeySequenceHelper::Shortcut - Q_EMIT checkAgainstShortcutTypesChanged(); - } - -- -+bool KeySequenceHelper::isRecording() const -+{ -+ return d->isRecording; -+} - - void KeySequenceHelper::clearKeySequence() - { -@@ -251,6 +254,7 @@ void KeySequenceHelperPrivate::startRecording() - oldKeySequence = keySequence; - keySequence = QKeySequence(); - isRecording = true; -+ emit q->isRecordingChanged(); - grabbedWindow = QQuickRenderControl::renderWindowFor(q->window()); - if (!grabbedWindow) { - grabbedWindow = q->window(); -@@ -265,6 +269,8 @@ void KeySequenceHelper::doneRecording() - { - d->modifierlessTimeout.stop(); - d->isRecording = false; -+ emit isRecordingChanged(); -+ - d->stealActions.clear(); - if (d->grabbedWindow) { - d->grabbedWindow->setKeyboardGrabEnabled(false); -diff --git a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h -index c9068e8..daeedc5 100644 ---- a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h -+++ b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h -@@ -51,6 +51,12 @@ class KeySequenceHelper : public QQuickItem - NOTIFY checkAgainstShortcutTypesChanged - ) - -+ Q_PROPERTY( -+ bool isRecording -+ READ isRecording -+ NOTIFY isRecordingChanged -+ ) -+ - public: - - enum ShortcutType { -@@ -116,6 +122,7 @@ Q_SIGNALS: - void shortcutDisplayChanged(const QString &string); - void captureFinished(); - void checkAgainstShortcutTypesChanged(); -+ void isRecordingChanged(); - - public Q_SLOTS: - void captureKeySequence(); --- -GitLab - diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.77.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.77.0.ebuild index dc9a811e54f6..c547e2f64593 100644 --- a/kde-frameworks/kdeclarative/kdeclarative-5.77.0.ebuild +++ b/kde-frameworks/kdeclarative/kdeclarative-5.77.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ inherit ecm kde.org DESCRIPTION="Framework providing integration of QML and KDE work spaces" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="" DEPEND=" diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r2.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.78.0.ebuild index f0a7eefaff7f..6c7ee1c62329 100644 --- a/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r2.ebuild +++ b/kde-frameworks/kdeclarative/kdeclarative-5.78.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,8 +9,9 @@ QTMIN=5.15.1 inherit ecm kde.org DESCRIPTION="Framework providing integration of QML and KDE work spaces" + LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="" DEPEND=" @@ -32,7 +33,3 @@ DEPEND=" media-libs/libepoxy " RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-block-shortcuts-when-recording-key-sequences.patch -) |