Hello community,
here is the log from the commit of package kmix for openSUSE:Factory checked in at 2015-10-03 20:22:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-07-14 17:35:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kmix.new/kmix.changes 2015-10-03 20:22:08.000000000 +0200
@@ -1,0 +2,23 @@
+Sun Sep 13 19:19:45 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.08.1
+ * KDE Applications 15.08.1
+ * https://www.kde.org/announcements/announce-applications-15.08.1.php
+
+
+-------------------------------------------------------------------
+Wed Aug 19 19:43:36 UTC 2015 - cgiboudeaux@gmx.com
+
+- Update to KDE Applications 15.08.0
+ * KDE Applications 15.08.0
+ * https://www.kde.org/announcements/announce-applications-15.08.0.php
+
+-------------------------------------------------------------------
+Fri Aug 7 06:56:28 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.07.90
+ * KDE Applications 15.08.0 RC1
+ * https://www.kde.org/announcements/announce-applications-15.07.90.php
+
+
+-------------------------------------------------------------------
Old:
----
kmix-15.04.3.tar.xz
New:
----
kmix-15.08.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmix.spec ++++++
--- /var/tmp/diff_new_pack.dLNjAu/_old 2015-10-03 20:22:09.000000000 +0200
+++ /var/tmp/diff_new_pack.dLNjAu/_new 2015-10-03 20:22:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: kmix
-Version: 15.04.3
+Version: 15.08.1
Release: 0
Summary: Sound Mixer
License: GPL-2.0+
@@ -81,5 +81,6 @@
%{_kf5_servicesdir}/
%{_kf5_iconsdir}/hicolor/*/*/*
%{_kf5_sharedir}/kmix/
+%{_kf5_kxmlguidir}/kmix/
%changelog
++++++ kmix-15.04.3.tar.xz -> kmix-15.08.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.04.3/CMakeLists.txt new/kmix-15.08.1/CMakeLists.txt
--- old/kmix-15.04.3/CMakeLists.txt 2015-05-13 08:52:27.000000000 +0200
+++ new/kmix-15.08.1/CMakeLists.txt 2015-08-26 22:04:34.000000000 +0200
@@ -30,7 +30,7 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
if (KMIX_KF5_BUILD)
- find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+ find_package(ECM 5.10.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs)
@@ -386,7 +386,11 @@
install( PROGRAMS apps/kmixremote DESTINATION ${BIN_INSTALL_DIR} )
install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
install( FILES kmix_autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
-install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
+if (KMIX_KF5_BUILD)
+ install( FILES kmixui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kmix)
+else()
+ install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
+endif()
install( FILES kmixctrl_restore.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES dbus/org.kde.kmix.control.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
install( FILES dbus/org.kde.kmix.mixer.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.04.3/apps/kmix.cpp new/kmix-15.08.1/apps/kmix.cpp
--- old/kmix-15.04.3/apps/kmix.cpp 2015-05-13 08:52:27.000000000 +0200
+++ new/kmix-15.08.1/apps/kmix.cpp 2015-08-26 22:04:34.000000000 +0200
@@ -47,7 +47,6 @@
#include
#include
#include
-#include
#include <KProcess>
#include <KTabWidget>
@@ -922,8 +921,8 @@
{
kDebug()
<< "Plugged: dev=" << dev << "\n";
- MixerToolBox::instance()->possiblyAddMixer(mixer);
- recreateGUI(true, mixer->id(), true, false);
+ if (MixerToolBox::instance()->possiblyAddMixer(mixer))
+ recreateGUI(true, mixer->id(), true, false);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.04.3/backends/mixer_alsa9.cpp new/kmix-15.08.1/backends/mixer_alsa9.cpp
--- old/kmix-15.04.3/backends/mixer_alsa9.cpp 2015-05-13 08:52:27.000000000 +0200
+++ new/kmix-15.08.1/backends/mixer_alsa9.cpp 2015-08-26 22:04:34.000000000 +0200
@@ -479,7 +479,7 @@
// Check if this control has at least one volume control
bool hasVolume = snd_mixer_selem_has_playback_volume(elem) || snd_mixer_selem_has_capture_volume(elem);
- // Check if a appropriate switch is present (appropriate means, based o nthe "capture" parameer)
+ // Check if a appropriate switch is present (appropriate means, based o nthe "capture" parameter)
bool hasCommonSwitch = snd_mixer_selem_has_common_switch ( elem );
bool hasSwitch = hasCommonSwitch |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.04.3/backends/mixer_mpris2.cpp new/kmix-15.08.1/backends/mixer_mpris2.cpp
--- old/kmix-15.04.3/backends/mixer_mpris2.cpp 2015-05-13 08:52:27.000000000 +0200
+++ new/kmix-15.08.1/backends/mixer_mpris2.cpp 2015-08-26 22:04:34.000000000 +0200
@@ -122,7 +122,7 @@
*/
int Mixer_MPRIS2::readVolumeFromHW( const QString& /*id*/, shared_ptr<MixDevice> /*md*/)
{
- // Everything is done by notifications => no code neccessary
+ // Everything is done by notifications => no code necessary
return Mixer::OK_UNCHANGED;
}
@@ -209,6 +209,11 @@
arg << QVariant::fromValue(QDBusVariant(volFloat));
MPrisControl* mad = controls.value(id);
+ if ( !mad )
+ {
+ kDebug() << "id does not exist:" << id;
+ return 0;
+ }
QVariant v1 = QVariant(QString("org.mpris.MediaPlayer2.Player"));
QVariant v2 = QVariant(QString("Volume"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.04.3/core/mixdevice.cpp new/kmix-15.08.1/core/mixdevice.cpp
--- old/kmix-15.04.3/core/mixdevice.cpp 2015-05-13 08:52:27.000000000 +0200
+++ new/kmix-15.08.1/core/mixdevice.cpp 2015-08-26 22:04:34.000000000 +0200
@@ -110,11 +110,13 @@
* The ChannelType tells which kind of control the MixDevice is.
*/
MixDevice::MixDevice( Mixer* mixer, const QString& id, const QString& name, ChannelType type )
+ : _profControl(0)
{
init(mixer, id, name, channelTypeToIconName(type), (MixSet*)0);
}
MixDevice::MixDevice( Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet )
+ : _profControl(0)
{
init(mixer, id, name, iconName, moveDestinationMixSet);
}
@@ -195,14 +197,9 @@
if (debugme)
kDebug() << ( decrease ? "decrease by " : "increase by " ) << inc ;
- if (!decrease && isMuted())
+ if (isMuted())
{
- // increasing from muted state: unmute and start with a low volume level
- if (debugme)
- kDebug() << "set all to " << inc << "muted old=" << isMuted();
-
setMuted(false);
- volP.setAllVolumes(inc);
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.04.3/core/mixdevicecomposite.h new/kmix-15.08.1/core/mixdevicecomposite.h
--- old/kmix-15.04.3/core/mixdevicecomposite.h 2015-05-13 08:52:27.000000000 +0200
+++ new/kmix-15.08.1/core/mixdevicecomposite.h 2015-08-26 22:04:34.000000000 +0200
@@ -98,7 +98,6 @@
private:
long calculateVolume(Volume::VolumeType vt);
- Mixer *_mixer;
QList _mds;
static const long VolMax;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.04.3/kmix.desktop new/kmix-15.08.1/kmix.desktop
--- old/kmix-15.04.3/kmix.desktop 2015-05-13 08:52:27.000000000 +0200
+++ new/kmix-15.08.1/kmix.desktop 2015-08-26 22:04:34.000000000 +0200
@@ -57,6 +57,7 @@
GenericName[zh_CN]=混音器
GenericName[zh_TW]=音效混音器
Name=KMix
+Name[ast]=KMix
Name[bg]=KMix
Name[bs]=KMix
Name[ca]=KMix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.04.3/kmix_autostart.desktop new/kmix-15.08.1/kmix_autostart.desktop
--- old/kmix-15.04.3/kmix_autostart.desktop 2015-05-13 08:52:27.000000000 +0200
+++ new/kmix-15.08.1/kmix_autostart.desktop 2015-08-26 22:04:34.000000000 +0200
@@ -62,6 +62,7 @@
GenericName[zh_CN]=混音器
GenericName[zh_TW]=音效混音器
Name=KMix
+Name[ast]=KMix
Name[bg]=KMix
Name[bs]=KMix
Name[ca]=KMix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.04.3/pics/CMakeLists.txt new/kmix-15.08.1/pics/CMakeLists.txt
--- old/kmix-15.04.3/pics/CMakeLists.txt 2015-05-13 08:52:27.000000000 +0200
+++ new/kmix-15.08.1/pics/CMakeLists.txt 2015-08-26 22:04:34.000000000 +0200
@@ -30,4 +30,4 @@
ecm_install_icons( ${ICON_INSTALL_DIR} )
else()
kde4_install_icons( ${ICON_INSTALL_DIR} )
-endif()
\ No newline at end of file
+endif()