[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[Michael Palimaka]

commit:     1e8df41937b7b788290c29c6a59b94f809e6e93f
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat May 16 20:47:24 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 23 15:57:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1e8df419

[kde-apps/kmix] Fix build with USE=-alsa

Package-Manager: portage-2.2.19

 .../kmix/files/kmix-5.9999-alsa-optional.patch     | 26 ++++++++++++++++++++++
 kde-apps/kmix/kmix-5.9999.ebuild                   |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch b/kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch
new file mode 100644
index 0000000..92c258c
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt	2015-05-16 22:31:57.555962909 +0200
++++ b/CMakeLists.txt	2015-05-16 22:19:13.393985683 +0200
+@@ -79,7 +79,9 @@
+ endif()
+ 
+ find_package(Alsa)
+-alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++if(Alsa_FOUND)
++    alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++endif()
+ 
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
+--- a/backends/kmix-backends.cpp	2015-05-16 22:31:36.650963532 +0200
++++ b/backends/kmix-backends.cpp	2015-05-16 22:22:57.761978996 +0200
+@@ -23,7 +23,10 @@
+ /* This code is being #include'd from mixer.cpp */
+ 
+ #include <config.h>
++
++#if defined(HAVE_LIBASOUND2)
+ #include <config-alsa.h>
++#endif
+ 
+ #include "mixer_backend.h"
+ #include "core/mixer.h"

diff --git a/kde-apps/kmix/kmix-5.9999.ebuild b/kde-apps/kmix/kmix-5.9999.ebuild
index 15f3eaa..4158e29 100644
--- a/kde-apps/kmix/kmix-5.9999.ebuild
+++ b/kde-apps/kmix/kmix-5.9999.ebuild
@@ -36,6 +36,8 @@ RDEPEND="${DEPEND}
 	!kde-base/kmix:4
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.9999-alsa-optional.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DKMIX_KF5_BUILD=ON

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[Michael Palimaka]

commit:     fefdde28ef9243938974f2b830351379ebd931b3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 16:23:56 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 16:23:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fefdde28

kde-apps/kmix: backport patch from upstream to remove missing dependency.

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/files/kmix-15.04.1-deps.patch | 25 +++++++++++++++++++++++++
 kde-apps/kmix/kmix-15.08.49.9999.ebuild     |  5 ++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/kde-apps/kmix/files/kmix-15.04.1-deps.patch b/kde-apps/kmix/files/kmix-15.04.1-deps.patch
new file mode 100644
index 0000000..5a02359
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-15.04.1-deps.patch
@@ -0,0 +1,25 @@
+From ea58dd9a8cba08566ce6045341a5695d688abb45 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 20 Aug 2015 04:41:45 +1000
+Subject: [PATCH] Remove unused dependency.
+
+REVIEW:
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01afa4a..85886c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,7 +43,6 @@ if (KMIX_KF5_BUILD)
+ 		I18n
+ 		XmlGui
+ 		DBusAddons
+-		KCMUtils
+ 		KDELibs4Support)
+ 	find_package(KF5ConfigWidgets)
+ 	find_package(KF5IconThemes)
+-- 
+2.4.6
+

diff --git a/kde-apps/kmix/kmix-15.08.49.9999.ebuild b/kde-apps/kmix/kmix-15.08.49.9999.ebuild
index 16957b9..53a5a92 100644
--- a/kde-apps/kmix/kmix-15.08.49.9999.ebuild
+++ b/kde-apps/kmix/kmix-15.08.49.9999.ebuild
@@ -41,7 +41,10 @@ RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-15.04.2-alsa-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-15.04.1-deps.patch"
+	"${FILESDIR}/${PN}-15.04.2-alsa-optional.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[Andreas Sturmlechner]

commit:     db2fc91577a3d7a10cf19ed0d6deb865f3f26199
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 21:01:59 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 21:01:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=db2fc915

kde-apps/kmix: Drop no longer available kcm_phonon 'Audio Setup'

Closes: https://bugs.gentoo.org/716092
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kmix-19.12.3-no-more-kcm_phonon.patch    | 71 ++++++++++++++++++++++
 kde-apps/kmix/kmix-20.03.90.ebuild                 |  2 +
 kde-apps/kmix/kmix-20.04.49.9999.ebuild            |  2 +
 kde-apps/kmix/kmix-9999.ebuild                     |  2 +
 4 files changed, 77 insertions(+)

diff --git a/kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch b/kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch
new file mode 100644
index 0000000000..a67b89f324
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch
@@ -0,0 +1,71 @@
+From b012e900cce1e432537b192bb146f0b07dbe055c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 9 Apr 2020 22:37:28 +0200
+Subject: [PATCH] Drop no longer available kcm_phonon 'Audio Setup' from
+ Settings menu/systray
+
+---
+ apps/kmix.cpp     | 10 +++-------
+ apps/kmix.h       |  1 -
+ desktop/kmixui.rc |  1 -
+ 3 files changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/apps/kmix.cpp b/apps/kmix.cpp
+index 5b83d007..dd39a3d7 100644
+--- a/apps/kmix.cpp
++++ b/apps/kmix.cpp
+@@ -177,11 +177,7 @@ void KMixWindow::initActions()
+ 	//actionCollection()->addAction(QStringLiteral( a->objectName()), a );
+ 	KStandardAction::preferences(this, SLOT(showSettings()), actionCollection());
+ 	KStandardAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), 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);
+@@ -1209,12 +1205,12 @@ void KMixWindow::toggleMenuBar()
+ {
+ 	menuBar()->setVisible(_actionShowMenubar->isChecked());
+ }
+-
++/*
+ void KMixWindow::slotKdeAudioSetupExec()
+ {
+     forkExec(QStringList() << "kcmshell5" << "kcm_phonon");
+ }
+-
++*/
+ void KMixWindow::forkExec(const QStringList& args)
+ {
+ 	int pid = KProcess::startDetached(args);
+diff --git a/apps/kmix.h b/apps/kmix.h
+index b18ec38b..575f654a 100644
+--- a/apps/kmix.h
++++ b/apps/kmix.h
+@@ -138,7 +138,6 @@ private:
+ 	void updateTabsClosable();
+ 
+   private 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 ffb220f6..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.26.0
+

diff --git a/kde-apps/kmix/kmix-20.03.90.ebuild b/kde-apps/kmix/kmix-20.03.90.ebuild
index 5bd1c40890..5d651540c5 100644
--- a/kde-apps/kmix/kmix-20.03.90.ebuild
+++ b/kde-apps/kmix/kmix-20.03.90.ebuild
@@ -46,6 +46,8 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package alsa ALSA)

diff --git a/kde-apps/kmix/kmix-20.04.49.9999.ebuild b/kde-apps/kmix/kmix-20.04.49.9999.ebuild
index e4049c3ae4..c8c24107b6 100644
--- a/kde-apps/kmix/kmix-20.04.49.9999.ebuild
+++ b/kde-apps/kmix/kmix-20.04.49.9999.ebuild
@@ -46,6 +46,8 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package alsa ALSA)

diff --git a/kde-apps/kmix/kmix-9999.ebuild b/kde-apps/kmix/kmix-9999.ebuild
index 84f5fa929c..444a346baf 100644
--- a/kde-apps/kmix/kmix-9999.ebuild
+++ b/kde-apps/kmix/kmix-9999.ebuild
@@ -46,6 +46,8 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package alsa ALSA)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[Andreas Sturmlechner]

commit:     27c563e1bb67d0e98ccf07439152b92a79175b94
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 10:07:51 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 10:08:26 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=27c563e1

kde-apps/kmix: Disable autostart by default, amend postinst msg

Bug: https://bugs.gentoo.org/791889
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kmix-23.04.2-autostart_disable.patch     | 24 ++++++++++++++++++++++
 kde-apps/kmix/kmix-23.04.49.9999.ebuild            | 12 ++++++++---
 kde-apps/kmix/kmix-9999.ebuild                     | 12 ++++++++---
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch b/kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch
new file mode 100644
index 0000000000..8d587f2317
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch
@@ -0,0 +1,24 @@
+diff -up kmix-21.04.0/core/settings.kcfg.autostart_disable kmix-21.04.0/core/settings.kcfg
+--- kmix-21.04.0/core/settings.kcfg.autostart_disable	2021-04-28 16:34:04.623152452 -0500
++++ kmix-21.04.0/core/settings.kcfg	2021-04-28 16:31:03.076698930 -0500
+@@ -57,7 +57,7 @@
+     <!-- Set by KMixPrefDlg, read by kmix_autostart.desktop	-->
+ 
+     <entry name="AutoStart" type="Bool">
+-      <default>true</default>
++      <default>false</default>
+     </entry>
+ 
+     <!-- Saved by KMixWindow::saveBaseConfig() and loaded	-->
+diff -up kmix-21.04.0/desktop/kmix_autostart.desktop.autostart_disable kmix-21.04.0/desktop/kmix_autostart.desktop
+--- kmix-21.04.0/desktop/kmix_autostart.desktop.autostart_disable	2021-04-28 16:34:18.456263203 -0500
++++ kmix-21.04.0/desktop/kmix_autostart.desktop	2021-04-28 16:32:58.722624829 -0500
+@@ -8,7 +8,7 @@ X-KDE-autostart-after=panel
+ X-KDE-autostart-after=pulseaudio
+ X-KDE-StartupNotify=false
+ X-DBUS-StartupType=Unique
+-X-KDE-autostart-condition=kmixrc:Global:AutoStart:true
++X-KDE-autostart-condition=kmixrc:Global:AutoStart:false
+ Icon=kmix
+ GenericName=Sound Mixer
+ GenericName[bg]=Звуков смесител

diff --git a/kde-apps/kmix/kmix-23.04.49.9999.ebuild b/kde-apps/kmix/kmix-23.04.49.9999.ebuild
index 7adfd7fcfa..533aa0cb01 100644
--- a/kde-apps/kmix/kmix-23.04.49.9999.ebuild
+++ b/kde-apps/kmix/kmix-23.04.49.9999.ebuild
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
 	kde-plasma/kde-cli-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package alsa ALSA)
@@ -57,12 +59,16 @@ src_configure() {
 
 pkg_postinst() {
 	if use pulseaudio && has_version kde-plasma/plasma-pa; then
-		elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler."
-		elog "Should you prefer this to be kde-apps/kmix instead, do the following:"
+		elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler,"
+		elog "therefore, autostart by default was disabled for KMix."
+		elog
+		elog "Should you prefer to still use kde-apps/kmix instead, do the following:"
 		elog " - In system tray, right click on [Show hidden items]"
 		elog " - Select [Configure System Tray]"
 		elog " - In [Entries],  search for [Audio Volume] and set it to [Disabled]"
-		elog "KMix will be shown as [Volume Control]."
+		elog
 	fi
+	elog "KMix will be shown as [Volume Control] after manually starting it once"
+	elog "and will be autostarted after configuring such in KMix startup settings."
 	ecm_pkg_postinst
 }

diff --git a/kde-apps/kmix/kmix-9999.ebuild b/kde-apps/kmix/kmix-9999.ebuild
index 7adfd7fcfa..533aa0cb01 100644
--- a/kde-apps/kmix/kmix-9999.ebuild
+++ b/kde-apps/kmix/kmix-9999.ebuild
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
 	kde-plasma/kde-cli-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package alsa ALSA)
@@ -57,12 +59,16 @@ src_configure() {
 
 pkg_postinst() {
 	if use pulseaudio && has_version kde-plasma/plasma-pa; then
-		elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler."
-		elog "Should you prefer this to be kde-apps/kmix instead, do the following:"
+		elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler,"
+		elog "therefore, autostart by default was disabled for KMix."
+		elog
+		elog "Should you prefer to still use kde-apps/kmix instead, do the following:"
 		elog " - In system tray, right click on [Show hidden items]"
 		elog " - Select [Configure System Tray]"
 		elog " - In [Entries],  search for [Audio Volume] and set it to [Disabled]"
-		elog "KMix will be shown as [Volume Control]."
+		elog
 	fi
+	elog "KMix will be shown as [Volume Control] after manually starting it once"
+	elog "and will be autostarted after configuring such in KMix startup settings."
 	ecm_pkg_postinst
 }

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[Andreas Sturmlechner]

commit:     f1bcb9a063b092de94dcc3d595cd6438450a85be
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 17:31:13 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 18:23:20 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f1bcb9a0

kde-apps/kmix: Patch out implicit kde-plasma/plasma-pa RDEPEND

Makes it possible to drop the (futile, anyway) dependency on
kde-plasma/kde-cli-tools:* for runtime usage of kcmshell.

Re-adding a respun patch removed in PR 40498.

Closes: https://github.com/gentoo/gentoo/pull/40498
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...> kmix-24.12.2-revert-kcm_pulseaudio-dep.patch} | 48 +++++++++++-----------
 kde-apps/kmix/kmix-9999.ebuild                     |  7 +++-
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch b/kde-apps/kmix/files/kmix-24.12.2-revert-kcm_pulseaudio-dep.patch
similarity index 63%
rename from kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch
rename to kde-apps/kmix/files/kmix-24.12.2-revert-kcm_pulseaudio-dep.patch
index 23987a8261..15d9b8b147 100644
--- a/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch
+++ b/kde-apps/kmix/files/kmix-24.12.2-revert-kcm_pulseaudio-dep.patch
@@ -1,49 +1,51 @@
-From 8d6837131706bd0f5dbd573726e7c01775f8256c Mon Sep 17 00:00:00 2001
+From dfa2433dc58ddb24f7d9070c963d0267edf9e4b0 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.cpp | 24 ------------------------
  apps/kmixwindow.h   |  2 --
  desktop/kmixui.rc   |  1 -
- 3 files changed, 1 insertion(+), 24 deletions(-)
+ 3 files changed, 27 deletions(-)
 
 diff --git a/apps/kmixwindow.cpp b/apps/kmixwindow.cpp
-index fa727f39..fb182f49 100644
+index f548edd3..ae86d653 100644
 --- a/apps/kmixwindow.cpp
 +++ b/apps/kmixwindow.cpp
-@@ -37,7 +37,6 @@
+@@ -38,8 +38,6 @@
  #include <klocalizedstring.h>
  #include <kstandardaction.h>
  #include <kxmlguifactory.h>
--#include <KProcess>
+-#include <kprocess.h>
+-#include <kcoreaddons_version.h>
  
  // KMix
  #include "kmix_debug.h"
-@@ -164,11 +163,7 @@ void KMixWindow::initActions()
- 
+@@ -172,11 +170,6 @@ void KMixWindow::initActions()
+ 	KStandardAction::preferences(this, &KMixWindow::showSettings, actionCollection());
  	KStandardAction::keyBindings(guiFactory(), &KXMLGUIFactory::showConfigureShortcutsDialog, actionCollection());
  
--	QAction* action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup"));
+-	action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup"));
 -	action->setText(i18n("Audio Setup..."));
--	connect(action, SIGNAL(triggered(bool)), SLOT(slotKdeAudioSetupExec()));
+-	action->setIcon(QIcon::fromTheme("speaker"));
+-	connect(action, &QAction::triggered, this, &KMixWindow::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()
+ 	action = actionCollection()->addAction(QStringLiteral("toggle_channels_currentview"));
+ 	action->setText(i18n("Configure &Channels..."));
+ 	action->setIcon(QIcon::fromTheme("settings-channels"));
+@@ -1171,23 +1164,6 @@ void KMixWindow::toggleMenuBar()
  	menuBar()->setVisible(_actionShowMenubar->isChecked());
  }
  
+-
 -void KMixWindow::slotKdeAudioSetupExec()
 -{
--    forkExec(QStringList() << "kcmshell5" << "kcm_pulseaudio");
+-    forkExec(QStringList() << QString("kcmshell%1").arg(KCOREADDONS_VERSION_MAJOR) << "kcm_pulseaudio");
 -}
 -
+-
 -void KMixWindow::forkExec(const QStringList& args)
 -{
 -   int pid = KProcess::startDetached(args);
@@ -56,20 +58,20 @@ index fa727f39..fb182f49 100644
 -
  void KMixWindow::slotConfigureCurrentView()
  {
- 	KMixerWidget *mw = qobject_cast<KMixerWidget *>(m_wsMixers->currentWidget());
+ 	const KMixerWidget *mw = qobject_cast<const KMixerWidget  *>(m_wsMixers->currentWidget());
 diff --git a/apps/kmixwindow.h b/apps/kmixwindow.h
-index 67560723..0bcb04ed 100644
+index 8e0a04cc..5711d452 100644
 --- a/apps/kmixwindow.h
 +++ b/apps/kmixwindow.h
-@@ -86,7 +86,6 @@ protected Q_SLOTS:
+@@ -88,7 +88,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:
+     bool m_startVisible;
+@@ -120,7 +119,6 @@ private:
      static QString getKmixctrlRcFilename(const QString &postfix);
  
  private Q_SLOTS:
@@ -90,5 +92,5 @@ index 5c53281a..27ca3351 100644
   <Menu name="help" append="about_merge"><text>&amp;Help</text>
    <Action name="hwinfo"/>
 -- 
-2.46.0
+GitLab
 

diff --git a/kde-apps/kmix/kmix-9999.ebuild b/kde-apps/kmix/kmix-9999.ebuild
index 6e4187ddad..4e953a7220 100644
--- a/kde-apps/kmix/kmix-9999.ebuild
+++ b/kde-apps/kmix/kmix-9999.ebuild
@@ -41,7 +41,12 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}/${PN}-23.04.2-autostart_disable.patch"
+	# Pending: https://invent.kde.org/multimedia/kmix/-/merge_requests/29
+	"${FILESDIR}/${PN}-24.12.2-revert-kcm_pulseaudio-dep.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(