[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/files/, kde-apps/kmix/
commit: e7c155d0cc31908fce5e0cf52cc7c7533f58034b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jul 15 13:22:31 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jul 15 13:22:31 2020 +
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 gentoo.org>
.../files/kmix-19.12.3-no-more-kcm_phonon.patch| 71 --
kde-apps/kmix/kmix-20.08.49..ebuild| 2 -
kde-apps/kmix/kmix-.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..00
--- 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
-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.08.49..ebuild
b/kde-apps/kmix/kmix-20.08.49..ebuild
index be65ac5ff4..3131d542dc 100644
--- a/kde-apps/kmix/kmix-20.08.49..ebuild
+++ b/kde-apps/kmix/kmix-20.08.49..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-.ebuild b/kde-apps/kmix/kmix-.ebuild
index be65ac5ff4..3131d542dc 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.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)
[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/files/, kde-apps/kmix/
commit: c2a622684b83a3c2ee2e7da736096b51ab60f547
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 16:25:46 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 16:25:46 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2a62268
kde-apps/kmix: correct patch name.
Package-Manager: portage-2.2.20.1
.../kmix/files/{kmix-15.04.1-deps.patch = kmix-15.08.0-deps.patch} | 0
kde-apps/kmix/kmix-15.08.49..ebuild | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-apps/kmix/files/kmix-15.04.1-deps.patch
b/kde-apps/kmix/files/kmix-15.08.0-deps.patch
similarity index 100%
rename from kde-apps/kmix/files/kmix-15.04.1-deps.patch
rename to kde-apps/kmix/files/kmix-15.08.0-deps.patch
diff --git a/kde-apps/kmix/kmix-15.08.49..ebuild
b/kde-apps/kmix/kmix-15.08.49..ebuild
index 53a5a92..f65effc 100644
--- a/kde-apps/kmix/kmix-15.08.49..ebuild
+++ b/kde-apps/kmix/kmix-15.08.49..ebuild
@@ -42,8 +42,8 @@ RDEPEND=${DEPEND}
PATCHES=(
- ${FILESDIR}/${PN}-15.04.1-deps.patch
${FILESDIR}/${PN}-15.04.2-alsa-optional.patch
+ ${FILESDIR}/${PN}-15.08.0-deps.patch
)
src_configure() {
[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/files/, kde-apps/kmix/
commit: 69e39a454cd906e28ae43d2cfa9cf4d416cb7d82
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Mon Jun 1 20:19:55 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Jun 5 15:31:53 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=69e39a45
[kde-apps/kmix] Only support kf5 in master
Package-Manager: portage-2.2.20
.../kmix/files/kmix-15.04.2-alsa-optional.patch| 26 +++
.../kmix/files/kmix-5.-alsa-optional.patch | 26 ---
kde-apps/kmix/kmix-5..ebuild | 50 --
kde-apps/kmix/kmix-.ebuild | 36
4 files changed, 54 insertions(+), 84 deletions(-)
diff --git a/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch
b/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch
new file mode 100644
index 000..bbcb894
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt 2015-06-04 23:19:26.543647639 +0200
b/CMakeLists.txt 2015-06-04 23:22:08.863655630 +0200
+@@ -79,7 +79,10 @@
+ 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)
++ add_definitions(-DHAVE_LIBASOUND2)
++endif(ALSA_FOUND)
+
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS}
${KDE4_DEFINITIONS} )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
+--- a/backends/kmix-backends.cpp 2015-06-04 23:11:58.084625559 +0200
b/backends/kmix-backends.cpp 2015-06-04 23:12:34.194627337 +0200
+@@ -23,7 +23,9 @@
+ /* This code is being #include'd from mixer.cpp */
+
+ #include config.h
++#ifdef HAVE_LIBASOUND2
+ #include config-alsa.h
++#endif
+
+ #include mixer_backend.h
+ #include core/mixer.h
diff --git a/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
b/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
deleted file mode 100644
index 92c258c..000
--- a/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
+++ /dev/null
@@ -1,26 +0,0 @@
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
deleted file mode 100644
index 4158e29..000
--- a/kde-apps/kmix/kmix-5..ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION=KDE mixer gui
-HOMEPAGE=http://www.kde.org/applications/multimedia/kmix/;
-KEYWORDS=
-IUSE=alsa canberra pulseaudio
-
-DEPEND=
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- dev-libs/glib:2
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- alsa? ( =media-libs/alsa-lib-1.0.14a )
- canberra? ( media-libs/libcanberra )
- pulseaudio? ( =media-sound/pulseaudio-0.9.12 )
-
-RDEPEND=${DEPEND}
- !kde-base/kmix:4
-
-
-PATCHES=( ${FILESDIR}/${PN}-5.-alsa-optional.patch )
-
-src_configure() {
- local mycmakeargs=(
- -DKMIX_KF5_BUILD=ON
- $(cmake-utils_use_find_package alsa)
- $(cmake-utils_use_find_package canberra)
- $(cmake-utils_use_find_package pulseaudio PulseAudio)
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index f7a8cfa..346ad98 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -4,27 +4,47 @@
EAPI=5
-KDE_HANDBOOK=optional
-inherit kde4-base
+KDE_HANDBOOK=false
+KDE_TEST=false
+inherit kde5
-DESCRIPTION=KDE mixer gui
+DESCRIPTION=Plasma mixer gui
