gentoo auto-resync : 19:07:2022 - 20:39:44

3 files changed, 0 insertions, 200 deletions

diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 41714e0e2e47..4832fa9e1a64 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,8 +1,5 @@
-AUX kglobalaccel-5.95.0-fix-shortcut-conflict-dialog.patch 5674 BLAKE2B 9a6f1bf039b1431fd87ec318c3d8fbd1fa618ff9f71f3fb20994ca27619568368391179e93c4604b0d27d06dfbbdd4e5668df9d33a6a45ca2d4e3f8563322a2f SHA512 bce81f0336c8f7f1a0ee7ab550eb0c48486bc8bcdd24af754790ad737be734df130c46f1dbebe642d5c4a60b51ca1f5c793309437507f892a9fb4b73e69ba702
 DIST kglobalaccel-5.92.0.tar.xz 93704 BLAKE2B a7b38b1c7b6bd0a7d20de7dd1893ae42d70888262fff6e196b8c64b5dd16d0c1ec5f8aaa44e1a0cbd39cc675df957e3e86c509ea7418105ef4df1071502d3c41 SHA512 b839dff3fcf191b2bdd99d6ba2e66169e86e73bef06bfaf990a30ad2d4a89d9150c798297f9cd98407a4ff390252b5d15fed8e51fc76a01199498099aa45f9cc
-DIST kglobalaccel-5.95.0.tar.xz 96196 BLAKE2B 7cf871861f243908f58bf0692305cc4a29e18e40a70547175d8a6c725f5c5843fe7bfbea05d308ae75e4e8e0ea2791f8cf77e23ddd72e3eb2e4bbd1bf9c4666a SHA512 defb559a87eb32afdec48f22ad0b28a5b8bfcc8cbdffb9babe9e00e5ebf4a530841261632b37d0e6df04c46c102a1a16e4301d5ef6b2c59d0978e2f6b5857b10
 DIST kglobalaccel-5.96.0.tar.xz 96480 BLAKE2B 21a1033491838d9bd1d4828b9e71eb61b1fbac280864ef44a0fbcf4b1310bcc37bcecdd2a5c30d1062fa0daaa064bb34d70a50f47929fa42201c7d8b2502566b SHA512 8ca729c5b48da2e49a9f923182ec6621180025ab6a82a05a470afe2ed3feb2139fa874844ed85348f748ea8fb9931e2e89667b59a6ea92c4f7faf26de1b5a282
 EBUILD kglobalaccel-5.92.0.ebuild 886 BLAKE2B eab826dd3ab025d67739d127a98a77b2a5e0808ab15c1d6a80bf42505fbb567ac9f4b71d20c8fdf5b9bfa6a4c9980a4ed629752245f5a1f21017b9662c46a61c SHA512 e2a107a207a8223845884cc9166cd65da0b6a667ec8fc6054cc32173d2bedae3651bb90e8a3ad156d3c86c995dcacae3031725d16ae7b6ee78e3340aeddead53
-EBUILD kglobalaccel-5.95.0-r1.ebuild 1095 BLAKE2B 7980b96b98bc3945c3f301b49a5bbfdc97517aefd4f725eca4e86a65acd5a11730af5a2a355e7a426daa3d8888f7725aebe7240883ba365797223fd60f11067c SHA512 1c894300073c44f3da0a724186bd09d867381905c15fbb7e9552d8813764bb21be93a873c5b44255e0e41ca27a6e0b69380584ee38ce7f838e55be9cec23291f
 EBUILD kglobalaccel-5.96.0.ebuild 1039 BLAKE2B 99c49498c8c8e039f5167581b33775fe8547b240f1ae14284704f50431d506eeff9bdff93594a251cbb302f65fcf839e8cab4f3d380ed2c7f0c081ce87901c2e SHA512 12863862e2a672524a99aa1560f9c7707b0057584f627f23aa226d404c9bbd1e34146a5c8b3b8c6d291a77e313e9e3523d641c03a25ae9b2590dd5f14412dd7a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.95.0-fix-shortcut-conflict-dialog.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.95.0-fix-shortcut-conflict-dialog.patch
deleted file mode 100644
index c39f30d86d3c..000000000000
--- a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.95.0-fix-shortcut-conflict-dialog.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 1a8e8cb00cda5807926a90ae8e5d5597354f3541 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Sat, 4 Jun 2022 23:00:15 +0200
-Subject: [PATCH] Fix D-Bus de/marshalling KGlobalAccel::MatchType
-
-Otherwise the globalShortcutsByKey() method is silently skipped, and isn't
-visible on the org.kde.KGlobalAccel D-Bus interface.
-
-It turns out that to test changes made in kglobalaccel d-bus interface, you
-need to kill the system /usr/bin/kglobalaccel process (be careful as that
-breaks the most basic shortcuts, e.g. Alt+Tab), and run the one from the
-build-dir, otherwise the session d-bus won't pick up your changes.
-
-To test:
-- List all methods on the interface:
-  `qdbus org.kde.kglobalaccel /kglobalaccel`
-- The followin messages are printed in the system log/journal:
-Skipped method "globalShortcutsByKey" : Unregistered input type in parameter list: KGlobalAccel::MatchType
-Skipped method "globalShortcutsByKey" : Unregistered input type in parameter list: KGlobalAccel::MatchType
-
-To see the behaviour mentioned in the bug report:
-- Create a global shortcut of some kind (e.g. F4 to start some app)
-- open the shortcut editor in e.g. Dolphin, and try to assign that same
-  shortcut to some other action the conflict shortcut message dialog should
-  show a message similar to the one in the attached screenshot at:
-  https://bugs.kde.org/show_bug.cgi?id=454704#c0
-The list of GlobalShortcutInfo returned by globalShortcutsByKey() is empty
-because the method couldn't be found on the d-bus interface.
-
-After applying patch:
-- kill the system /usr/bin/kglobalaccel and start the one from the build
-  dir
-- Start Dolphin with the libs from the build-dir e.g.:
-  LD_LIBRARY_PATH=build-dir/bin/ dolphin
-- The info about the global shortcut should be shown in the message dialog
-
-BUG: 454704
-FIXED-IN: 5.95
----
- src/kglobalaccel.cpp          | 19 +++++++++++++++++++
- src/kglobalaccel.h            |  3 +++
- src/kglobalshortcutinfo_p.h   |  1 +
- src/org.kde.KGlobalAccel.xml  |  3 ++-
- src/runtime/kglobalacceld.cpp |  4 ++--
- 5 files changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/src/kglobalaccel.cpp b/src/kglobalaccel.cpp
-index d0d2932..ef51b56 100644
---- a/src/kglobalaccel.cpp
-+++ b/src/kglobalaccel.cpp
-@@ -147,6 +147,7 @@ KGlobalAccel::KGlobalAccel()
-     qDBusRegisterMetaType<QList<QStringList>>();
-     qDBusRegisterMetaType<KGlobalShortcutInfo>();
-     qDBusRegisterMetaType<QList<KGlobalShortcutInfo>>();
-+    qDBusRegisterMetaType<KGlobalAccel::MatchType>();
- }
- 
- KGlobalAccel::~KGlobalAccel()
-@@ -785,4 +786,22 @@ bool KGlobalAccelPrivate::setShortcutWithDefault(QAction *action, const QList<QK
-     return true;
- }
- 
-+QDBusArgument &operator<<(QDBusArgument &argument, const KGlobalAccel::MatchType &type)
-+{
-+    argument.beginStructure();
-+    argument << static_cast<int>(type);
-+    argument.endStructure();
-+    return argument;
-+}
-+
-+const QDBusArgument &operator>>(const QDBusArgument &argument, KGlobalAccel::MatchType &type)
-+{
-+    argument.beginStructure();
-+    int arg;
-+    argument >> arg;
-+    type = static_cast<KGlobalAccel::MatchType>(arg);
-+    argument.endStructure();
-+    return argument;
-+}
-+
- #include "moc_kglobalaccel.cpp"
-diff --git a/src/kglobalaccel.h b/src/kglobalaccel.h
-index 563278b..a74a311 100644
---- a/src/kglobalaccel.h
-+++ b/src/kglobalaccel.h
-@@ -400,4 +400,7 @@ private:
-     friend class KGlobalAccelSingleton;
- };
- 
-+KGLOBALACCEL_EXPORT QDBusArgument &operator<<(QDBusArgument &argument, const KGlobalAccel::MatchType &type);
-+KGLOBALACCEL_EXPORT const QDBusArgument &operator>>(const QDBusArgument &argument, KGlobalAccel::MatchType &type);
-+
- #endif // _KGLOBALACCEL_H_
-diff --git a/src/kglobalshortcutinfo_p.h b/src/kglobalshortcutinfo_p.h
-index 4b9146f..b3fa620 100644
---- a/src/kglobalshortcutinfo_p.h
-+++ b/src/kglobalshortcutinfo_p.h
-@@ -13,6 +13,7 @@
- 
- static const int maxSequenceLength = 4;
- 
-+#include "kglobalaccel.h"
- #include "kglobalshortcutinfo.h"
- 
- class KGlobalShortcutInfoPrivate
-diff --git a/src/org.kde.KGlobalAccel.xml b/src/org.kde.KGlobalAccel.xml
-index 65f93b8..d48ce87 100644
---- a/src/org.kde.KGlobalAccel.xml
-+++ b/src/org.kde.KGlobalAccel.xml
-@@ -121,7 +121,8 @@
-       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;KGlobalShortcutInfo&gt;"/>
-       <arg name="key" type="ai" direction="in"/>
-       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QKeySequence"/>
--      <arg name="type" type="i" direction="in"/>
-+      <arg name="matchType" type="KGlobalAccel::MatchType" direction="in"/>
-+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="KGlobalAccel::MatchType"/>
-     </method>
-     <method name="globalShortcutAvailable">
-       <arg type="b" direction="out"/>
-diff --git a/src/runtime/kglobalacceld.cpp b/src/runtime/kglobalacceld.cpp
-index cf22d26..e14d419 100644
---- a/src/runtime/kglobalacceld.cpp
-+++ b/src/runtime/kglobalacceld.cpp
-@@ -13,6 +13,7 @@
- #include "globalshortcut.h"
- #include "globalshortcutcontext.h"
- #include "globalshortcutsregistry.h"
-+#include "kglobalaccel.h"
- #include "kserviceactioncomponent.h"
- #include "logging_p.h"
- 
-@@ -21,8 +22,6 @@
- #include <QMetaMethod>
- #include <QTimer>
- 
--#include "kglobalaccel.h"
--
- struct KGlobalAccelDPrivate {
-     KGlobalAccelDPrivate(KGlobalAccelD *qq)
-         : q(qq)
-@@ -175,6 +174,7 @@ bool KGlobalAccelD::init()
-     qDBusRegisterMetaType<QStringList>();
-     qDBusRegisterMetaType<KGlobalShortcutInfo>();
-     qDBusRegisterMetaType<QList<KGlobalShortcutInfo>>();
-+    qDBusRegisterMetaType<KGlobalAccel::MatchType>();
- 
-     GlobalShortcutsRegistry *reg = GlobalShortcutsRegistry::self();
-     Q_ASSERT(reg);
--- 
-GitLab
-
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.95.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.95.0-r1.ebuild
deleted file mode 100644
index 28733db44c48..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.95.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to handle global shortcuts"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-# requires installed instance
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-qt/qtdeclarative-${QTMIN}:5
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		=kde-frameworks/kdeclarative-${PVCUT}*:5
-	)
-"
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-shortcut-conflict-dialog.patch" )
-
-src_test() {
-	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
-}