gentoo auto-resync : 18:04:2025 - 08:46:04next

4 files changed, 215 insertions, 0 deletions

diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 7aaf3711103a..42901d91a777 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,4 +1,8 @@
 AUX kmix-23.04.2-autostart_disable.patch 1151 BLAKE2B 9f9609a39f66e97d7a6427fae6aaf14c0f65755b05ddfe55d05ad49f42463960d4e9a9f97eae9a38311174b376c8e182336ec4bed793f36a02cd2aa71bda3d42 SHA512 5d1ded259efc871d4b4d9b6fd43aff29970f9c04579cdd1419563a08761cb4fbb9d16642cb648d547aeec7c53b26976d49e30e2e0c8cae23b3bb2d7ba1fa6b9b
+AUX kmix-24.12.2-revert-kcm_pulseaudio-dep.patch 3305 BLAKE2B b1a1fd3aeeee5c103327d9b387c22d57b047b6f951e4d158d304424b94f9f76302698cbea8b339bae1613864931618f3e6b566899b4224255ff2e7422edf2959 SHA512 a165e3ca7cf2c32b19daba6165068ce7f5455a402c59aae8f4713b7c599796eb27248c7ebcba981b263306dee810c88caa6b468e1cb938de99867b3b1b4ed798
+AUX kmix-25.03.90-revert-sndio-automagic.patch 1248 BLAKE2B 44d403ffee5fc4d03c6fc0226c3ee6ea6a71661728420197540da3b3a4ebd75e4472d205d4d521f9fa495c1fe6636fecd8e25cfec7ede309032e9fd730a5c4b7 SHA512 8edb0f2570d9318a33fd144b75a38fa00d63c034270e81385354f5c93891b0649f53ae03a30359c4e91bcef5ad02f2858b004075fa2201ede3486bc25756bdcc
 DIST kmix-24.12.3.tar.xz 1167852 BLAKE2B 0e71e92d3b9bdbbf446c84d305788d6accf1d953326e99651088a68aa08f370b5274f29b2369cc88ba68384ddb7319f4e61cc90aa4b67c19b1ec00fd3f0d62c4 SHA512 c966de6ec9a9160538b0291be36bb84aab4888d20955aa2b141ad5c1b7295e90e9026af0033735ba271c2256bc6291f5c90cb5d0471eff5185715a3ba505e446
+DIST kmix-25.04.0.tar.xz 1177276 BLAKE2B 33f5acc4eff1b004e6efd1232d390c8ff0f4f4cd57d51077ae23e7c9a7992d6d9ba0c1a73524d41ba4e9650baf1c6fbf66624826651ca86aa1ce852777dda676 SHA512 51dea92790753228ae356a732f6045b6923dae97e2035d8799d7cf432408534d7332608b2e57cada132a07dda6d0c32ad1695d504da11e5ebb4606101ba01814
 EBUILD kmix-24.12.3.ebuild 2166 BLAKE2B ac35dd476023b8c55469e3fc90eedf08bd6797eb0ade0d3723d667971ca77ad26fa2b6404c6e4cdbaacf9f08b3f1e88c27d2710000abfde2c810a1a5ef08b400 SHA512 6c6beda8e8d93bfc1206ea29a803fec1ddccef14b57a62cb4463b4239136bf4de830c0bbed0c3b30ba84084f05266679cc6cf67bf7858698000388ac76a75f42
+EBUILD kmix-25.04.0.ebuild 2522 BLAKE2B 6785885c55d9093dde09476b8ead1c37addd5866311ed5fb50470ef644ee08cfc591e387b427bd4956a700d950112f3e9bbb8cf520e79754afeda05557591c1a SHA512 cc0ea1abcae09140f4b05de1799f53f6e245842b6495acfe049b13fb1b86ee1b17d78ee411af7e79fd63f2c01294b8267fbaef6b2eb1aae2121dcc661b37a99c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmix/files/kmix-24.12.2-revert-kcm_pulseaudio-dep.patch b/kde-apps/kmix/files/kmix-24.12.2-revert-kcm_pulseaudio-dep.patch
new file mode 100644
index 000000000000..15d9b8b14718
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-24.12.2-revert-kcm_pulseaudio-dep.patch
@@ -0,0 +1,96 @@
+From dfa2433dc58ddb24f7d9070c963d0267edf9e4b0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 | 24 ------------------------
+ apps/kmixwindow.h   |  2 --
+ desktop/kmixui.rc   |  1 -
+ 3 files changed, 27 deletions(-)
+
+diff --git a/apps/kmixwindow.cpp b/apps/kmixwindow.cpp
+index f548edd3..ae86d653 100644
+--- a/apps/kmixwindow.cpp
++++ b/apps/kmixwindow.cpp
+@@ -38,8 +38,6 @@
+ #include <klocalizedstring.h>
+ #include <kstandardaction.h>
+ #include <kxmlguifactory.h>
+-#include <kprocess.h>
+-#include <kcoreaddons_version.h>
+ 
+ // KMix
+ #include "kmix_debug.h"
+@@ -172,11 +170,6 @@ void KMixWindow::initActions()
+ 	KStandardAction::preferences(this, &KMixWindow::showSettings, actionCollection());
+ 	KStandardAction::keyBindings(guiFactory(), &KXMLGUIFactory::showConfigureShortcutsDialog, actionCollection());
+ 
+-	action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup"));
+-	action->setText(i18n("Audio Setup..."));
+-	action->setIcon(QIcon::fromTheme("speaker"));
+-	connect(action, &QAction::triggered, this, &KMixWindow::slotKdeAudioSetupExec);
+-
+ 	action = actionCollection()->addAction(QStringLiteral("toggle_channels_currentview"));
+ 	action->setText(i18n("Configure &Channels..."));
+ 	action->setIcon(QIcon::fromTheme("settings-channels"));
+@@ -1171,23 +1164,6 @@ void KMixWindow::toggleMenuBar()
+ 	menuBar()->setVisible(_actionShowMenubar->isChecked());
+ }
+ 
+-
+-void KMixWindow::slotKdeAudioSetupExec()
+-{
+-    forkExec(QStringList() << QString("kcmshell%1").arg(KCOREADDONS_VERSION_MAJOR) << "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()
+ {
+ 	const KMixerWidget *mw = qobject_cast<const KMixerWidget  *>(m_wsMixers->currentWidget());
+diff --git a/apps/kmixwindow.h b/apps/kmixwindow.h
+index 8e0a04cc..5711d452 100644
+--- a/apps/kmixwindow.h
++++ b/apps/kmixwindow.h
+@@ -88,7 +88,6 @@ protected Q_SLOTS:
+ 
+ private:
+     KMixerWidget* findKMWforTab( const QString& tabId );
+-    void forkExec(const QStringList& args);
+     KToggleAction* _actionShowMenubar;
+ 
+     bool m_startVisible;
+@@ -120,7 +119,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 @@
+  <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"/>
+-- 
+GitLab
+
diff --git a/kde-apps/kmix/files/kmix-25.03.90-revert-sndio-automagic.patch b/kde-apps/kmix/files/kmix-25.03.90-revert-sndio-automagic.patch
new file mode 100644
index 000000000000..fafb7617c9f9
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-25.03.90-revert-sndio-automagic.patch
@@ -0,0 +1,37 @@
+From 55b5b20e18f40cfaa7df21bbf7f4ec3cd4ea57ad Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 2 Apr 2025 20:36:25 +0200
+Subject: [PATCH] Disable sndio detection
+
+Until it is fixed upstream:
+https://invent.kde.org/multimedia/kmix/-/merge_requests/32
+https://invent.kde.org/multimedia/kmix/-/merge_requests/32#note_1182527
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e831f673..114bebae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -91,6 +91,7 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS
+ ########### sound backend support ##################################################################
+ ####################################################################################################
+ 
++if (0)
+ # sndio, only for that platform
+ check_include_file("sndio.h" HAVE_SYS_SNDIO_H)
+ if (HAVE_SYS_SNDIO_H)
+@@ -99,6 +100,7 @@ if (HAVE_SYS_SNDIO_H)
+   add_definitions(-DHAVE_SNDIO_MIXER)
+   set(SUPPORTED_BACKENDS ${SUPPORTED_BACKENDS} "Sndio")
+ endif ()
++endif ()
+ 
+ # Sun Audio, only for that platform
+ check_include_file("sys/audioio.h" HAVE_SYS_AUDIOIO_H)
+-- 
+2.49.0
+
diff --git a/kde-apps/kmix/kmix-25.04.0.ebuild b/kde-apps/kmix/kmix-25.04.0.ebuild
new file mode 100644
index 000000000000..4468af849c3a
--- /dev/null
+++ b/kde-apps/kmix/kmix-25.04.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="false"
+KFMIN=6.9.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org xdg
+
+DESCRIPTION="Volume control gui based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kmix/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="alsa pulseaudio"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	pulseaudio? (
+		media-libs/libcanberra
+		media-libs/libpulse
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}/${PN}-23.04.2-autostart_disable.patch"
+	# Pending: https://invent.kde.org/multimedia/kmix/-/merge_requests/29
+	"${FILESDIR}/${PN}-24.12.2-revert-kcm_pulseaudio-dep.patch"
+	# Regressed in: https://invent.kde.org/multimedia/kmix/-/merge_requests/32
+	"${FILESDIR}/${PN}-25.03.90-revert-sndio-automagic.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		# XXX: sndio is maybe automagic since 5075cc9502b2768471fd917671fd98bfe5b877cc
+		$(cmake_use_find_package alsa ALSA)
+		$(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."
+	xdg_pkg_postinst
+}