gentoo auto-resync : 25:02:2025 - 19:25:33

6 files changed, 108 insertions, 5 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 1c47499dec27..5aea844d0363 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 343c94b57597..cd888c8444ec 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.12.2-revert-kcm_pulseaudio-dep.patch 3305 BLAKE2B b1a1fd3aeeee5c103327d9b387c22d57b047b6f951e4d158d304424b94f9f76302698cbea8b339bae1613864931618f3e6b566899b4224255ff2e7422edf2959 SHA512 a165e3ca7cf2c32b19daba6165068ce7f5455a402c59aae8f4713b7c599796eb27248c7ebcba981b263306dee810c88caa6b468e1cb938de99867b3b1b4ed798
 DIST kmix-24.12.1.tar.xz 1167696 BLAKE2B 632818aa612bcbebcefea0e772eaee42e807495befcddf6a2bc1013341e61dc53c699daa8ebd83def1bc834259fd021092f0cb63f28a59ef192f33a5366e465c SHA512 fc089dc3afeb5a80b2742dba2f3e46bdc2c63c0e9393adac10854107492d34ddbc86d3ba02fcda6e0cc06494631afa8c05ce1800c17d797c0936823374310e69
 DIST kmix-24.12.2.tar.xz 1167820 BLAKE2B 2a9a01fee22f0990b4f541cac292b01c813dcafc8ba281bb4cc8542ac6625a484e652f85a655be1b49493233272481ef8d8bf5eb444299c72ae682529f08ddd2 SHA512 c84550640e4ed2ff621780b8e50ba40ca4f31b4837552905f0a1e7792672997978b298142df092c3112d513652719086a9be424499730bcd5e038495708b1ffc
 EBUILD kmix-24.12.1.ebuild 2166 BLAKE2B ac35dd476023b8c55469e3fc90eedf08bd6797eb0ade0d3723d667971ca77ad26fa2b6404c6e4cdbaacf9f08b3f1e88c27d2710000abfde2c810a1a5ef08b400 SHA512 6c6beda8e8d93bfc1206ea29a803fec1ddccef14b57a62cb4463b4239136bf4de830c0bbed0c3b30ba84084f05266679cc6cf67bf7858698000388ac76a75f42
-EBUILD kmix-24.12.2.ebuild 2168 BLAKE2B 9332b1a7378ba9a5ac9ae67f9b361d497f84570f79b902712bd93b3e328d7bc08f64fd42c64747fb12191acb718ad531c4adf4cb184be0a7c0ea857fd6db82b1 SHA512 04c288c2f3983dec0aa0c2952240083438c1d7e8c100156b33e2d386fcc2a327e5829ec0e395a3afe3185513b1b79b7334c7864c79f0023b1812582249fc1e82
+EBUILD kmix-24.12.2.ebuild 2302 BLAKE2B 98b406482c01c567407e46f462de6c926190c47bba26269fe9d7fdb9526b2281cfef4765c640a666f161ca564b39a698afe59ab86f360a3ada948ee1885c973f SHA512 b608f0dc88608cf1379c31e00e4aeb259c62bcb175a27eb536bfc15441bd8438dba0abc36785504d6d4e18f89262ef4f7f9309d5736592a5bb816101a19ef9af
 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/kmix-24.12.2.ebuild b/kde-apps/kmix/kmix-24.12.2.ebuild
index 7eeb00ced8fe..6ce4583cb59f 100644
--- a/kde-apps/kmix/kmix-24.12.2.ebuild
+++ b/kde-apps/kmix/kmix-24.12.2.ebuild
@@ -41,7 +41,12 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
+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"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 8af86c7380af..bf3053a998d1 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -2,4 +2,4 @@ DIST kwave-24.12.1.tar.xz 6477896 BLAKE2B 38f9eefc0e0806480aa7fdaf1f5dc2e2649d31
 DIST kwave-24.12.2.tar.xz 6478224 BLAKE2B 35c24b4dffe4da85737e73f2a2628124809058c15d041f89424d7227741bafc19c67e9fc65857b32064870df5f1ddc8f8a5129428b34a52f384882e5727d664b SHA512 ceb1935f77b0d3fb4e9337e461c73aa997ac4f1510004cb33ab2f65402b9a1d515e923b0aab3490ca7c26aff3381fc83eb8869a0b8ce4d1f71686fbfa4e64b36
 EBUILD kwave-24.12.1.ebuild 2097 BLAKE2B 5085609a984e05880bda8cbe6e6e904a15d91134281b23df12378b54ecb2e0247075531805b946812787e71ed7e7e93cc889e66ef7702aad25ccb7ebd672bc0d SHA512 8169ac78c603f432cb1d4d27c1f7cb59cf07d1f7d22bb9874aa69d1b0d109be9e09350fc52e5c92ff8e516ca3dff0bf5a0022c74bbde11a8f6718f48a74fc007
 EBUILD kwave-24.12.2.ebuild 2099 BLAKE2B b2479407c3538085b4f25986afc214ba694f0e1a1cffbe165e98078efccf06485275cc795e0f292a28504824decf8ac5e18471cec6cc0a757b05d736a203c2f6 SHA512 c7a633a724575a3171572ed119b47291533d04f1a7115c18fdc9ea2ff7b078f1c26ac8dfee973cde79fa95a3c7170b51489811b51f69215c1f6caa3136160ec9
-MISC metadata.xml 759 BLAKE2B 6a8771c874742936e5301754db683f085d283fd53f6f9f2b3e81a9b59041a3440e9202c60230763852eb6598f15a57c35d76eef8fc4adb66b44c7eb9069cc220 SHA512 7c3e7738773fbd838fa60b18f9ccbc5b8bc182517a17691e29b9b61a57f25817f52d6ee03609ba4c9ea48398aad27939b652a5bd628722324a6f8e61f52ef718
+MISC metadata.xml 863 BLAKE2B aab2923414b982532c13ed30ec303c3b406b6a7e7084f54746cf71001d3aa1505f86bd63e9858249e8980d66e23ec9a36a964630492bbd7cf47e46826a967f39 SHA512 76b831405a32e2c66083a3571a04e335e81da800196f23a4b2370309ec4542723237c1becd1ac40e448d2714f659833ce2d91dd58e69b81092606fe5228d41ef
diff --git a/kde-apps/kwave/metadata.xml b/kde-apps/kwave/metadata.xml
index ecb7a5316c71..1e91d950bf67 100644
--- a/kde-apps/kwave/metadata.xml
+++ b/kde-apps/kwave/metadata.xml
@@ -6,10 +6,11 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kwave</bugs-to>
+		<remote-id type="kde-invent">multimedia/kwave</remote-id>
 	</upstream>
 	<longdescription>With Kwave you can edit many sorts of wav-files including multi-channel files. You are able to alter and play back each channel on its own. Kwave also includes many plugins (most are still under development) to transform the wave-file in several ways and presents a graphical view with a complete zoom- and scroll capability.</longdescription>
 	<use>
-		<flag name="qtmedia">Enable playback via Qt5Multimedia</flag>
+		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 	</use>
 </pkgmetadata>