summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-09 22:52:12 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-09 23:36:26 +0200
commit4fc761eb4fcf347920d8f85a46a2e59a82f28874 (patch)
treeccf4c5ca75dc2082f1b3b99cc980ce262a86d9c0 /kde-apps/kmix
parentkde-apps/dolphin: Fix crashes with Qt 5.14.2 (diff)
downloadgentoo-4fc761eb4fcf347920d8f85a46a2e59a82f28874.tar.gz
gentoo-4fc761eb4fcf347920d8f85a46a2e59a82f28874.tar.bz2
gentoo-4fc761eb4fcf347920d8f85a46a2e59a82f28874.zip
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@gentoo.org>
Diffstat (limited to 'kde-apps/kmix')
-rw-r--r--kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch71
-rw-r--r--kde-apps/kmix/kmix-19.12.3-r1.ebuild60
2 files changed, 131 insertions, 0 deletions
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 00000000000..a67b89f324e
--- /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-19.12.3-r1.ebuild b/kde-apps/kmix/kmix-19.12.3-r1.ebuild
new file mode 100644
index 00000000000..20da88330cc
--- /dev/null
+++ b/kde-apps/kmix/kmix-19.12.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="false"
+KFMIN=5.63.0
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Volume control gui based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kmix"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa plasma pulseaudio"
+
+DEPEND="
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ alsa? ( >=media-libs/alsa-lib-1.0.14a )
+ plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
+ pulseaudio? (
+ dev-libs/glib:2
+ media-libs/libcanberra
+ >=media-sound/pulseaudio-0.9.12
+ )
+"
+RDEPEND="${DEPEND}
+ >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-more-kcm_phonon.patch" ) # bug 716092
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package alsa ALSA)
+ $(cmake_use_find_package plasma KF5Plasma)
+ $(cmake_use_find_package pulseaudio Canberra)
+ $(cmake_use_find_package pulseaudio PulseAudio)
+ )
+
+ ecm_src_configure
+}