commit: 844f8131b00063c6e3723304f63c8b54c19d5c77 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:11:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=844f8131
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 | 96 ++++++++++++++++++++++ kde-apps/kmix/kmix-24.12.1.ebuild | 9 ++ kde-apps/kmix/kmix-24.12.2.ebuild | 7 +- 3 files changed, 111 insertions(+), 1 deletion(-) diff --git a/kde-apps/kmix/files/kmix-24.12.2-revert-kcm_pulseaudio-dep.patch b/kde-apps/kmix/files/kmix-24.12.2-revert-kcm_pulseaudio-dep.patch new file mode 100644 index 000000000000..15d9b8b14718 --- /dev/null +++ b/kde-apps/kmix/files/kmix-24.12.2-revert-kcm_pulseaudio-dep.patch @@ -0,0 +1,96 @@ +From dfa2433dc58ddb24f7d9070c963d0267edf9e4b0 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@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 | 24 ------------------------ + apps/kmixwindow.h | 2 -- + desktop/kmixui.rc | 1 - + 3 files changed, 27 deletions(-) + +diff --git a/apps/kmixwindow.cpp b/apps/kmixwindow.cpp +index f548edd3..ae86d653 100644 +--- a/apps/kmixwindow.cpp ++++ b/apps/kmixwindow.cpp +@@ -38,8 +38,6 @@ + #include <klocalizedstring.h> + #include <kstandardaction.h> + #include <kxmlguifactory.h> +-#include <kprocess.h> +-#include <kcoreaddons_version.h> + + // KMix + #include "kmix_debug.h" +@@ -172,11 +170,6 @@ void KMixWindow::initActions() + KStandardAction::preferences(this, &KMixWindow::showSettings, actionCollection()); + KStandardAction::keyBindings(guiFactory(), &KXMLGUIFactory::showConfigureShortcutsDialog, actionCollection()); + +- action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup")); +- action->setText(i18n("Audio Setup...")); +- action->setIcon(QIcon::fromTheme("speaker")); +- connect(action, &QAction::triggered, this, &KMixWindow::slotKdeAudioSetupExec); +- + 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() << QString("kcmshell%1").arg(KCOREADDONS_VERSION_MAJOR) << "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() + { + const KMixerWidget *mw = qobject_cast<const KMixerWidget *>(m_wsMixers->currentWidget()); +diff --git a/apps/kmixwindow.h b/apps/kmixwindow.h +index 8e0a04cc..5711d452 100644 +--- a/apps/kmixwindow.h ++++ b/apps/kmixwindow.h +@@ -88,7 +88,6 @@ protected Q_SLOTS: + + private: + KMixerWidget* findKMWforTab( const QString& tabId ); +- void forkExec(const QStringList& args); + KToggleAction* _actionShowMenubar; + + bool m_startVisible; +@@ -120,7 +119,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>&Help</text> + <Action name="hwinfo"/> +-- +GitLab + diff --git a/kde-apps/kmix/kmix-24.12.1.ebuild b/kde-apps/kmix/kmix-24.12.1.ebuild index e7369612f269..eb66fa7a4ed1 100644 --- a/kde-apps/kmix/kmix-24.12.1.ebuild +++ b/kde-apps/kmix/kmix-24.12.1.ebuild @@ -41,7 +41,16 @@ DEPEND=" " RDEPEND="${DEPEND}" +<<<<<<< HEAD:kde-apps/kmix/kmix-24.12.1.ebuild 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.05.2-revert-kcm_pulseaudio-dep.patch" +) +>>>>>>> aa17c6dbaed7 (kde-apps/kmix: Reference pending upstream MR):kde-apps/kmix/kmix-24.08.49.9999.ebuild src_configure() { local mycmakeargs=( diff --git a/kde-apps/kmix/kmix-24.12.2.ebuild b/kde-apps/kmix/kmix-24.12.2.ebuild index 7eeb00ced8fe..6ce4583cb59f 100644 --- a/kde-apps/kmix/kmix-24.12.2.ebuild +++ b/kde-apps/kmix/kmix-24.12.2.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=(
