2 files changed, 0 insertions, 95 deletions
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index b32cab97ba02..343c94b57597 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,4 @@
 AUX kmix-23.04.2-autostart_disable.patch 1151 BLAKE2B 9f9609a39f66e97d7a6427fae6aaf14c0f65755b05ddfe55d05ad49f42463960d4e9a9f97eae9a38311174b376c8e182336ec4bed793f36a02cd2aa71bda3d42 SHA512 5d1ded259efc871d4b4d9b6fd43aff29970f9c04579cdd1419563a08761cb4fbb9d16642cb648d547aeec7c53b26976d49e30e2e0c8cae23b3bb2d7ba1fa6b9b
-AUX kmix-24.05.2-revert-kcm_pulseaudio-dep.patch 3237 BLAKE2B 5587e62301a0f4c9ee70ed227472ef12cbfd8a6fbaf9446c312131ed7cd51434c641b872ef8aba0ce71b0300a2040e93cbb19674003d684405e747218dc5cbb7 SHA512 f9bb9a81269ab42b89bd3599ee14df4cb5ef6f645aae6039e3f25107ce0eb57c53b74049d52613bb2a52e3552b23fc300b73e5d07dadbea4652af1bdc99cd8fe
 DIST kmix-24.12.1.tar.xz 1167696 BLAKE2B 632818aa612bcbebcefea0e772eaee42e807495befcddf6a2bc1013341e61dc53c699daa8ebd83def1bc834259fd021092f0cb63f28a59ef192f33a5366e465c SHA512 fc089dc3afeb5a80b2742dba2f3e46bdc2c63c0e9393adac10854107492d34ddbc86d3ba02fcda6e0cc06494631afa8c05ce1800c17d797c0936823374310e69
 DIST kmix-24.12.2.tar.xz 1167820 BLAKE2B 2a9a01fee22f0990b4f541cac292b01c813dcafc8ba281bb4cc8542ac6625a484e652f85a655be1b49493233272481ef8d8bf5eb444299c72ae682529f08ddd2 SHA512 c84550640e4ed2ff621780b8e50ba40ca4f31b4837552905f0a1e7792672997978b298142df092c3112d513652719086a9be424499730bcd5e038495708b1ffc
 EBUILD kmix-24.12.1.ebuild 2166 BLAKE2B ac35dd476023b8c55469e3fc90eedf08bd6797eb0ade0d3723d667971ca77ad26fa2b6404c6e4cdbaacf9f08b3f1e88c27d2710000abfde2c810a1a5ef08b400 SHA512 6c6beda8e8d93bfc1206ea29a803fec1ddccef14b57a62cb4463b4239136bf4de830c0bbed0c3b30ba84084f05266679cc6cf67bf7858698000388ac76a75f42
diff --git a/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch b/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch
deleted file mode 100644
index 23987a8261db..000000000000
--- a/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 8d6837131706bd0f5dbd573726e7c01775f8256c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 4 Sep 2024 08:03:09 +0200
-Subject: [PATCH] Revert "When we click on "Audio Setup", calls kcm_pulseaudio"
-
-This reverts commit a54f760987557036b90888a3efa7ad17346a00ed.
----
- apps/kmixwindow.cpp | 22 +---------------------
- apps/kmixwindow.h   |  2 --
- desktop/kmixui.rc   |  1 -
- 3 files changed, 1 insertion(+), 24 deletions(-)
-
-diff --git a/apps/kmixwindow.cpp b/apps/kmixwindow.cpp
-index fa727f39..fb182f49 100644
---- a/apps/kmixwindow.cpp
-+++ b/apps/kmixwindow.cpp
-@@ -37,7 +37,6 @@
- #include <klocalizedstring.h>
- #include <kstandardaction.h>
- #include <kxmlguifactory.h>
--#include <KProcess>
- 
- // KMix
- #include "kmix_debug.h"
-@@ -164,11 +163,7 @@ void KMixWindow::initActions()
- 
- 	KStandardAction::keyBindings(guiFactory(), &KXMLGUIFactory::showConfigureShortcutsDialog, actionCollection());
- 
--	QAction* action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup"));
--	action->setText(i18n("Audio Setup..."));
--	connect(action, SIGNAL(triggered(bool)), SLOT(slotKdeAudioSetupExec()));
--
--	action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow"));
-+	QAction* action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow"));
- 	action->setText(i18n("Hide Mixer Window"));
- 	connect(action, SIGNAL(triggered(bool)), SLOT(hideOrClose()));
- 	actionCollection()->setDefaultShortcut(action, Qt::Key_Escape);
-@@ -1174,21 +1169,6 @@ void KMixWindow::toggleMenuBar()
- 	menuBar()->setVisible(_actionShowMenubar->isChecked());
- }
- 
--void KMixWindow::slotKdeAudioSetupExec()
--{
--    forkExec(QStringList() << "kcmshell5" << "kcm_pulseaudio");
--}
--
--void KMixWindow::forkExec(const QStringList& args)
--{
--   int pid = KProcess::startDetached(args);
--   if (pid == 0)
--   {
--       KMessageBox::error(this, i18n("The helper application is either not installed or not working.\n\n%1",
--                         args.join(QLatin1String(" "))));
--   }
--}
--
- void KMixWindow::slotConfigureCurrentView()
- {
- 	KMixerWidget *mw = qobject_cast<KMixerWidget *>(m_wsMixers->currentWidget());
-diff --git a/apps/kmixwindow.h b/apps/kmixwindow.h
-index 67560723..0bcb04ed 100644
---- a/apps/kmixwindow.h
-+++ b/apps/kmixwindow.h
-@@ -86,7 +86,6 @@ protected Q_SLOTS:
- 
- private:
-     KMixerWidget* findKMWforTab( const QString& tabId );
--    void forkExec(const QStringList& args);
-     KToggleAction* _actionShowMenubar;
- 
-    bool m_startVisible;
-@@ -117,7 +116,6 @@ private:
-     static QString getKmixctrlRcFilename(const QString &postfix);
- 
- private Q_SLOTS:
--   void slotKdeAudioSetupExec();
-    void slotConfigureCurrentView();
- 
-    void plugged(const char *driverName, const QString &udi, int dev);
-diff --git a/desktop/kmixui.rc b/desktop/kmixui.rc
-index 5c53281a..27ca3351 100644
---- a/desktop/kmixui.rc
-+++ b/desktop/kmixui.rc
-@@ -16,7 +16,6 @@
-  <Menu name="settings">
-      <Action name="toggle_channels_currentview" append="save_merge"/>
-      <Action name="select_master" append="save_merge"/>
--     <Action name="launch_kdesoundsetup" append="save_merge"/>
-  </Menu>
-  <Menu name="help" append="about_merge"><text>&amp;Help</text>
-   <Action name="hwinfo"/>
--- 
-2.46.0
-