From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B4E3F15800A for ; Sat, 17 Jun 2023 10:11:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 034DAE083B; Sat, 17 Jun 2023 10:11:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8E43E083B for ; Sat, 17 Jun 2023 10:11:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAD83340D21 for ; Sat, 17 Jun 2023 10:11:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30013A8E for ; Sat, 17 Jun 2023 10:11:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1686996506.27c563e1bb67d0e98ccf07439152b92a79175b94.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch kde-apps/kmix/kmix-23.04.49.9999.ebuild kde-apps/kmix/kmix-9999.ebuild X-VCS-Directories: kde-apps/kmix/ kde-apps/kmix/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 27c563e1bb67d0e98ccf07439152b92a79175b94 X-VCS-Branch: master Date: Sat, 17 Jun 2023 10:11:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bde90f39-602e-4ff3-9ee3-e23072c83ab9 X-Archives-Hash: 3da2e7b48caa7db8d31824e3d1817da0 commit: 27c563e1bb67d0e98ccf07439152b92a79175b94 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 17 10:07:51 2023 +0000 Commit: Andreas Sturmlechner gentoo 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 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 @@ + + + +- 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.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 }