Hello community, here is the log from the commit of package kmix for openSUSE:Factory checked in at 2013-10-03 15:58:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmix (Old) and /work/SRC/openSUSE:Factory/.kmix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmix" Changes: -------- --- /work/SRC/openSUSE:Factory/kmix/kmix.changes 2013-09-26 11:46:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmix.new/kmix.changes 2013-10-03 15:59:11.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 28 15:14:43 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.2 + * KDE 4.11.2 bugfix release + * See http://www.kde.org/announcements/announce-4.11.2.php + +------------------------------------------------------------------- Old: ---- kmix-4.11.1.tar.xz New: ---- kmix-4.11.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmix.spec ++++++ --- /var/tmp/diff_new_pack.EyKNEZ/_old 2013-10-03 15:59:12.000000000 +0200 +++ /var/tmp/diff_new_pack.EyKNEZ/_new 2013-10-03 15:59:12.000000000 +0200 @@ -27,7 +27,7 @@ License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Mixers Url: http://www.kde.org -Version: 4.11.1 +Version: 4.11.2 Release: 0 Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Who-needs-event-slider.patch -- since KNotify will no longer be able pretending it can ++++++ kmix-4.11.1.tar.xz -> kmix-4.11.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/CMakeLists.txt new/kmix-4.11.2/CMakeLists.txt --- old/kmix-4.11.1/CMakeLists.txt 2013-06-28 19:40:38.000000000 +0200 +++ new/kmix-4.11.2/CMakeLists.txt 2013-09-26 21:25:44.000000000 +0200 @@ -26,6 +26,17 @@ endif(MSVC) +include(CheckCXXSourceCompiles) +check_cxx_source_compiles(" + #include <memory> + int main() { std::shared_ptr<int> p; return 0; } +" HAVE_STD_SHARED_PTR) +check_cxx_source_compiles(" + #include <tr1/memory> + int main() { std::tr1::shared_ptr<int> p; return 0; } +" HAVE_STD_TR1_SHARED_PTR) + + configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/apps/kmixd.cpp new/kmix-4.11.2/apps/kmixd.cpp --- old/kmix-4.11.1/apps/kmixd.cpp 2013-08-28 19:10:00.000000000 +0200 +++ new/kmix-4.11.2/apps/kmixd.cpp 2013-09-26 21:25:44.000000000 +0200 @@ -156,7 +156,7 @@ config.writeEntry( "MasterMixer", mixerMasterCard->id() ); } shared_ptr<MixDevice> mdMaster = Mixer::getGlobalMasterMD(); - if ( mdMaster != 0 ) { + if ( mdMaster ) { config.writeEntry( "MasterMixerDevice", mdMaster->id() ); } QString mixerIgnoreExpression = MixerToolBox::instance()->mixerIgnoreExpression(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/backends/mixer_backend.cpp new/kmix-4.11.2/backends/mixer_backend.cpp --- old/kmix-4.11.1/backends/mixer_backend.cpp 2013-08-28 19:10:00.000000000 +0200 +++ new/kmix-4.11.2/backends/mixer_backend.cpp 2013-09-26 21:25:44.000000000 +0200 @@ -241,7 +241,7 @@ */ shared_ptr<MixDevice> Mixer_Backend::recommendedMaster() { - if ( m_recommendedMaster != 0 ) + if ( m_recommendedMaster ) { // Backend has set a recommended master. Thats fine. Using it. return m_recommendedMaster; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/backends/mixer_mpris2.cpp new/kmix-4.11.2/backends/mixer_mpris2.cpp --- old/kmix-4.11.1/backends/mixer_mpris2.cpp 2013-08-28 19:10:00.000000000 +0200 +++ new/kmix-4.11.2/backends/mixer_mpris2.cpp 2013-09-26 21:25:44.000000000 +0200 @@ -535,7 +535,7 @@ } shared_ptr<MixDevice> md = m_mixDevices.get(id); - if (md != 0) + if (md) { // We know about the player that is unregistering => remove internally md->close(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/config.h.cmake new/kmix-4.11.2/config.h.cmake --- old/kmix-4.11.1/config.h.cmake 2013-06-28 19:40:38.000000000 +0200 +++ new/kmix-4.11.2/config.h.cmake 2013-09-26 21:25:44.000000000 +0200 @@ -15,3 +15,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #cmakedefine HAVE_UNISTD_H 1 + +/* Define to 1 if <tr1/memory> exists and defines std::tr1::shared_ptr. */ +#cmakedefine HAVE_STD_TR1_SHARED_PTR 1 + +/* Define to 1 if <memory> exists and defines std::shared_ptr. */ +#cmakedefine HAVE_STD_SHARED_PTR 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/core/ControlPool.h new/kmix-4.11.2/core/ControlPool.h --- old/kmix-4.11.1/core/ControlPool.h 2013-06-28 19:40:38.000000000 +0200 +++ new/kmix-4.11.2/core/ControlPool.h 2013-09-26 21:25:44.000000000 +0200 @@ -22,12 +22,15 @@ #ifndef CONTROL_POOL_H #define CONTROL_POOL_H +#include "config.h" -// std::shared_ptr +#if defined(HAVE_STD_SHARED_PTR) #include <memory> +using std::shared_ptr; +#elif defined(HAVE_STD_TR1_SHARED_PTR) #include <tr1/memory> - -using namespace ::std::tr1; +using std::tr1::shared_ptr; +#endif #include "core/mixdevice.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/core/MasterControl.h new/kmix-4.11.2/core/MasterControl.h --- old/kmix-4.11.1/core/MasterControl.h 2013-06-28 19:40:38.000000000 +0200 +++ new/kmix-4.11.2/core/MasterControl.h 2013-09-26 21:25:44.000000000 +0200 @@ -8,12 +8,17 @@ #ifndef MASTERCONTROL_H_ #define MASTERCONTROL_H_ -#include <QString> +#include "config.h" -// std::shared_ptr +#if defined(HAVE_STD_SHARED_PTR) #include <memory> +using std::shared_ptr; +#elif defined(HAVE_STD_TR1_SHARED_PTR) #include <tr1/memory> -using namespace ::std::tr1; +using std::tr1::shared_ptr; +#endif + +#include <QString> class MasterControl { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/core/mixdevice.h new/kmix-4.11.2/core/mixdevice.h --- old/kmix-4.11.1/core/mixdevice.h 2013-08-28 19:10:00.000000000 +0200 +++ new/kmix-4.11.2/core/mixdevice.h 2013-09-26 21:25:44.000000000 +0200 @@ -21,10 +21,15 @@ #ifndef MixDevice_h #define MixDevice_h -// std::shared_ptr +#include "config.h" + +#if defined(HAVE_STD_SHARED_PTR) #include <memory> +using std::shared_ptr; +#elif defined(HAVE_STD_TR1_SHARED_PTR) #include <tr1/memory> -using namespace ::std::tr1; +using std::tr1::shared_ptr; +#endif //KMix class Mixer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/core/mixertoolbox.cpp new/kmix-4.11.2/core/mixertoolbox.cpp --- old/kmix-4.11.1/core/mixertoolbox.cpp 2013-08-28 19:10:00.000000000 +0200 +++ new/kmix-4.11.2/core/mixertoolbox.cpp 2013-09-26 21:25:44.000000000 +0200 @@ -248,13 +248,13 @@ // Add a master device (if we haven't defined one yet) - if ( Mixer::getGlobalMasterMD(false) == 0 ) { + if ( !Mixer::getGlobalMasterMD(false) ) { // We have no master card yet. This actually only happens when there was // not one defined in the kmixrc. // So lets just set the first card as master card. if ( Mixer::mixers().count() > 0 ) { shared_ptr<MixDevice> master = Mixer::mixers().first()->getLocalMasterMD(); - if ( master != 0 ) { + if ( master ) { QString controlId = master->id(); Mixer::setGlobalMaster( Mixer::mixers().first()->id(), controlId, true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/gui/kmixdockwidget.cpp new/kmix-4.11.2/gui/kmixdockwidget.cpp --- old/kmix-4.11.1/gui/kmixdockwidget.cpp 2013-08-28 19:10:00.000000000 +0200 +++ new/kmix-4.11.2/gui/kmixdockwidget.cpp 2013-09-26 21:25:44.000000000 +0200 @@ -215,7 +215,7 @@ shared_ptr<MixDevice> md = Mixer::getGlobalMasterMD(); char newPixmapType; - if ( md == 0 ) + if ( !md ) { newPixmapType = 'e'; } @@ -405,7 +405,7 @@ void KMixDockWidget::updateDockMuteAction ( KToggleAction* dockMuteAction ) { shared_ptr<MixDevice> md = Mixer::getGlobalMasterMD(); - if ( md != 0 && dockMuteAction != 0 ) + if ( md && dockMuteAction != 0 ) { Volume& vol = md->playbackVolume().hasVolume() ? md->playbackVolume() : md->captureVolume(); bool isInactive = vol.isCapture() ? !md->isRecSource() : md->isMuted(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-4.11.1/gui/viewdockareapopup.cpp new/kmix-4.11.2/gui/viewdockareapopup.cpp --- old/kmix-4.11.1/gui/viewdockareapopup.cpp 2013-08-28 19:10:00.000000000 +0200 +++ new/kmix-4.11.2/gui/viewdockareapopup.cpp 2013-09-26 21:25:44.000000000 +0200 @@ -248,12 +248,12 @@ { // kDebug() << "ADD? mixerId=" << mixer->id(); shared_ptr<MixDevice>dockMD = mixer->getLocalMasterMD(); - if ( dockMD == 0 && mixer->size() > 0 ) + if ( !dockMD && mixer->size() > 0 ) { // If we have no dock device yet, we will take the first available mixer device. dockMD = (*mixer)[0]; } - if ( dockMD != 0 ) + if ( dockMD ) { // kDebug() << "ADD? mixerId=" << mixer->id() << ", md=" << dockMD->id(); if ( !dockMD->isApplicationStream() && dockMD->playbackVolume().hasVolume()) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
