[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/
commit: 27c563e1bb67d0e98ccf07439152b92a79175b94
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 17 10:07:51 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 17 10:08:26 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=27c563e1
kde-apps/kmix: Disable autostart by default, amend postinst msg
Bug: https://bugs.gentoo.org/791889
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/kmix-23.04.2-autostart_disable.patch | 24 ++
kde-apps/kmix/kmix-23.04.49..ebuild| 12 ---
kde-apps/kmix/kmix-.ebuild | 12 ---
3 files changed, 42 insertions(+), 6 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 00..8d587f2317
--- /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.kcfg2021-04-28 16:31:03.076698930 -0500
+@@ -57,7 +57,7 @@
+
+
+
+- true
++ false
+
+
+
+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.desktop2021-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.49..ebuild
b/kde-apps/kmix/kmix-23.04.49..ebuild
index 7adfd7fcfa..533aa0cb01 100644
--- a/kde-apps/kmix/kmix-23.04.49..ebuild
+++ b/kde-apps/kmix/kmix-23.04.49..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
}
diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 7adfd7fcfa..533aa0cb01 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.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
[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/
commit: db2fc91577a3d7a10cf19ed0d6deb865f3f26199
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 9 21:01:59 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 9 21:01:59 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=db2fc915
kde-apps/kmix: Drop no longer available kcm_phonon 'Audio Setup'
Closes: https://bugs.gentoo.org/716092
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/kmix-19.12.3-no-more-kcm_phonon.patch| 71 ++
kde-apps/kmix/kmix-20.03.90.ebuild | 2 +
kde-apps/kmix/kmix-20.04.49..ebuild| 2 +
kde-apps/kmix/kmix-.ebuild | 2 +
4 files changed, 77 insertions(+)
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 00..a67b89f324
--- /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 , 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-20.03.90.ebuild
b/kde-apps/kmix/kmix-20.03.90.ebuild
index 5bd1c40890..5d651540c5 100644
--- a/kde-apps/kmix/kmix-20.03.90.ebuild
+++ b/kde-apps/kmix/kmix-20.03.90.ebuild
@@ -46,6 +46,8 @@ RDEPEND="${DEPEND}
>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
"
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)
diff --git a/kde-apps/kmix/kmix-20.04.49..ebuild
b/kde-apps/kmix/kmix-20.04.49..ebuild
index e4049c3ae4..c8c24107b6 100644
--- a/kde-apps/kmix/kmix-20.04.49..ebuild
+++ b/kde-apps/kmix/kmix-20.04.49..ebuild
@@ -46,6 +46,8 @@ RDEPEND="${DEPEND}
>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
"
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)
diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 84f5fa929c..444a346baf 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -46,6 +46,8 @@ RDEPEND="${DEPEND}
>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
"
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)
[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/
commit: fefdde28ef9243938974f2b830351379ebd931b3
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 16:23:56 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 16:23:56 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fefdde28
kde-apps/kmix: backport patch from upstream to remove missing dependency.
Package-Manager: portage-2.2.20.1
kde-apps/kmix/files/kmix-15.04.1-deps.patch | 25 +
kde-apps/kmix/kmix-15.08.49..ebuild | 5 -
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/kde-apps/kmix/files/kmix-15.04.1-deps.patch
b/kde-apps/kmix/files/kmix-15.04.1-deps.patch
new file mode 100644
index 000..5a02359
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-15.04.1-deps.patch
@@ -0,0 +1,25 @@
+From ea58dd9a8cba08566ce6045341a5695d688abb45 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka kensing...@gentoo.org
+Date: Thu, 20 Aug 2015 04:41:45 +1000
+Subject: [PATCH] Remove unused dependency.
+
+REVIEW:
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01afa4a..85886c0 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -43,7 +43,6 @@ if (KMIX_KF5_BUILD)
+ I18n
+ XmlGui
+ DBusAddons
+- KCMUtils
+ KDELibs4Support)
+ find_package(KF5ConfigWidgets)
+ find_package(KF5IconThemes)
+--
+2.4.6
+
diff --git a/kde-apps/kmix/kmix-15.08.49..ebuild
b/kde-apps/kmix/kmix-15.08.49..ebuild
index 16957b9..53a5a92 100644
--- a/kde-apps/kmix/kmix-15.08.49..ebuild
+++ b/kde-apps/kmix/kmix-15.08.49..ebuild
@@ -41,7 +41,10 @@ RDEPEND=${DEPEND}
$(add_plasma_dep kde-cli-tools)
-PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
+PATCHES=(
+ ${FILESDIR}/${PN}-15.04.1-deps.patch
+ ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch
+)
src_configure() {
local mycmakeargs=(
[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/
commit: 1e8df41937b7b788290c29c6a59b94f809e6e93f
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sat May 16 20:47:24 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat May 23 15:57:03 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1e8df419
[kde-apps/kmix] Fix build with USE=-alsa
Package-Manager: portage-2.2.19
.../kmix/files/kmix-5.-alsa-optional.patch | 26 ++
kde-apps/kmix/kmix-5..ebuild | 2 ++
2 files changed, 28 insertions(+)
diff --git a/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
b/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
new file mode 100644
index 000..92c258c
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt 2015-05-16 22:31:57.555962909 +0200
b/CMakeLists.txt 2015-05-16 22:19:13.393985683 +0200
+@@ -79,7 +79,9 @@
+ endif()
+
+ find_package(Alsa)
+-alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++if(Alsa_FOUND)
++alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++endif()
+
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS}
${KDE4_DEFINITIONS} )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
+--- a/backends/kmix-backends.cpp 2015-05-16 22:31:36.650963532 +0200
b/backends/kmix-backends.cpp 2015-05-16 22:22:57.761978996 +0200
+@@ -23,7 +23,10 @@
+ /* This code is being #include'd from mixer.cpp */
+
+ #include config.h
++
++#if defined(HAVE_LIBASOUND2)
+ #include config-alsa.h
++#endif
+
+ #include mixer_backend.h
+ #include core/mixer.h
diff --git a/kde-apps/kmix/kmix-5..ebuild b/kde-apps/kmix/kmix-5..ebuild
index 15f3eaa..4158e29 100644
--- a/kde-apps/kmix/kmix-5..ebuild
+++ b/kde-apps/kmix/kmix-5..ebuild
@@ -36,6 +36,8 @@ RDEPEND=${DEPEND}
!kde-base/kmix:4
+PATCHES=( ${FILESDIR}/${PN}-5.-alsa-optional.patch )
+
src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON
