From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/
Date: Sat, 17 Jun 2023 10:11:35 +0000 (UTC) [thread overview]
Message-ID: <1686996506.27c563e1bb67d0e98ccf07439152b92a79175b94.asturm@gentoo> (raw)
commit: 27c563e1bb67d0e98ccf07439152b92a79175b94
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:08:26 2023 +0000
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 <asturm <AT> gentoo.org>
.../files/kmix-23.04.2-autostart_disable.patch | 24 ++++++++++++++++++++++
kde-apps/kmix/kmix-23.04.49.9999.ebuild | 12 ++++++++---
kde-apps/kmix/kmix-9999.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 0000000000..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.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.49.9999.ebuild b/kde-apps/kmix/kmix-23.04.49.9999.ebuild
index 7adfd7fcfa..533aa0cb01 100644
--- a/kde-apps/kmix/kmix-23.04.49.9999.ebuild
+++ b/kde-apps/kmix/kmix-23.04.49.9999.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-9999.ebuild b/kde-apps/kmix/kmix-9999.ebuild
index 7adfd7fcfa..533aa0cb01 100644
--- a/kde-apps/kmix/kmix-9999.ebuild
+++ b/kde-apps/kmix/kmix-9999.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
}
next reply other threads:[~2023-06-17 10:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-17 10:11 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-26 20:44 [gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/ Andreas Sturmlechner
2020-04-09 21:38 Andreas Sturmlechner
2015-08-25 16:24 Michael Palimaka
2015-05-23 15:57 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1686996506.27c563e1bb67d0e98ccf07439152b92a79175b94.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox