Hello community,
here is the log from the commit of package kdemultimedia4 for openSUSE:Factory
checked in at Mon Jul 19 21:16:51 CEST 2010.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2010-06-18 16:31:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2010-07-16 18:20:06.000000000 +0200
@@ -1,0 +2,12 @@
+Fri Jul 16 18:20:02 CEST 2010 - dmueller@suse.de
+
+- update to 4.4.93svn1149349
+
+-------------------------------------------------------------------
+Thu Jul 8 01:23:51 CEST 2010 - dmueller@suse.de
+
+- update to 4.4.5
+ * bugfixes over 4.4.4
+ * see http://kde.org/announcements/changelogs/changelog4_4_4to4_4_5.php for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
4_4_BRANCH.diff
kdemultimedia-4.4.4.tar.bz2
New:
----
4_5_BRANCH.diff
kdemultimedia-4.4.93svn1149349.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.NLW9xR/_old 2010-07-19 21:16:45.000000000 +0200
+++ /var/tmp/diff_new_pack.NLW9xR/_new 2010-07-19 21:16:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 4.4.4)
+# spec file for package kdemultimedia4 (Version 4.4.93svn1149349)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -31,10 +31,10 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 4.4.4
+Version: 4.4.93svn1149349
Release: 1
Source0: kdemultimedia-%version.tar.bz2
-Patch0: 4_4_BRANCH.diff
+Patch0: 4_5_BRANCH.diff
Patch1: kmix-autostart.diff
Patch2: kmix-global-shortcuts.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -210,7 +210,6 @@
%files -n kscd -f filelists/kscd
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-%dir %_kde4_appsdir/profiles
%dir %_kde4_appsdir/solid
%dir %_kde4_appsdir/solid/actions
++++++ 4_4_BRANCH.diff -> 4_5_BRANCH.diff ++++++
++++++ kmix-autostart.diff ++++++
--- /var/tmp/diff_new_pack.NLW9xR/_old 2010-07-19 21:16:46.000000000 +0200
+++ /var/tmp/diff_new_pack.NLW9xR/_new 2010-07-19 21:16:46.000000000 +0200
@@ -45,7 +45,7 @@
#include
#include
#include
-@@ -89,6 +91,10 @@
+@@ -94,6 +96,10 @@
theKMixDeviceManager->initHotplug();
connect(theKMixDeviceManager, SIGNAL( plugged( const char*, const QString&, QString&)), SLOT (plugged( const char*, const QString&, QString&) ) );
connect(theKMixDeviceManager, SIGNAL( unplugged( const QString&)), SLOT (unplugged( const QString&) ) );
@@ -56,15 +56,15 @@
if ( m_startVisible && ! invisible)
show(); // Started visible: We don't do "m_isVisible = true;", as the showEvent() already does it
-@@ -255,6 +261,7 @@
+@@ -262,6 +268,7 @@
config.writeEntry( "Tickmarks", m_showTicks );
config.writeEntry( "Labels", m_showLabels );
config.writeEntry( "startkdeRestore", m_onLogin );
+ config.writeEntry( "AutoStart", m_autoStart );
config.writeEntry( "DefaultCardOnStart", m_defaultCardOnStart );
config.writeEntry( "ConfigVersion", KMIX_CONFIG_VERSION );
- Mixer* mixerMasterCard = Mixer::getGlobalMasterMixer();
-@@ -327,6 +334,7 @@
+ config.writeEntry( "AutoUseMultimediaKeys", m_autouseMultimediaKeys );
+@@ -335,6 +342,7 @@
m_showLabels = config.readEntry("Labels", true);
m_onLogin = config.readEntry("startkdeRestore", true );
m_startVisible = config.readEntry("Visible", false);
@@ -72,7 +72,7 @@
m_multiDriverMode = config.readEntry("MultiDriver", false);
const QString& orientationString = config.readEntry("Orientation", "Vertical");
m_defaultCardOnStart = config.readEntry( "DefaultCardOnStart", "" );
-@@ -682,6 +690,7 @@
+@@ -691,6 +699,7 @@
m_prefDlg->m_volumeChk->setChecked(m_volumeWidget);
m_prefDlg->m_volumeChk->setEnabled( m_showDockWidget );
m_prefDlg->m_onLogin->setChecked( m_onLogin );
@@ -80,7 +80,7 @@
m_prefDlg->m_showTicks->setChecked( m_showTicks );
m_prefDlg->m_showLabels->setChecked( m_showLabels );
-@@ -723,6 +732,7 @@
+@@ -732,6 +741,7 @@
m_showDockWidget = prefDlg->m_dockingChk->isChecked();
m_volumeWidget = prefDlg->m_volumeChk->isChecked();
m_onLogin = prefDlg->m_onLogin->isChecked();
@@ -90,8 +90,8 @@
}
Index: kmix/KMixApp.cpp
===================================================================
---- kmix/KMixApp.cpp (revision 946324)
-+++ kmix/KMixApp.cpp (working copy)
+--- kmix/KMixApp.cpp 2010-04-07 17:19:06.000000000 +0200
++++ kmix/KMixApp.cpp 2010-04-08 16:43:21.479921617 +0200
@@ -22,9 +22,11 @@
#include "KMixApp.h"
#include "kmix.h"
@@ -104,24 +104,25 @@
KMixApp::KMixApp()
: KUniqueApplication(), m_kmix( 0 )
-@@ -51,6 +53,16 @@
+@@ -51,6 +53,17 @@
// There are 3 cases for a new instance
//kDebug(67100) << "KMixApp::newInstance() isRestored()=" << isRestored() << "_keepVisibility=" << _keepVisibility;
-+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
-+ if (args->isSet("autostart"))
-+ {
-+ kapp->disableSessionManagement();
++ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
-+ if ( m_kmix )
-+ return 0;
-+ }
++ if (args->isSet("autostart"))
++ {
++ kapp->disableSessionManagement();
+
- if ( m_kmix )
++ if ( m_kmix )
++ return 0;
++ }
++
+ static bool first = true;
+ if ( !first )
{ // There already exists an instance/window
-
-@@ -107,6 +119,11 @@
+@@ -117,6 +130,11 @@
_keepVisibility = val_keepVisibility;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org