gentoo auto-resync : 25:12:2023 - 01:35:27

2 files changed, 0 insertions, 157 deletions

diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 69c2f91d5914..4cba95efcf63 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,4 +1,3 @@
-AUX kxmlgui-5.111.0-fix-xml-merging.patch 5241 BLAKE2B 2b234a308039c343fd85788b02bdcef1339bcc53b3634ed5bed69dd5531b491d84b39dfb263f05ccd2a04b6ff034f7d7d3256d10a5eee45d929c236b7b40a4bf SHA512 4f47192c1f2bf5db6708979d418579cdc8c58387613ab2cb5bb89b0557f8d86ee0057edd9de3ea7a485b9a383a854094d2fef8bd85468942989bd5c4fc68b3e4
 DIST kxmlgui-5.112.0.tar.xz 2953408 BLAKE2B 4ff1abd53ea73a3b3c267b027c91a5db46d184a953c2d5b000049c03237bf90e334adff18756f338f72001f73a826b74607d102376be61814b71bb574a27a5fa SHA512 cbbdda28de20569826bd59e4b6f0fe5e5eb3ab380dd45e31da0d04dda74f940139502e0a8223b3f356156cd388c40ff803fe61f9eec60062ff29a9c65c223493
 DIST kxmlgui-5.113.0.tar.xz 2953380 BLAKE2B 8b7b3a7c9ab4e24154cd5f38243a57a0227d3890b03a3220d1f70821a86ed5c255d91ae11a3f60c3b6fcde68f85585783d474605b46a18e8b65af29310a70dbd SHA512 35c18ccabcc51b70b12e5b5faa8534e2f6793e916d97fc8ad6a1f5001b500f61f730006741f105fd40f37cef29524677bf2dca76093bbe12277c907378c87624
 DIST kxmlgui-5.247.0.tar.xz 2936280 BLAKE2B 3c36df34ac5a356c502057a97790a5df3437e84637713f1efb87197a2e969e5eda6a41b4c27d349e295e90df0c14d78a573ee26cc0a9d51c0e9a76ea0f8a55dd SHA512 ff4df6da5399c0650495242d8344f501002957d30d521ab037e0d34c321aaa9f438522ddb80cc31ed05ef7a8be9120b41ba6b40a35dd7e0fa9f46725df561d62
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.111.0-fix-xml-merging.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.111.0-fix-xml-merging.patch
deleted file mode 100644
index 013fbab9d1c7..000000000000
--- a/kde-frameworks/kxmlgui/files/kxmlgui-5.111.0-fix-xml-merging.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-https://invent.kde.org/frameworks/kxmlgui/-/merge_requests/190
-https://bugs.kde.org/show_bug.cgi?id=475016
-
-From f015fa6006d2e2eea2d2aac11c18219b255722ef Mon Sep 17 00:00:00 2001
-From: Mladen Milinkovic <maxrd2@smoothware.net>
-Date: Fri, 29 Sep 2023 20:01:49 +0200
-Subject: [PATCH] Fix merging of XMLs with multiple ActionProperties tags
-
-BUG: 475016
---- a/autotests/kxmlgui_unittest.cpp
-+++ b/autotests/kxmlgui_unittest.cpp
-@@ -88,6 +88,26 @@ static void createXmlFile(QFile &file, int version, int flags, const QByteArray
-     file.write("</" + toplevelTag + ">\n");
- }
- 
-+class ShortcutSchemeHandler
-+{
-+public:
-+    ShortcutSchemeHandler(const QString &scheme)
-+        : cgScheme(KSharedConfig::openConfig(), "Shortcut Schemes")
-+        , prevScheme(cgScheme.readEntry("Current Scheme", QStringLiteral("Default")))
-+    {
-+        cgScheme.writeEntry("Current Scheme", scheme);
-+    }
-+
-+    ~ShortcutSchemeHandler()
-+    {
-+        cgScheme.writeEntry("Current Scheme", prevScheme);
-+    }
-+
-+private:
-+    KConfigGroup cgScheme;
-+    const QString prevScheme;
-+};
-+
- static void clickApply(KEditToolBar *dialog)
- {
-     QDialogButtonBox *box = dialog->findChild<QDialogButtonBox *>();
-@@ -106,6 +126,15 @@ void KXmlGui_UnitTest::initTestCase()
-         QFile::remove(configFile);
-         KSharedConfig::openConfig()->reparseConfiguration();
-     }
-+
-+    // Create "Test" shortcut scheme to eliminate the KF warning
-+    QFile testScheme = QFile(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
-+        + QLatin1String("/%1/shortcuts/%2").arg(QCoreApplication::applicationName(), QStringLiteral("Test")));
-+    if (!testScheme.exists()) {
-+        QVERIFY(QFileInfo(testScheme).dir().mkpath(QStringLiteral(".")));
-+        QVERIFY(testScheme.open(QIODevice::WriteOnly));
-+        testScheme.write(QByteArray("<gui><ActionProperties/></gui>"));
-+    }
- }
- 
- void KXmlGui_UnitTest::testFindVersionNumber_data()
-@@ -457,6 +486,56 @@ void KXmlGui_UnitTest::testPartMerging()
-     factory.removeClient(&hostClient);
- }
- 
-+void KXmlGui_UnitTest::testShortcutSchemeMerging()
-+{
-+    TestGuiClient client;
-+
-+    ShortcutSchemeHandler sss(QStringLiteral("Test"));
-+
-+    KActionCollection *ac = client.actionCollection();
-+
-+    QAction *a = ac->addAction(QStringLiteral("test_action"));
-+    ac->setDefaultShortcut(a, QKeySequence(QStringLiteral("Ctrl+A")));
-+
-+    const QByteArray appXml = R"(<?xml version = "1.0"?>
-+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-+<kpartgui name="foo" version="5">
-+<MenuBar>
-+  <Menu name="file"><text>&amp;File</text>
-+    <Action name="test_action" />
-+  </Menu>
-+</MenuBar></kpartgui>
-+)";
-+    client.createGUI(appXml, false);
-+
-+    const QByteArray settingsXml = R"(<!DOCTYPE kpartgui SYSTEM 'kpartgui.dtd'>
-+<kpartgui name="foo" version="1">
-+ <MenuBar>
-+  <Menu name="file">
-+   <text>&amp;File</text>
-+   <Action name="test_action" />
-+  </Menu>
-+ </MenuBar>
-+ <ActionProperties scheme="Default">
-+  <Action name="test_action" shortcut="Ctrl+B"/>
-+ </ActionProperties>
-+ <ActionProperties scheme="Test">
-+  <Action name="test_action" shortcut="Ctrl+C"/>
-+ </ActionProperties>
-+</kpartgui>
-+)";
-+    client.mergeXML(settingsXml);
-+
-+    KMainWindow mainWindow;
-+    KXMLGUIBuilder builder(&mainWindow);
-+    KXMLGUIFactory factory(&builder);
-+    factory.addClient(&client);
-+
-+    QCOMPARE(a->shortcut(), QKeySequence(QStringLiteral("Ctrl+C")));
-+
-+    factory.removeClient(&client);
-+}
-+
- void KXmlGui_UnitTest::testPartMergingSettings() // #252911
- {
-     const QByteArray hostXml =
---- a/autotests/kxmlgui_unittest.h
-+++ b/autotests/kxmlgui_unittest.h
-@@ -23,6 +23,7 @@ private Q_SLOTS:
-     void testVersionHandlerNewVersionUserChanges();
-     void testPartMerging();
-     void testPartMergingSettings();
-+    void testShortcutSchemeMerging();
-     void testUiStandardsMerging_data();
-     void testUiStandardsMerging();
-     void testActionListAndSeparator();
---- a/autotests/testguiclient.h
-+++ b/autotests/testguiclient.h
-@@ -42,6 +42,10 @@ public:
- 
-         setXML(QString::fromLatin1(xml), true);
-     }
-+    void mergeXML(const QByteArray &xml)
-+    {
-+        setXML(QString::fromLatin1(xml), true);
-+    }
-     void createActions(const QStringList &actionNames)
-     {
-         KActionCollection *coll = actionCollection();
---- a/src/kxmlguiclient.cpp
-+++ b/src/kxmlguiclient.cpp
-@@ -587,6 +587,8 @@ bool KXMLGUIClientPrivate::isEmptyContainer(const QDomElement &base, KActionColl
- 
- QDomElement KXMLGUIClientPrivate::findMatchingElement(const QDomElement &base, const QDomElement &additive)
- {
-+    const QString idAttribute(base.tagName() == QLatin1String("ActionProperties") ? QStringLiteral("scheme") : QStringLiteral("name"));
-+
-     QDomNode n = additive.firstChild();
-     while (!n.isNull()) {
-         QDomElement e = n.toElement();
-@@ -604,7 +606,7 @@ QDomElement KXMLGUIClientPrivate::findMatchingElement(const QDomElement &base, c
- 
-         // now see if our tags are equivalent
-         if (equalstr(tag, base.tagName()) //
--            && e.attribute(QStringLiteral("name")) == base.attribute(QStringLiteral("name"))) {
-+            && e.attribute(idAttribute) == base.attribute(idAttribute)) {
-             return e;
-         }
-     }
--- 
-GitLab