[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmix/files/, kde-apps/kmix/

2020-04-09 Thread Andreas Sturmlechner 
commit: 4fc761eb4fcf347920d8f85a46a2e59a82f28874
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  9 20:52:12 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 21:36:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc761eb

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-19.12.3-r1.ebuild   | 60 ++
 2 files changed, 131 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 000..a67b89f324e
--- /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-19.12.3-r1.ebuild 
b/kde-apps/kmix/kmix-19.12.3-r1.ebuild
new file mode 100644
index 000..20da88330cc
--- /dev/null
+++ b/kde-apps/kmix/kmix-19.12.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="false"
+KFMIN=5.63.0
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Volume control gui based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kmix;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa plasma pulseaudio"
+
+DEPEND="
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=kde-frameworks/solid-${KFMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   alsa? ( >=media-libs/alsa-lib-1.0.14a )
+   plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
+   pulseaudio? (
+   dev-libs/glib:2
+   media-libs/libcanberra
+   >=media-sound/pulseaudio-0.9.12
+   )
+"
+RDEPEND="${DEPEND}
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmix/files/, kde-apps/kmix/

2016-08-04 Thread Michael Palimaka 
commit: 8f33ed3cfcfb14094825ecd1aea658ef4957fd69
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Aug  3 20:07:50 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug  4 14:15:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f33ed3c

kde-apps/kmix: Fix runtime crash on volume change

Gentoo-bug: 590406

Upstream commit: 7aa904ecacfd2eeaa91068e17cc9bd79ba058206

Package-Manager: portage-2.2.28

 kde-apps/kmix/files/kmix-16.04.3-crashfix.patch | 26 
 kde-apps/kmix/kmix-16.04.3-r1.ebuild| 56 +
 2 files changed, 82 insertions(+)

diff --git a/kde-apps/kmix/files/kmix-16.04.3-crashfix.patch 
b/kde-apps/kmix/files/kmix-16.04.3-crashfix.patch
new file mode 100644
index 000..c2ce07c
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-16.04.3-crashfix.patch
@@ -0,0 +1,26 @@
+commit 7aa904ecacfd2eeaa91068e17cc9bd79ba058206
+Author: Andreas Sturmlechner 
+Date:   Thu Jul 28 12:49:32 2016 +0200
+
+Fix infinite recursion by scroll wheel volume change
+
+BUGS: 364141
+REVIEW: 128546
+
+diff --git a/gui/viewdockareapopup.cpp b/gui/viewdockareapopup.cpp
+index 846d9be..24e462b 100644
+--- a/gui/viewdockareapopup.cpp
 b/gui/viewdockareapopup.cpp
+@@ -137,9 +137,11 @@ void ViewDockAreaPopup::wheelEvent ( QWheelEvent * e )
+ {
+   if ( _mdws.isEmpty() )
+ return;
+-  
++
++#ifndef X_KMIX_KF5_BUILD
+// Pass wheel event from "border widget" to child
+QApplication::sendEvent( _mdws.first(), e);
++#endif
+ }
+ 
+ 

diff --git a/kde-apps/kmix/kmix-16.04.3-r1.ebuild 
b/kde-apps/kmix/kmix-16.04.3-r1.ebuild
new file mode 100644
index 000..cac6429
--- /dev/null
+++ b/kde-apps/kmix/kmix-16.04.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Plasma mixer gui"
+HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/;
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+DEPEND="
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(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)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep plasma)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   alsa? ( >=media-libs/alsa-lib-1.0.14a )
+   pulseaudio? (
+   media-libs/libcanberra
+   >=media-sound/pulseaudio-0.9.12
+   )
+"
+RDEPEND="${DEPEND}
+   $(add_plasma_dep kde-cli-tools)
+"
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DKMIX_KF5_BUILD=ON
+   $(cmake-utils_use_find_package alsa Alsa)
+   $(cmake-utils_use_find_package pulseaudio Canberra)
+   $(cmake-utils_use_find_package pulseaudio PulseAudio)
+   )
+
+   kde5_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmix/files/, kde-apps/kmix/

2015-08-25 Thread Michael Palimaka 
commit: b3ef10875a9cbb4268875e4006e94ab750f560aa
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 16:27:50 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 16:28:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ef1087

kde-apps/kmix: backport patch from upstream to remove unused dependency.

Gentoo-bug: 558386

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/files/kmix-15.08.0-deps.patch | 25 +
 kde-apps/kmix/kmix-15.08.0.ebuild   |  5 -
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/kde-apps/kmix/files/kmix-15.08.0-deps.patch 
b/kde-apps/kmix/files/kmix-15.08.0-deps.patch
new file mode 100644
index 000..5a02359
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-15.08.0-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.0.ebuild 
b/kde-apps/kmix/kmix-15.08.0.ebuild
index 8fe35a2..ae2e6ba 100644
--- a/kde-apps/kmix/kmix-15.08.0.ebuild
+++ b/kde-apps/kmix/kmix-15.08.0.ebuild
@@ -39,7 +39,10 @@ DEPEND=
 
 RDEPEND=${DEPEND}
 
-PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch
+${FILESDIR}/${PN}-15.08.0-deps.patch
+)
 
 src_configure() {
local mycmakeargs=(