From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- kde-apps/kmix/Manifest | 8 +-- .../files/kmix-19.12.3-no-more-kcm_phonon.patch | 71 ++++++++++++++++++++++ kde-apps/kmix/kmix-19.08.3.ebuild | 57 ----------------- kde-apps/kmix/kmix-19.12.2.ebuild | 58 ------------------ kde-apps/kmix/kmix-19.12.3-r1.ebuild | 60 ++++++++++++++++++ kde-apps/kmix/kmix-19.12.3.ebuild | 58 ++++++++++++++++++ 6 files changed, 193 insertions(+), 119 deletions(-) create mode 100644 kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch delete mode 100644 kde-apps/kmix/kmix-19.08.3.ebuild delete mode 100644 kde-apps/kmix/kmix-19.12.2.ebuild create mode 100644 kde-apps/kmix/kmix-19.12.3-r1.ebuild create mode 100644 kde-apps/kmix/kmix-19.12.3.ebuild (limited to 'kde-apps/kmix') diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest index c1ade207ca68..87b9910eddc4 100644 --- a/kde-apps/kmix/Manifest +++ b/kde-apps/kmix/Manifest @@ -1,5 +1,5 @@ -DIST kmix-19.08.3.tar.xz 1005308 BLAKE2B 0012bba9b539d612452153c200a62adc3275d8a206b053b9b82f886d0568bf2be0a7a3642473d0145c37101ce00b864184e95a4fbf81c4add5645bcc3f860652 SHA512 d2fb9e02c9981974c3df5438fb3e7544d64a51c7fff6ca5565dbb7bd06beda6bef2268fc5f343cf7acdfc8eb7d0f21d10f85feb7222adaaef1305d587e31cad0 -DIST kmix-19.12.2.tar.xz 1006716 BLAKE2B 2b08d97f8a422e4d6fca4b21b74f6d5071d4a26dcb0e54b107a1840876a6214e829f9578d2f61cbce3bbfbcd804f21337bd3b0e0316eec09df13095aeb6c0787 SHA512 948e4881b56a8fc0b707940607f67c401b2644189acfe653b8ac35a8d035eff4a79b8c0890248785062a7696aa785b347cab37ae6882b64f993f242adabd8bf7 -EBUILD kmix-19.08.3.ebuild 1456 BLAKE2B 487533b0b714afcdbcf3429844c6a50758b8b441110c7dc958b37f9d82e720daaa80ae04f776d972ab9f79e8e94a1691b6e2be8fabb46cdbb0c513e0e8768eda SHA512 9fe94ad313e4ebd5063fbc57fefff59a13ca490d278befecb80dc95d6a5dcd87508533347ba9f13ab6e01d9f73ef0aff6e25a6a75cf4233b48748378e7cdd582 -EBUILD kmix-19.12.2.ebuild 1523 BLAKE2B c7f52148058006643748be14ca105444bdd2559e49a3f625e6d22fc07a70a96f78fd98b3cadfdb8c9e782f5a5d4f035d90eafb0c6b60b262f39f363051a7e85e SHA512 73b6eb10d449bb365f12adb0b265f0cded8f5c6deda3a1c8532b00d98ab339945ae7d635fd3d281e48e9f2172cb4a8d84177fc9fadf0916b5c90f4669f590669 +AUX kmix-19.12.3-no-more-kcm_phonon.patch 2511 BLAKE2B 553c4766bb25f04b6977a66c229d13c39caee17145af4f26919141fb7924d49bd88058410adfc3a02136071fc5150db1f089e2d5cd9e1f79ef402e6a2e9d4661 SHA512 f2b9dac29c93270a785c35441cfa46da1fe9daf96896210a6ee9fa3c5dbbb422645f396c4f73d943352fb8c49caddcf59fe60858d3e020211e70b8b6eaf67692 +DIST kmix-19.12.3.tar.xz 1007752 BLAKE2B afca6f55b7c4bf63514226e9c969e92a927c84e3d1812835ab280218fa860fb8b7e83f47290bbfca8bacd6d9f9a68a5fce83ad6d0cc45c06228d245486e7cf75 SHA512 bcf2cfabfd6832bab153c7c05ca3811dc6109629af524820f5ca0ffdc779d6dbbe1ddd4457ad289987bd97bcdebf59d55cd47d94e9af75c1cea89d62b233b5e2 +EBUILD kmix-19.12.3-r1.ebuild 1593 BLAKE2B 03902653ec7609abe76b833fefa0aa4b7a6a430f4c43b8bf9ffd126fc2d92f2bf1f608a2198d7ca15824da4cb2402b4e79657c040e4f0c340a22212eae1cbb91 SHA512 319bd6890f9b2ff07df15d8eb15d9672dd29056a27ef670755ba5fd24f9fa3c883a0559b59a001bf9d4c49ff94e842b42460a27ebae4d016c32713408dbf3f19 +EBUILD kmix-19.12.3.ebuild 1520 BLAKE2B 173837953fb6c7e54ce42e99efad421826dbc31dcb5b5288815bad9a44970fcfba9c901df4c2b16b507c8a358c7f5090c54cd422d1d21f163502ed178a4ca7b6 SHA512 31d6de7fc36404550631c404b301b280636cc9a901e2eaf3615e9a7fe022aafa9ba748bb780399f0a145247973e710660effc53ce2681e2cce766c3f8308cfbe MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 000000000000..a67b89f324e0 --- /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 +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 @@ + + + +- + + &Help + +-- +2.26.0 + diff --git a/kde-apps/kmix/kmix-19.08.3.ebuild b/kde-apps/kmix/kmix-19.08.3.ebuild deleted file mode 100644 index 06539e35dd32..000000000000 --- a/kde-apps/kmix/kmix-19.08.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="false" -KFMIN=5.60.0 -PLASMA_MINIMAL=5.16.5 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Plasma mixer gui" -HOMEPAGE="https://kde.org/applications/multimedia/kmix/" -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 x86" -IUSE="alsa 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/kiconthemes-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${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 ) - pulseaudio? ( - dev-libs/glib:2 - media-libs/libcanberra - >=media-sound/pulseaudio-0.9.12 - ) -" -RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package alsa ALSA) - $(cmake_use_find_package pulseaudio Canberra) - $(cmake_use_find_package pulseaudio PulseAudio) - ) - - ecm_src_configure -} diff --git a/kde-apps/kmix/kmix-19.12.2.ebuild b/kde-apps/kmix/kmix-19.12.2.ebuild deleted file mode 100644 index 5564f3ad76ee..000000000000 --- a/kde-apps/kmix/kmix-19.12.2.ebuild +++ /dev/null @@ -1,58 +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.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 -" - -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 -} 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 000000000000..20da88330cc2 --- /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 +} diff --git a/kde-apps/kmix/kmix-19.12.3.ebuild b/kde-apps/kmix/kmix-19.12.3.ebuild new file mode 100644 index 000000000000..ade41f9d37b5 --- /dev/null +++ b/kde-apps/kmix/kmix-19.12.3.ebuild @@ -0,0 +1,58 @@ +# 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 +" + +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 +} -- cgit v1.2.3