diff options
| -rw-r--r-- | kde-apps/kmix/Manifest | 1 | ||||
| -rw-r--r-- | kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch | 71 | ||||
| -rw-r--r-- | kde-apps/kmix/kmix-20.04.3.ebuild | 60 |
3 files changed, 0 insertions, 132 deletions
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest index d55b12b9ca9b..994efc8a380b 100644 --- a/kde-apps/kmix/Manifest +++ b/kde-apps/kmix/Manifest @@ -1,2 +1 @@ -DIST kmix-20.04.3.tar.xz 1006804 BLAKE2B 0707be0dbb18ca6377b99a718b98fe4ddafaaabf129b319704d8da826b48a08a956c538eba83859adec3471c1267150d94889b602dc7b4b6550d717b45bf9fd7 SHA512 80387a63fb8a9155448ae0c78fbf214a471e148561609e20af61830fed5172f203585d7502ca2dc1ade404eb0e9259d81a84039ba99342a2e3bb9d5ed6ba3b78 DIST kmix-20.08.3.tar.xz 1107672 BLAKE2B 3cc1f4b555a29aa2ec042824ca7b6db22adf886f352d67b923a6cb82f95f0526875c15e94c7bfa6714083a25fe33df68709e1b788b4886f0b046049652759a87 SHA512 76fa76c85060430d924bd322d6dffe9ad61b8036560c2382e6327c005a0ab70c05459c4ec6591f3456da3a84c09cb930ae3f145beb80c4c9f4a37f8514791c78 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 deleted file mode 100644 index a67b89f324e0..000000000000 --- a/kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch +++ /dev/null @@ -1,71 +0,0 @@ -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>&Help</text> - <Action name="hwinfo"/> --- -2.26.0 - diff --git a/kde-apps/kmix/kmix-20.04.3.ebuild b/kde-apps/kmix/kmix-20.04.3.ebuild deleted file mode 100644 index 8b7a5b6fedf1..000000000000 --- a/kde-apps/kmix/kmix-20.04.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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.70.0 -PLASMA_MINIMAL=5.16.5 -QTMIN=5.14.2 -inherit ecm kde.org - -DESCRIPTION="Volume control gui based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/en/kmix" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="alsa plasma pulseaudio" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=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 - 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}/${PN}-19.12.3-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 -} |