Hello community, here is the log from the commit of package kdemultimedia4 for openSUSE:Factory checked in at 2012-01-09 11:15:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdemultimedia4 (Old) and /work/SRC/openSUSE:Factory/.kdemultimedia4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdemultimedia4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdemultimedia4/kdemultimedia4.changes 2011-12-08 12:01:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdemultimedia4.new/kdemultimedia4.changes 2012-01-09 11:15:30.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 22 13:18:09 UTC 2011 - [email protected] + +- Fix kde#265733 : Some channels missing in KMix after + update to KDE 4.6 + +------------------------------------------------------------------- New: ---- kde-265733.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.uSSvmD/_old 2012-01-09 11:15:31.000000000 +0100 +++ /var/tmp/diff_new_pack.uSSvmD/_new 2012-01-09 11:15:31.000000000 +0100 @@ -47,6 +47,7 @@ Url: http://www.kde.org Source: kdemultimedia-%{version}.tar.bz2 Patch1: kmix-autostart.diff +Patch2: kde-265733.patch Suggests: juk Suggests: kio_audiocd Suggests: kmix @@ -65,6 +66,8 @@ %prep %setup -q -n kdemultimedia-%{version} %patch1 +%patch2 + FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" libkcompactdisc/wmlib/wm_helpers.c ++++++ kde-265733.patch ++++++ --- kmix/gui/viewsliders.cpp 2011/06/22 13:48:34 1238060 +++ kmix/gui/viewsliders.cpp 2011/12/22 13:11:55 1270008 @@ -187,8 +187,8 @@ if ( _mixSet->contains( md ) ) continue; // dup check // Now check whether subcontrols match - bool subcontrolPlaybackWanted = (control->useSubcontrolPlayback() && md->playbackVolume().hasVolume()); - bool subcontrolCaptureWanted = (control->useSubcontrolCapture() && md->captureVolume().hasVolume()); + bool subcontrolPlaybackWanted = (control->useSubcontrolPlayback() && ( md->playbackVolume().hasVolume() || md->playbackVolume().hasSwitch()) ); + bool subcontrolCaptureWanted = (control->useSubcontrolCapture() && ( md->captureVolume() .hasVolume() || md->captureVolume() .hasSwitch()) ); bool subcontrolEnumWanted = (control->useSubcontrolEnum() && md->isEnum()); bool subcontrolWanted = subcontrolPlaybackWanted | subcontrolCaptureWanted | subcontrolEnumWanted; bool splitWanted = control->isSplit(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
