From 518b45bffd19d0b75715f338985f96c459f9d129 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Sep 2024 12:28:34 +0100 Subject: gentoo auto-resync : 04:09:2024 - 12:28:34 --- kde-apps/Manifest.gz | Bin 36295 -> 36297 bytes kde-apps/kmix/Manifest | 5 +- .../kmix-24.05.2-revert-kcm_pulseaudio-dep.patch | 94 +++++++++++++++++++++ kde-apps/kmix/kmix-24.05.2-r1.ebuild | 78 +++++++++++++++++ kde-apps/kmix/kmix-24.05.2.ebuild | 76 ----------------- kde-apps/kmix/kmix-24.08.0-r1.ebuild | 78 +++++++++++++++++ kde-apps/kmix/kmix-24.08.0.ebuild | 76 ----------------- 7 files changed, 253 insertions(+), 154 deletions(-) create mode 100644 kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch create mode 100644 kde-apps/kmix/kmix-24.05.2-r1.ebuild delete mode 100644 kde-apps/kmix/kmix-24.05.2.ebuild create mode 100644 kde-apps/kmix/kmix-24.08.0-r1.ebuild delete mode 100644 kde-apps/kmix/kmix-24.08.0.ebuild (limited to 'kde-apps') diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz index b075ced6ffc2..4e1b644c24e8 100644 Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest index 496d9d3ef346..9f405c472c70 100644 --- a/kde-apps/kmix/Manifest +++ b/kde-apps/kmix/Manifest @@ -1,6 +1,7 @@ AUX kmix-23.04.2-autostart_disable.patch 1151 BLAKE2B 9f9609a39f66e97d7a6427fae6aaf14c0f65755b05ddfe55d05ad49f42463960d4e9a9f97eae9a38311174b376c8e182336ec4bed793f36a02cd2aa71bda3d42 SHA512 5d1ded259efc871d4b4d9b6fd43aff29970f9c04579cdd1419563a08761cb4fbb9d16642cb648d547aeec7c53b26976d49e30e2e0c8cae23b3bb2d7ba1fa6b9b +AUX kmix-24.05.2-revert-kcm_pulseaudio-dep.patch 3237 BLAKE2B 5587e62301a0f4c9ee70ed227472ef12cbfd8a6fbaf9446c312131ed7cd51434c641b872ef8aba0ce71b0300a2040e93cbb19674003d684405e747218dc5cbb7 SHA512 f9bb9a81269ab42b89bd3599ee14df4cb5ef6f645aae6039e3f25107ce0eb57c53b74049d52613bb2a52e3552b23fc300b73e5d07dadbea4652af1bdc99cd8fe DIST kmix-24.05.2.tar.xz 1165196 BLAKE2B 512a56ee928546ee077e3302432faa65caf56f3e613f9a772733a5187800b3fc7c068a84c147897b1e53513d07601c59cf42e046d65d5dbe180e7255d168bc8c SHA512 126e0144034132e65cec59f774582ba10073bf2b96a97ca4e8fd75a9143b2fcf93659f869417095c75b90ec3347d3ff562ebd36eb3ea0fec8a0c303c8bdce6b9 DIST kmix-24.08.0.tar.xz 1165316 BLAKE2B 5016ad90e3533ea968f6d1ec17a8884060da1f3f2d9eacffa3d3a07c34d707a9195b3dd1c456165f8707db3e09f93b0bf438e4c1ae3b587b4fb8efcc5d548586 SHA512 da2ac8833cbdbad97f8e9651a608e3f4ca85ec0a093fc039f450123ec3a05d6fea9d2437cb9970eca016f8eb2232ea53613c87ed453b1fd089dd335abf09df24 -EBUILD kmix-24.05.2.ebuild 2302 BLAKE2B fcc3d196bf056a5b0c42e14e1ba60ecbf3df00db73d0036a27abe1ec6b21d594308c5738b0666bbac9c4f6c658671288d0f9d883b082fc65adb0b1813cb950bd SHA512 d031808799bdc26e85341e938494a14fa53c6e36eb6e6895f24787f107fbaeb52fb5a5ff57bd6537e3091152262a133b60b8a7c35a6bb37e1007ab6a3859f9b6 -EBUILD kmix-24.08.0.ebuild 2305 BLAKE2B 07a4642595f35e1269e8ab45d039ff6bd7adf67a76f9ebfae6686580ba9e16f15053d3e71b1653f94c075b3e5a95faf03641c9742888e02b6ba72dbe1a1f1545 SHA512 eb4c14bf26b148b67e1d3bf7819f4a4414bc9860e1f85400891ef1e6f17311a7150420a91d973ff088cc4312f3ad4cf69ee8fad7b89d3529cc69df456340af94 +EBUILD kmix-24.05.2-r1.ebuild 2327 BLAKE2B 360b944b97f114d34f8049cd72ffca9c8333e0cbd7674c0c17e706f9d9ee882bd919dc12445d6cc326bf1629fe735391489d0e9a37103b80acb22eb4c9ad1d68 SHA512 c3b2856e3175aef5a3d1557a991ddb8851d7f7bfb9d6fec8afe2ecfce65fd67f608c1f087fe3b8b593514d61859ecaef6cec072fc949debd16049cbf1aef92cd +EBUILD kmix-24.08.0-r1.ebuild 2339 BLAKE2B 36be0a46e2e3d0c3a72ac17352b37914849a35546505d576d8a17b2dc8739c48a5cdac381674e31abd23bbd2f4ad48e5ca2168245495c62602a5534afb3c68c3 SHA512 b6a4d78c9c579c6c3950a06c57fb54c861ff8c0be0e26370a416e28c98027bf4eafd4c30b35a5f97d71e02ed40321bcc7f2061aa8a8f3ee1c9d9b49bad460dc4 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch b/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch new file mode 100644 index 000000000000..23987a8261db --- /dev/null +++ b/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch @@ -0,0 +1,94 @@ +From 8d6837131706bd0f5dbd573726e7c01775f8256c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +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 | 22 +--------------------- + apps/kmixwindow.h | 2 -- + desktop/kmixui.rc | 1 - + 3 files changed, 1 insertion(+), 24 deletions(-) + +diff --git a/apps/kmixwindow.cpp b/apps/kmixwindow.cpp +index fa727f39..fb182f49 100644 +--- a/apps/kmixwindow.cpp ++++ b/apps/kmixwindow.cpp +@@ -37,7 +37,6 @@ + #include + #include + #include +-#include + + // KMix + #include "kmix_debug.h" +@@ -164,11 +163,7 @@ void KMixWindow::initActions() + + KStandardAction::keyBindings(guiFactory(), &KXMLGUIFactory::showConfigureShortcutsDialog, 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); +@@ -1174,21 +1169,6 @@ void KMixWindow::toggleMenuBar() + menuBar()->setVisible(_actionShowMenubar->isChecked()); + } + +-void KMixWindow::slotKdeAudioSetupExec() +-{ +- forkExec(QStringList() << "kcmshell5" << "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() + { + KMixerWidget *mw = qobject_cast(m_wsMixers->currentWidget()); +diff --git a/apps/kmixwindow.h b/apps/kmixwindow.h +index 67560723..0bcb04ed 100644 +--- a/apps/kmixwindow.h ++++ b/apps/kmixwindow.h +@@ -86,7 +86,6 @@ protected Q_SLOTS: + + private: + KMixerWidget* findKMWforTab( const QString& tabId ); +- void forkExec(const QStringList& args); + KToggleAction* _actionShowMenubar; + + bool m_startVisible; +@@ -117,7 +116,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 @@ + + + +- + + &Help + +-- +2.46.0 + diff --git a/kde-apps/kmix/kmix-24.05.2-r1.ebuild b/kde-apps/kmix/kmix-24.05.2-r1.ebuild new file mode 100644 index 000000000000..314dc674568a --- /dev/null +++ b/kde-apps/kmix/kmix-24.05.2-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="false" +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm gear.kde.org + +DESCRIPTION="Volume control gui based on KDE Frameworks" +HOMEPAGE="https://apps.kde.org/kmix/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" +IUSE="alsa plasma pulseaudio" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +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/kcrash-${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[X] + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + alsa? ( >=media-libs/alsa-lib-1.0.14a ) + plasma? ( >=kde-plasma/libplasma-${KFMIN}:5 ) + pulseaudio? ( + media-libs/libcanberra + media-libs/libpulse + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + # TODO: upstream + "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" + "${FILESDIR}/${P}-revert-kcm_pulseaudio-dep.patch" +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package alsa ALSA) + -DBUILD_DATAENGINE=$(usex plasma) + $(cmake_use_find_package pulseaudio Canberra) + $(cmake_use_find_package pulseaudio PulseAudio) + ) + + ecm_src_configure +} + +pkg_postinst() { + if use pulseaudio && has_version kde-plasma/plasma-pa; then + elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler," + elog "therefore, autostart by default was disabled for KMix." + elog + elog "Should you prefer to still use kde-apps/kmix instead, do the following:" + elog " - In system tray, right click on [Show hidden items]" + elog " - Select [Configure System Tray]" + elog " - In [Entries], search for [Audio Volume] and set it to [Disabled]" + elog + fi + elog "KMix will be shown as [Volume Control] after manually starting it once" + elog "and will be autostarted after configuring such in KMix startup settings." + ecm_pkg_postinst +} diff --git a/kde-apps/kmix/kmix-24.05.2.ebuild b/kde-apps/kmix/kmix-24.05.2.ebuild deleted file mode 100644 index c8d35f75ee6d..000000000000 --- a/kde-apps/kmix/kmix-24.05.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="false" -KFMIN=5.115.0 -QTMIN=5.15.12 -inherit ecm gear.kde.org - -DESCRIPTION="Volume control gui based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/kmix/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="alsa plasma pulseaudio" - -# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras -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/kcrash-${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[X] - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - alsa? ( >=media-libs/alsa-lib-1.0.14a ) - plasma? ( >=kde-plasma/libplasma-${KFMIN}:5 ) - pulseaudio? ( - media-libs/libcanberra - media-libs/libpulse - ) -" -RDEPEND="${DEPEND} - kde-plasma/kde-cli-tools:* -" - -PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package alsa ALSA) - -DBUILD_DATAENGINE=$(usex plasma) - $(cmake_use_find_package pulseaudio Canberra) - $(cmake_use_find_package pulseaudio PulseAudio) - ) - - ecm_src_configure -} - -pkg_postinst() { - if use pulseaudio && has_version kde-plasma/plasma-pa; then - elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler," - elog "therefore, autostart by default was disabled for KMix." - elog - elog "Should you prefer to still use kde-apps/kmix instead, do the following:" - elog " - In system tray, right click on [Show hidden items]" - elog " - Select [Configure System Tray]" - elog " - In [Entries], search for [Audio Volume] and set it to [Disabled]" - elog - fi - elog "KMix will be shown as [Volume Control] after manually starting it once" - elog "and will be autostarted after configuring such in KMix startup settings." - ecm_pkg_postinst -} diff --git a/kde-apps/kmix/kmix-24.08.0-r1.ebuild b/kde-apps/kmix/kmix-24.08.0-r1.ebuild new file mode 100644 index 000000000000..5153c51334f1 --- /dev/null +++ b/kde-apps/kmix/kmix-24.08.0-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="false" +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm gear.kde.org + +DESCRIPTION="Volume control gui based on KDE Frameworks" +HOMEPAGE="https://apps.kde.org/kmix/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="alsa plasma pulseaudio" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +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/kcrash-${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[X] + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + alsa? ( >=media-libs/alsa-lib-1.0.14a ) + plasma? ( >=kde-plasma/libplasma-${KFMIN}:5 ) + pulseaudio? ( + media-libs/libcanberra + media-libs/libpulse + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + # TODO: upstream + "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" + "${FILESDIR}/${PN}-24.05.2-revert-kcm_pulseaudio-dep.patch" +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package alsa ALSA) + -DBUILD_DATAENGINE=$(usex plasma) + $(cmake_use_find_package pulseaudio Canberra) + $(cmake_use_find_package pulseaudio PulseAudio) + ) + + ecm_src_configure +} + +pkg_postinst() { + if use pulseaudio && has_version kde-plasma/plasma-pa; then + elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler," + elog "therefore, autostart by default was disabled for KMix." + elog + elog "Should you prefer to still use kde-apps/kmix instead, do the following:" + elog " - In system tray, right click on [Show hidden items]" + elog " - Select [Configure System Tray]" + elog " - In [Entries], search for [Audio Volume] and set it to [Disabled]" + elog + fi + elog "KMix will be shown as [Volume Control] after manually starting it once" + elog "and will be autostarted after configuring such in KMix startup settings." + ecm_pkg_postinst +} diff --git a/kde-apps/kmix/kmix-24.08.0.ebuild b/kde-apps/kmix/kmix-24.08.0.ebuild deleted file mode 100644 index c60c5416b0da..000000000000 --- a/kde-apps/kmix/kmix-24.08.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="false" -KFMIN=5.115.0 -QTMIN=5.15.12 -inherit ecm gear.kde.org - -DESCRIPTION="Volume control gui based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/kmix/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="alsa plasma pulseaudio" - -# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras -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/kcrash-${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[X] - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - alsa? ( >=media-libs/alsa-lib-1.0.14a ) - plasma? ( >=kde-plasma/libplasma-${KFMIN}:5 ) - pulseaudio? ( - media-libs/libcanberra - media-libs/libpulse - ) -" -RDEPEND="${DEPEND} - kde-plasma/kde-cli-tools:* -" - -PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package alsa ALSA) - -DBUILD_DATAENGINE=$(usex plasma) - $(cmake_use_find_package pulseaudio Canberra) - $(cmake_use_find_package pulseaudio PulseAudio) - ) - - ecm_src_configure -} - -pkg_postinst() { - if use pulseaudio && has_version kde-plasma/plasma-pa; then - elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler," - elog "therefore, autostart by default was disabled for KMix." - elog - elog "Should you prefer to still use kde-apps/kmix instead, do the following:" - elog " - In system tray, right click on [Show hidden items]" - elog " - Select [Configure System Tray]" - elog " - In [Entries], search for [Audio Volume] and set it to [Disabled]" - elog - fi - elog "KMix will be shown as [Volume Control] after manually starting it once" - elog "and will be autostarted after configuring such in KMix startup settings." - ecm_pkg_postinst -} -- cgit v1.2.3