Hello community, here is the log from the commit of package kdemultimedia4 for openSUSE:Factory checked in at Wed Jun 8 17:26:20 CEST 2011.
-------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2011-04-28 16:15:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2011-06-03 15:37:52.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 3 15:37:49 CEST 2011 - [email protected] + +- update to 4.6.4 + * Bugfixes over KDE 4.6.3 + * see http://kde.org/announcements/changelogs/changelog4_6_3to4_6_4.php for details + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdemultimedia-4.6.3.tar.bz2 New: ---- kdemultimedia-4.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.f53fUR/_old 2011-06-08 17:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.f53fUR/_new 2011-06-08 17:25:59.000000000 +0200 @@ -34,7 +34,7 @@ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org -Version: 4.6.3 +Version: 4.6.4 Release: 1 Source0: kdemultimedia-%version.tar.bz2 Patch0: 4_6_BRANCH.diff ++++++ kdemultimedia-4.6.3.tar.bz2 -> kdemultimedia-4.6.4.tar.bz2 ++++++ Files old/kdemultimedia-4.6.3/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.6.4/doc/dragonplayer/index.cache.bz2 differ Files old/kdemultimedia-4.6.3/doc/juk/index.cache.bz2 and new/kdemultimedia-4.6.4/doc/juk/index.cache.bz2 differ Files old/kdemultimedia-4.6.3/doc/kcontrol/cddbretrieval/index.cache.bz2 and new/kdemultimedia-4.6.4/doc/kcontrol/cddbretrieval/index.cache.bz2 differ Files old/kdemultimedia-4.6.3/doc/kioslave/audiocd/index.cache.bz2 and new/kdemultimedia-4.6.4/doc/kioslave/audiocd/index.cache.bz2 differ Files old/kdemultimedia-4.6.3/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.6.4/doc/kmix/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.6.3/juk/collectionlist.cpp new/kdemultimedia-4.6.4/juk/collectionlist.cpp --- old/kdemultimedia-4.6.3/juk/collectionlist.cpp 2011-01-19 23:23:21.000000000 +0100 +++ new/kdemultimedia-4.6.4/juk/collectionlist.cpp 2011-06-02 12:04:33.000000000 +0200 @@ -403,10 +403,10 @@ } int newWidth = width(listView()->fontMetrics(), listView(), i); - data()->cachedWidths[i] = newWidth; - if(newWidth != data()->cachedWidths[i]) playlist()->slotWeightDirty(i); + + data()->cachedWidths[i] = newWidth; } if(listView()->isVisible()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.6.3/juk/main.cpp new/kdemultimedia-4.6.4/juk/main.cpp --- old/kdemultimedia-4.6.3/juk/main.cpp 2011-04-28 15:30:54.000000000 +0200 +++ new/kdemultimedia-4.6.4/juk/main.cpp 2011-06-02 12:04:33.000000000 +0200 @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("juk", 0, ki18n("JuK"), - "3.6.1", ki18n(description), KAboutData::License_GPL, + "3.6.2", ki18n(description), KAboutData::License_GPL, ki18n("© 2002 - 2010, Scott Wheeler"), KLocalizedString(), "http://developer.kde.org/~wheeler/juk.html";); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.6.3/juk/playlist.cpp new/kdemultimedia-4.6.4/juk/playlist.cpp --- old/kdemultimedia-4.6.3/juk/playlist.cpp 2011-01-19 23:23:21.000000000 +0100 +++ new/kdemultimedia-4.6.4/juk/playlist.cpp 2011-06-02 12:04:33.000000000 +0200 @@ -1325,8 +1325,9 @@ int Playlist::addColumn(const QString &label, int) { - slotWeightDirty(columns()); - return K3ListView::addColumn(label, 30); + int newIndex = K3ListView::addColumn(label, 30); + slotWeightDirty(newIndex); + return newIndex; } PlaylistItem *Playlist::createItem(const FileHandle &file, @@ -1550,7 +1551,7 @@ QAction *showAction; for(int i = 0; i < header()->count(); ++i) { - if(i == PlaylistItem::FileNameColumn) + if(i - columnOffset() == PlaylistItem::FileNameColumn) m_headerMenu->addSeparator(); showAction = new QAction(header()->label(i), m_headerMenu); @@ -1827,11 +1828,22 @@ foreach(PlaylistItem *item, l) { cachedWidth = item->cachedWidths(); - foreach(int column, m_weightDirty) - averageWidth[column] += std::pow(double(cachedWidth[column]), 2.0) / itemCount; + + // Extra columns start at 0, but those weights aren't shared with all + // items. + for(int i = 0; i < columnOffset(); ++i) { + averageWidth[i] += + std::pow(double(item->width(fontMetrics(), this, i)), 2.0) / itemCount; + } + + for(int column = columnOffset(); column < columns(); ++column) { + averageWidth[column] += + std::pow(double(cachedWidth[column - columnOffset()]), 2.0) / itemCount; + } } - m_columnWeights.fill(-1, columns()); + if(m_columnWeights.isEmpty()) + m_columnWeights.fill(-1, columns()); foreach(int column, m_weightDirty) { m_columnWeights[column] = int(std::sqrt(averageWidth[column]) + 0.5); @@ -2330,7 +2342,9 @@ else showColumn(column); - SharedSettings::instance()->toggleColumnVisible(column - columnOffset()); + if(column >= columnOffset()) { + SharedSettings::instance()->toggleColumnVisible(column - columnOffset()); + } } void Playlist::slotCreateGroup() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.6.3/juk/playlistcollection.cpp new/kdemultimedia-4.6.4/juk/playlistcollection.cpp --- old/kdemultimedia-4.6.3/juk/playlistcollection.cpp 2011-01-19 23:23:21.000000000 +0100 +++ new/kdemultimedia-4.6.4/juk/playlistcollection.cpp 2011-06-02 12:04:33.000000000 +0200 @@ -184,9 +184,11 @@ { if(m_dynamicPlaylist) m_dynamicPlaylist->setPlaylists(playlists); - else + else { m_dynamicPlaylist = new DynamicPlaylist(playlists, this, i18n("Dynamic List"), "audio-midi", false, true); + PlaylistCollection::setupPlaylist(m_dynamicPlaylist, QString()); + } PlaylistCollection::raise(m_dynamicPlaylist); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.6.3/juk/playlistsplitter.cpp new/kdemultimedia-4.6.4/juk/playlistsplitter.cpp --- old/kdemultimedia-4.6.3/juk/playlistsplitter.cpp 2011-01-19 23:23:21.000000000 +0100 +++ new/kdemultimedia-4.6.4/juk/playlistsplitter.cpp 2011-06-02 12:04:33.000000000 +0200 @@ -70,6 +70,11 @@ { saveConfig(); + // TagEditor needs to write its configuration out while it's still valid, + // destroy it now. + + delete m_editor; + // NowPlaying depends on the PlaylistCollection, so kill it now. delete m_nowPlaying; m_nowPlaying = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.6.3/kioslave/audiocd/data/audiocd.desktop new/kdemultimedia-4.6.4/kioslave/audiocd/data/audiocd.desktop --- old/kdemultimedia-4.6.3/kioslave/audiocd/data/audiocd.desktop 2011-04-01 12:59:18.000000000 +0200 +++ new/kdemultimedia-4.6.4/kioslave/audiocd/data/audiocd.desktop 2011-06-02 12:04:33.000000000 +0200 @@ -51,7 +51,7 @@ Name[sv]=Bläddra ljud-cd Name[th]=เรียกดูซีดีเสียง Name[tr]=Ses CDsi Tarayıcı -Name[uk]=Навігатор аудіо КД +Name[uk]=Навігатор аудіо-КД Name[wa]=Foyteuse des plakes lazer odio Name[x-test]=xxAudio CD Browserxx Name[zh_CN]=音频 CD 浏览器 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
