From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmix/files/, kde-apps/kmix/
Date: Wed, 15 Jul 2020 13:22:51 +0000 (UTC) [thread overview]
Message-ID: <1594819351.e7c155d0cc31908fce5e0cf52cc7c7533f58034b.asturm@gentoo> (raw)
commit: e7c155d0cc31908fce5e0cf52cc7c7533f58034b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 13:22:31 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 13:22:31 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7c155d0
kde-apps/kmix: Drop upstreamed patch
Upstream commit 8fec379c7a682419bdf53c6b939f42a8c8767338
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kmix-19.12.3-no-more-kcm_phonon.patch | 71 ----------------------
kde-apps/kmix/kmix-20.08.49.9999.ebuild | 2 -
kde-apps/kmix/kmix-9999.ebuild | 2 -
3 files changed, 75 deletions(-)
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
deleted file mode 100644
index a67b89f324..0000000000
--- a/kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From b012e900cce1e432537b192bb146f0b07dbe055c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-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 &udi, 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 @@
- <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.26.0
-
diff --git a/kde-apps/kmix/kmix-20.08.49.9999.ebuild b/kde-apps/kmix/kmix-20.08.49.9999.ebuild
index be65ac5ff4..3131d542dc 100644
--- a/kde-apps/kmix/kmix-20.08.49.9999.ebuild
+++ b/kde-apps/kmix/kmix-20.08.49.9999.ebuild
@@ -44,8 +44,6 @@ RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools: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-9999.ebuild b/kde-apps/kmix/kmix-9999.ebuild
index be65ac5ff4..3131d542dc 100644
--- a/kde-apps/kmix/kmix-9999.ebuild
+++ b/kde-apps/kmix/kmix-9999.ebuild
@@ -44,8 +44,6 @@ RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
"
-PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
-
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)
next reply other threads:[~2020-07-15 13:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 13:22 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-02 18:40 [gentoo-commits] proj/kde:master commit in: kde-apps/kmix/files/, kde-apps/kmix/ Andreas Sturmlechner
2015-08-25 16:26 Michael Palimaka
2015-06-05 15:32 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=1594819351.e7c155d0cc31908fce5e0cf52cc7c7533f58034b.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