* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmix/, kde-apps/kmix/files/
@ 2023-06-17 10:19 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-06-17 10:19 UTC (permalink / raw
To: gentoo-commits
commit: 6b3dfd12876dfe97da86627ae1d52fb020177e15
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 10:07:51 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 10:19:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3dfd12
kde-apps/kmix: Disable autostart by default, amend postinst msg
Bug: https://bugs.gentoo.org/791889
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kmix-23.04.2-autostart_disable.patch | 24 ++++++++++++++++++++++
kde-apps/kmix/kmix-23.04.2.ebuild | 12 ++++++++---
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch b/kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch
new file mode 100644
index 000000000000..8d587f2317c7
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch
@@ -0,0 +1,24 @@
+diff -up kmix-21.04.0/core/settings.kcfg.autostart_disable kmix-21.04.0/core/settings.kcfg
+--- kmix-21.04.0/core/settings.kcfg.autostart_disable 2021-04-28 16:34:04.623152452 -0500
++++ kmix-21.04.0/core/settings.kcfg 2021-04-28 16:31:03.076698930 -0500
+@@ -57,7 +57,7 @@
+ <!-- Set by KMixPrefDlg, read by kmix_autostart.desktop -->
+
+ <entry name="AutoStart" type="Bool">
+- <default>true</default>
++ <default>false</default>
+ </entry>
+
+ <!-- Saved by KMixWindow::saveBaseConfig() and loaded -->
+diff -up kmix-21.04.0/desktop/kmix_autostart.desktop.autostart_disable kmix-21.04.0/desktop/kmix_autostart.desktop
+--- kmix-21.04.0/desktop/kmix_autostart.desktop.autostart_disable 2021-04-28 16:34:18.456263203 -0500
++++ kmix-21.04.0/desktop/kmix_autostart.desktop 2021-04-28 16:32:58.722624829 -0500
+@@ -8,7 +8,7 @@ X-KDE-autostart-after=panel
+ X-KDE-autostart-after=pulseaudio
+ X-KDE-StartupNotify=false
+ X-DBUS-StartupType=Unique
+-X-KDE-autostart-condition=kmixrc:Global:AutoStart:true
++X-KDE-autostart-condition=kmixrc:Global:AutoStart:false
+ Icon=kmix
+ GenericName=Sound Mixer
+ GenericName[bg]=Звуков смесител
diff --git a/kde-apps/kmix/kmix-23.04.2.ebuild b/kde-apps/kmix/kmix-23.04.2.ebuild
index 735f7812bc1f..823f1c6324f5 100644
--- a/kde-apps/kmix/kmix-23.04.2.ebuild
+++ b/kde-apps/kmix/kmix-23.04.2.ebuild
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
"
+PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)
@@ -57,12 +59,16 @@ 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 "Should you prefer this to be kde-apps/kmix instead, do the following:"
+ 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 "KMix will be shown as [Volume Control]."
+ 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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmix/, kde-apps/kmix/files/
@ 2024-09-04 6:58 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-09-04 6:58 UTC (permalink / raw
To: gentoo-commits
commit: 0f186d93d80ca99a9f9e64357b54e1a8bda34f66
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 17:31:13 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 4 06:55:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f186d93
kde-apps/kmix: Patch out implicit kde-plasma/plasma-pa RDEPEND
Makes it possible to drop the (futile, anyway) dependency on
kde-plasma/kde-cli-tools:* for runtime usage of 'kcmshell5'.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../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.08.0-r1.ebuild | 78 ++++++++++++++++++
3 files changed, 250 insertions(+)
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 <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 | 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 <klocalizedstring.h>
+ #include <kstandardaction.h>
+ #include <kxmlguifactory.h>
+-#include <KProcess>
+
+ // 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<KMixerWidget *>(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 @@
+ <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.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.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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmix/, kde-apps/kmix/files/
@ 2025-02-25 18:13 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-02-25 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 844f8131b00063c6e3723304f63c8b54c19d5c77
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 17:31:13 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 18:11:00 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=844f8131
kde-apps/kmix: Patch out implicit kde-plasma/plasma-pa RDEPEND
Makes it possible to drop the (futile, anyway) dependency on
kde-plasma/kde-cli-tools:* for runtime usage of kcmshell.
Re-adding a respun patch removed in PR 40498.
Closes: https://github.com/gentoo/gentoo/pull/40498
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kmix-24.12.2-revert-kcm_pulseaudio-dep.patch | 96 ++++++++++++++++++++++
kde-apps/kmix/kmix-24.12.1.ebuild | 9 ++
kde-apps/kmix/kmix-24.12.2.ebuild | 7 +-
3 files changed, 111 insertions(+), 1 deletion(-)
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>&Help</text>
+ <Action name="hwinfo"/>
+--
+GitLab
+
diff --git a/kde-apps/kmix/kmix-24.12.1.ebuild b/kde-apps/kmix/kmix-24.12.1.ebuild
index e7369612f269..eb66fa7a4ed1 100644
--- a/kde-apps/kmix/kmix-24.12.1.ebuild
+++ b/kde-apps/kmix/kmix-24.12.1.ebuild
@@ -41,7 +41,16 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+<<<<<<< HEAD:kde-apps/kmix/kmix-24.12.1.ebuild
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.05.2-revert-kcm_pulseaudio-dep.patch"
+)
+>>>>>>> aa17c6dbaed7 (kde-apps/kmix: Reference pending upstream MR):kde-apps/kmix/kmix-24.08.49.9999.ebuild
src_configure() {
local mycmakeargs=(
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=(
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-25 18:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-25 18:13 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmix/, kde-apps/kmix/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-09-04 6:58 Andreas Sturmlechner
2023-06-17 10:19 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox