From 98c76b0947cba51b758f2740dda8e5764433a1a0c46a52e79a42297989b29350 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 8 Jul 2013 05:32:01 +0000 Subject: [PATCH] Accepting request 182026 from KDE:Distro:Factory Update KDE to KDE 4.10.90 OBS-URL: https://build.opensuse.org/request/show/182026 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmix?expand=0&rev=14 --- correct_volume_change_with_mousewheel.diff | 23 ---------------------- kmix-4.10.4.tar.xz | 3 --- kmix-4.10.90.tar.xz | 3 +++ kmix.changes | 16 +++++++++++++++ kmix.spec | 5 +---- 5 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 correct_volume_change_with_mousewheel.diff delete mode 100644 kmix-4.10.4.tar.xz create mode 100644 kmix-4.10.90.tar.xz diff --git a/correct_volume_change_with_mousewheel.diff b/correct_volume_change_with_mousewheel.diff deleted file mode 100644 index dd07e45..0000000 --- a/correct_volume_change_with_mousewheel.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/gui/kmixdockwidget.cpp b/gui/kmixdockwidget.cpp -index 3bda22e..fee74d9 100644 ---- a/gui/kmixdockwidget.cpp -+++ b/gui/kmixdockwidget.cpp -@@ -347,10 +347,16 @@ KMixDockWidget::trayWheelEvent(int delta,Qt::Orientation wheelOrientation) - - if ( inc < 1 ) inc = 1; - -+ if (delta < 0) -+ inc = -inc; -+ - if (wheelOrientation == Qt::Horizontal) // Reverse horizontal scroll: bko228780 -- delta = -delta; -+ inc = -inc; - -- long int cv = inc * (delta / 120 ); -+ // bko313579 Do not use "delta", as that is setting more related to documents (Editor, Browser). KMix should -+ // simply always use its own VOLUME_STEP_DIVISOR as a base for percentage change. -+ //long int cv = inc * (delta / 120 ); -+ long cv = inc; - bool isInactive = vol.isCapture() ? !md->isRecSource() : md->isMuted(); - kDebug() << "Operating on capture=" << vol.isCapture() << ", isInactive=" << isInactive; - if ( cv > 0 && isInactive) diff --git a/kmix-4.10.4.tar.xz b/kmix-4.10.4.tar.xz deleted file mode 100644 index 92cc0a3..0000000 --- a/kmix-4.10.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47fa26839adb83e30a5eb96fa734d8793a1f004e1694d92dba23c8809f7fc7cc -size 381700 diff --git a/kmix-4.10.90.tar.xz b/kmix-4.10.90.tar.xz new file mode 100644 index 0000000..b574bcb --- /dev/null +++ b/kmix-4.10.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09bb167f8f7a69fa201d10030ef99dc278c220dde73a18b9a7629d133f45ed48 +size 383920 diff --git a/kmix.changes b/kmix.changes index 8790e64..21cb16c 100644 --- a/kmix.changes +++ b/kmix.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Jun 27 18:21:34 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 19:29:54 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php +- Dropped correct_volume_change_with_mousewheel.diff, it's included + in this release + ------------------------------------------------------------------- Sat Jun 1 09:46:59 UTC 2013 - tittiatcoke@gmail.com diff --git a/kmix.spec b/kmix.spec index 126864b..55acff9 100644 --- a/kmix.spec +++ b/kmix.spec @@ -27,11 +27,9 @@ Summary: Sound Mixer License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Mixers Url: http://www.kde.org -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: %{name}-%{version}.tar.xz -#PATCH-FIX-UPSTREAM correct_volume_change_with_mousewheel.diff tittiatcoke@gmail.com -- Correct the volume change step when done with mousewheel -Patch1: correct_volume_change_with_mousewheel.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -40,7 +38,6 @@ KDE's full featured mini mixer %prep %setup -q -%patch1 -p1 %build %cmake_kde4 -d build