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 <ast...@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>&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)
