gentoo resync : 30.09.2020

3 files changed, 110 insertions, 1 deletions

diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 31ffbc523430..316ed1c8becc 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,6 @@
+AUX kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch 3597 BLAKE2B 366b97d001781e6c471db9cf01c1a11e3c2c22afa78fe9fcf6bf15b456146c5d0c700f6f458d36ca5c7b1c437e2f88418a787fd84d9dd3d08b69bd33d2c482e9 SHA512 e9dddeb06e8776cfbba8de37362a3decdfa103aed0a0bcf8565833d96b4d583986d63d331cd1f5ed8ee3c423dcff784ff361fa4e4019f5ed48b28773f6eb4803
 DIST kdeclarative-5.70.0.tar.xz 175644 BLAKE2B cbf1c33a8798aca1ed78bc77aedf5ba7988622de939727f6452facb271ac98801f8875fb5a33bfb6ee058263216e88eb87be5e4134bcafb032035af0dbb069ed SHA512 c974edf29cf5e02ce01bd0e158c1ee25ede8bac192d30d1398afa680420de05e0a8f4ba1b7f74577b6fd9c3e41d4bb5f7ec2730eddf1834b79dcda623b5f6714
 DIST kdeclarative-5.74.0.tar.xz 190360 BLAKE2B cf4ac587189c4f6fba6a13eaea4eea95e7e8aacf902c8ed809fac03f5ca76c9e42eff9fa74c1dfb0d0618c71bd4109a1c6b8f6964b242659757efadcc149ddb5 SHA512 8428a60146275dff201518764678bb7c5acce473bcfa584ea1b4924db485ade1b45e55f3aa758fbcf326b15e0e24dcb0913fbabbedd795b7b47e3b3f7e897f78
 EBUILD kdeclarative-5.70.0.ebuild 949 BLAKE2B adbd8cfbf9991458690cf378cccac33d8f6b87df6859224f2c3099011763c48c3acbad2a89292c19b94ea68ddcb7b9ffa526f107e55264231a2143be69aba15f SHA512 dde8be85b85a1fd983e098627f5373d114eef1d6a2e4a6f6c99c6581da0837abfe4c8c39a20ad16f9ee944c9636b0b3c75a87b38918553e47f151d6dc7d9b27f
-EBUILD kdeclarative-5.74.0.ebuild 996 BLAKE2B e60f5611affbb10f142e4694a7678fee3d09d59d7301564cbbb8746a425a47290d67b79c5fe20da1e010905865d2ac8bbfa3fef4f468047b12dc584e9e5198e3 SHA512 4896c21762d7d33047fd420bd08679e16151e5de23031d7a6bc19b2b06bbfef04df6af495feb1802351e95df981b532774a3b75ed20197cbc938f405e8b082ff
+EBUILD kdeclarative-5.74.0-r1.ebuild 1080 BLAKE2B b2ac3fde03915e443c114eb3238a4ddcc9a81c66ee57162845b72a96e19a661c0cc043634bf571bd3774c98f6be28ecab3ce5d6568a3bb410496ee87b389f3d7 SHA512 68dba207b9dcb85f64ebcc72370d4b7831634574cea71543d910ba816d069353f3c4dea62f63a5d6681d040fa6ff95a44fdfa4c7fd3008fa4a14f574ab727cf9
 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
new file mode 100644
index 000000000000..66808f910bf0
--- /dev/null
+++ b/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch
@@ -0,0 +1,104 @@
+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.74.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
index f1974ae53ddf..6e28a831ed99 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.74.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
@@ -33,3 +33,7 @@ DEPEND="
 	media-libs/libepoxy
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-block-shortcuts-when-recording-key-sequences.patch
+)