Hello community,
here is the log from the commit of package kdemultimedia4 for openSUSE:Factory
checked in at Wed May 5 22:52:05 CEST 2010.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2010-03-26 19:19:37.000000000 +0100
+++ kdemultimedia4/kdemultimedia4.changes 2010-04-29 22:40:30.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 29 22:40:27 CEST 2010 - dmueller@suse.de
+
+- update to 4.4.3
+ * bugfixes over 4.4.2
+ * see http://kde.org/announcements/changelogs/changelog4_4_2to4_4_3.php for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdemultimedia-4.4.2.tar.bz2
New:
----
kdemultimedia-4.4.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.0JGPQe/_old 2010-05-05 22:51:35.000000000 +0200
+++ /var/tmp/diff_new_pack.0JGPQe/_new 2010-05-05 22:51:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 4.4.2)
+# spec file for package kdemultimedia4 (Version 4.4.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -31,7 +31,7 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 4.4.2
+Version: 4.4.3
Release: 1
Source0: kdemultimedia-%version.tar.bz2
Patch0: 4_4_BRANCH.diff
++++++ kdemultimedia-4.4.2.tar.bz2 -> kdemultimedia-4.4.3.tar.bz2 ++++++
Files old/kdemultimedia-4.4.2/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.4.3/doc/dragonplayer/index.cache.bz2 differ
Files old/kdemultimedia-4.4.2/doc/juk/index.cache.bz2 and new/kdemultimedia-4.4.3/doc/juk/index.cache.bz2 differ
Files old/kdemultimedia-4.4.2/doc/kcontrol/cddbretrieval/index.cache.bz2 and new/kdemultimedia-4.4.3/doc/kcontrol/cddbretrieval/index.cache.bz2 differ
Files old/kdemultimedia-4.4.2/doc/kioslave/audiocd/index.cache.bz2 and new/kdemultimedia-4.4.3/doc/kioslave/audiocd/index.cache.bz2 differ
Files old/kdemultimedia-4.4.2/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.4.3/doc/kmix/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.2/dragonplayer/src/app/mainWindow.cpp new/kdemultimedia-4.4.3/dragonplayer/src/app/mainWindow.cpp
--- old/kdemultimedia-4.4.2/dragonplayer/src/app/mainWindow.cpp 2009-07-28 21:44:18.000000000 +0200
+++ new/kdemultimedia-4.4.3/dragonplayer/src/app/mainWindow.cpp 2010-04-29 21:57:02.000000000 +0200
@@ -37,6 +37,7 @@
#include <KToolBar>
#include <KWindowSystem>
#include <KXMLGUIFactory>
+#include <KProtocolInfo>
#include
@@ -550,18 +551,18 @@
}
}
- if (url.protocol() == "media") {
+ // local protocols like nepomuksearch:/ are not supported by xine
+ // check if an UDS_LOCAL_PATH is defined.
+ if (KProtocolInfo::protocolClass(url.protocol()) == QLatin1String(":local")) {
//#define UDS_LOCAL_PATH (72 | KIO::UDS_STRING)
KIO::UDSEntry e;
- if (!KIO::NetAccess::stat( url, e, 0 ))
- MessageBox::sorry( i18n("There was an internal error with the media slave...") );
- else {
+ if (KIO::NetAccess::stat( url, e, 0 )) {
QString path = e.stringValue( KIO::UDSEntry::UDS_LOCAL_PATH );
if( !path.isEmpty() )
return engine()->load( KUrl( path ) );
}
}
-
+
if( m_mainView->indexOf(engine()) == -1 )
toggleLoadView();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.2/kioslave/audiocd/audiocd.cpp new/kdemultimedia-4.4.3/kioslave/audiocd/audiocd.cpp
--- old/kdemultimedia-4.4.2/kioslave/audiocd/audiocd.cpp 2009-12-31 14:30:01.000000000 +0100
+++ new/kdemultimedia-4.4.3/kioslave/audiocd/audiocd.cpp 2010-04-29 21:57:02.000000000 +0200
@@ -62,7 +62,7 @@
using namespace KIO;
-#define CDDB_INFORMATION "CDDB Information"
+#define CDDB_INFORMATION I18N_NOOP("CDDB Information")
using namespace AudioCD;
@@ -103,10 +103,9 @@
class AudioCDProtocol::Private {
public:
- Private() {
+ Private() : s_info(i18n("Information")), s_fullCD(i18n("Full CD"))
+ {
clearURLargs();
- s_info = i18n("Information");
- s_fullCD = i18n("Full CD");
}
void clearURLargs() {
@@ -151,8 +150,8 @@
bool reportErrors;
// Directory strings, never change after init
- QString s_info;
- QString s_fullCD;
+ const QString s_info;
+ const QString s_fullCD;
// Current CD
TOC disc_toc[MAXTRK];
@@ -481,7 +480,6 @@
int track = d->req_track+1;
- QString trackName;
// hack
// do we rip the whole CD?
if (d->req_allTracks){
@@ -515,11 +513,11 @@
if (!drive)
return;
- bool isFile = !d->fname.isEmpty();
+ const bool isFile = !d->fname.isEmpty();
// the track number. 0 if ripping
// the whole CD.
- uint trackNumber = d->req_track + 1;
+ const uint trackNumber = d->req_track + 1;
if (!d->req_allTracks)
{ // we only want to rip one track.
@@ -626,7 +624,7 @@
}
// Error
if( count == 1 ) {
- app_file(entry, QString("%1: %2.txt").arg(i18n(CDDB_INFORMATION)).arg(KCDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1);
+ app_file(entry, QString("%1: %2.txt").arg(i18n(CDDB_INFORMATION)).arg(KCDDB::resultToString(d->cddbResult)), 0);
count++;
listEntry(entry, false);
}
@@ -740,7 +738,7 @@
struct cdrom_drive *AudioCDProtocol::getDrive()
{
- QByteArray device(QFile::encodeName(d->device));
+ const QByteArray device(QFile::encodeName(d->device));
struct cdrom_drive * drive = 0;
@@ -760,7 +758,7 @@
if (0 == drive) {
kDebug(7117) << "Can't find an audio CD on: \"" << d->device << "\"";
- QFileInfo fi(d->device);
+ const QFileInfo fi(d->device);
if(!fi.isReadable())
error(KIO::ERR_SLAVE_DEFINED, i18n("Device does not have read permissions for this account. Check the read permissions on the device."));
else if(!fi.isWritable())
@@ -957,18 +955,18 @@
query = query.mid(1); // Strip leading '?'.
- QStringList tokens(query.split('&',QString::SkipEmptyParts));
+ const QStringList tokens(query.split('&',QString::SkipEmptyParts));
for (QStringList::ConstIterator it(tokens.constBegin()); it != tokens.constEnd(); ++it)
{
- QString token(*it);
+ const QString token(*it);
int equalsPos = token.indexOf('=');
if (-1 == equalsPos)
continue;
- QString attribute(token.left(equalsPos));
- QString value(token.mid(equalsPos + 1));
+ const QString attribute(token.left(equalsPos));
+ const QString value(token.mid(equalsPos + 1));
if (attribute == QLatin1String("device"))
d->device = value;
@@ -994,8 +992,8 @@
*/
void AudioCDProtocol::loadSettings()
{
- KConfig *config = new KConfig(QLatin1String( "kcmaudiocdrc"), KConfig::NoGlobals );
- KConfigGroup groupCDDA( config, "CDDA" );
+ const KConfig *config = new KConfig(QLatin1String( "kcmaudiocdrc"), KConfig::NoGlobals );
+ const KConfigGroup groupCDDA( config, "CDDA" );
if (!groupCDDA.readEntry("autosearch", true)) {
d->device = groupCDDA.readEntry("device", QString(KCompactDisc::defaultCdromDeviceUrl().url()));
@@ -1021,7 +1019,7 @@
}
// The default track filename template
- KConfigGroup groupFileName( config, "FileName" );
+ const KConfigGroup groupFileName( config, "FileName" );
d->fileNameTemplate = groupFileName.readEntry("file_name_template", "%{trackartist} - %{number} - %{title}");
d->albumTemplate = groupFileName.readEntry("album_template", "%{albumartist} - %{albumtitle}");
d->rsearch = groupFileName.readEntry("regexp_search");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.2/kioslave/audiocd/data/solid_audiocd.desktop new/kdemultimedia-4.4.3/kioslave/audiocd/data/solid_audiocd.desktop
--- old/kdemultimedia-4.4.2/kioslave/audiocd/data/solid_audiocd.desktop 2010-03-26 18:28:51.000000000 +0100
+++ new/kdemultimedia-4.4.3/kioslave/audiocd/data/solid_audiocd.desktop 2010-04-29 21:57:02.000000000 +0200
@@ -19,6 +19,7 @@
Name[es]=Abrir con el gestor de archivos
Name[et]=Ava failihalduriga
Name[fr]=Ouvrir avec le gestionnaire de fichiers
+Name[ga]=Oscail le Bainisteoir Comhad
Name[gl]=Abrir co xestor de ficheiros
Name[hu]=Megnyitás a fájlkezelővel
Name[is]=Opna með skráastjóra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.2/kscd/kscd.cpp new/kdemultimedia-4.4.3/kscd/kscd.cpp
--- old/kdemultimedia-4.4.2/kscd/kscd.cpp 2009-09-16 13:44:50.000000000 +0200
+++ new/kdemultimedia-4.4.3/kscd/kscd.cpp 2010-04-29 21:57:02.000000000 +0200
@@ -54,9 +54,9 @@
devices = new HWControler();
- KsCD::PlayerDBusHandler * pdbh = new KsCD::PlayerDBusHandler(this);
- KsCD::RootDBusHandler * rdbh = new KsCD::RootDBusHandler(this);
- KsCD::TracklistDBusHandler * tdbh = new KsCD::TracklistDBusHandler(this);
+ new KsCD::PlayerDBusHandler(this);
+ new KsCD::RootDBusHandler(this);
+ new KsCD::TracklistDBusHandler(this);
sslider = new Phonon::SeekSlider(devices->getMedia(),this);
// sslider->setMediaObject(devices->getMedia());
@@ -473,7 +473,7 @@
QString state = "over";
QString result;
- if(name=="play")
+ if (name == "play")
{
if( !devices->isDiscValid() || !devices->getCD()->isCdInserted())
{
@@ -504,7 +504,7 @@
emit(picture(name,state));
play = !play;
}
- if(name=="pause")
+ else if (name == "pause")
{
/*if( !devices->isDiscValid() || !devices->getCD()->isCdInserted())
{
@@ -523,7 +523,7 @@
emit(picture(name,state));
play = !play;
}
- if(name=="next")
+ else if (name == "next")
{
if( !devices->isDiscValid() || !devices->getCD()->isCdInserted())
{
@@ -557,7 +557,7 @@
}
emit(picture(name,state));
}
- if(name=="previous")
+ else if(name == "previous")
{
if( !devices->isDiscValid() || !devices->getCD()->isCdInserted())
{
@@ -591,7 +591,7 @@
}
emit(picture(name,state));
}
- if(name=="stop")
+ else if(name == "stop")
{
if ((devices->getState() == PlayingState)|| (devices->getState() == PausedState))
{
@@ -600,7 +600,7 @@
}
emit(picture(name,state));
}
- if(name=="eject")
+ else if (name == "eject")
{
m_trackDlg->removeRowsTrackTable(m_MBManager->getTrackList().size());
devices->eject();
@@ -611,19 +611,19 @@
// m_slider->stop();
}
}
- if(name=="mute")
+ else if (name == "mute")
{
devices->mute(false);
emit(picture(name,state));
mute = !mute;
}
- if(name=="unmute")
+ else if (name == "unmute")
{
devices->mute(true);
emit(picture(name,state));
mute = !mute;
}
- if(name == "random")
+ else if (name == "random")
{
devices->setRandom(false);
emit(picture(name,state));
@@ -632,7 +632,7 @@
random = !random;
}
- if(name == "p_random")
+ else if (name == "p_random")
{
devices->setRandom(true);
emit(picture(name,state));
@@ -641,7 +641,7 @@
random = !random;
}
- if(name == "loop")
+ else if (name == "loop")
{
devices->setLoopMode(NoLoop);
emit(picture(name,state));
@@ -651,7 +651,7 @@
looptrack = false;
loopdisc = false;
}
- if(name == "looptrack")
+ else if (name == "looptrack")
{
devices->setLoopMode(LoopOne);
emit(picture(name,state));
@@ -661,7 +661,7 @@
looptrack = true;
loopdisc = false;
}
- if(name == "loopdisc")
+ else if (name == "loopdisc")
{
devices->setLoopMode(LoopAll);
emit(picture(name,state));
@@ -670,17 +670,17 @@
loopdisc = true;
looptrack = false;
}
- if(name=="minimize")
+ else if (name == "minimize")
{
showMinimized ();
emit(picture(name,state));
}
- if(name=="close")
+ else if (name == "close")
{
close();
emit(picture(name,state));
}
- if(name == "tracklist")
+ else if (name == "tracklist")
{
if(m_stateTrackDialog == true)
{
@@ -698,7 +698,7 @@
QString def = "default";
emit(picture(name,def));
}
- if ( name == "configure")
+ else if (name == "configure")
{
optionsPreferences();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.2/libkcompactdisc/kcompactdisc.cpp new/kdemultimedia-4.4.3/libkcompactdisc/kcompactdisc.cpp
--- old/kdemultimedia-4.4.2/libkcompactdisc/kcompactdisc.cpp 2009-12-31 14:30:00.000000000 +0100
+++ new/kdemultimedia-4.4.3/libkcompactdisc/kcompactdisc.cpp 2010-04-29 21:57:02.000000000 +0200
@@ -159,7 +159,21 @@
const KUrl KCompactDisc::cdromDeviceUrl(const QString &cdromDeviceName)
{
- return getListOfCdromDevicesNamesAndUrl().value(cdromDeviceName, KCompactDisc::defaultCdromDeviceUrl());
+ const QMap &nameUrls = getListOfCdromDevicesNamesAndUrl();
+ KUrl result = nameUrls.value(cdromDeviceName);
+ if (!result.isValid())
+ {
+ const KUrl passedUrl(cdromDeviceName);
+ foreach(const KUrl &url, nameUrls)
+ {
+ if (url == passedUrl)
+ {
+ return passedUrl;
+ }
+ }
+ result = KCompactDisc::defaultCdromDeviceUrl();
+ }
+ return result;
}
const QString KCompactDisc::defaultCdromDeviceUdi()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.2/mplayerthumbs/src/videopreview.desktop new/kdemultimedia-4.4.3/mplayerthumbs/src/videopreview.desktop
--- old/kdemultimedia-4.4.2/mplayerthumbs/src/videopreview.desktop 2010-02-04 10:32:56.000000000 +0100
+++ new/kdemultimedia-4.4.3/mplayerthumbs/src/videopreview.desktop 2010-04-29 21:57:02.000000000 +0200
@@ -14,6 +14,7 @@
Name[es]=Archivos de vídeo (MPlayerThumbs)
Name[et]=Videofailid (MPlayerThumbs)
Name[fr]=Fichiers vidéo (MPlayerThumbs)
+Name[ga]=Comhaid Fhíse (MPlayerThumbs)
Name[gl]=Ficheiros de vídeo (MPlayerThumbs)
Name[hu]=Videófájlok (MPlayerThumbs)
Name[is]=Vídeóskrár (MPlayerThumbs)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org