Hello community,
here is the log from the commit of package kdemultimedia4
checked in at Mon Jan 21 00:57:27 CET 2008.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2008-01-05 19:44:29.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2008-01-20 16:38:44.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Jan 20 10:11:36 CET 2008 - stbinner@suse.de
+
+- update KDE_4_0_BRANCH.diff
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.W11045/_old 2008-01-21 00:57:21.000000000 +0100
+++ /var/tmp/diff_new_pack.W11045/_new 2008-01-21 00:57:21.000000000 +0100
@@ -18,7 +18,7 @@
Summary: kdemultimedia base package
Url: http://www.kde.org
Version: 4.0
-Release: 1
+Release: 6
%define rversion 4.0.0
Source0: kdemultimedia-%rversion.tar.bz2
Source1: _upstream
@@ -325,59 +325,61 @@
%doc COPYING COPYING-DOCS README
%changelog
-* Sat Jan 05 2008 - stbinner@suse.de
+* Sun Jan 20 2008 stbinner@suse.de
+- update KDE_4_0_BRANCH.diff
+* Sat Jan 05 2008 stbinner@suse.de
- update to 4.0 release
-* Wed Jan 02 2008 - stbinner@suse.de
+* Wed Jan 02 2008 stbinner@suse.de
- update to 3.97.2
-* Sun Dec 16 2007 - dmueller@suse.de
+* Sun Dec 16 2007 dmueller@suse.de
- update to 3.97.1
-* Wed Dec 05 2007 - dmueller@suse.de
+* Wed Dec 05 2007 dmueller@suse.de
- update to 3.97.0
-* Tue Dec 04 2007 - dmueller@suse.de
+* Tue Dec 04 2007 dmueller@suse.de
- update to 3.96.3
-* Wed Nov 28 2007 - dmueller@suse.de
+* Wed Nov 28 2007 dmueller@suse.de
- update to 3.96.2
-* Wed Nov 21 2007 - dmueller@suse.de
+* Wed Nov 21 2007 dmueller@suse.de
- update to 3.96.1
-* Wed Nov 14 2007 - dmueller@suse.de
+* Wed Nov 14 2007 dmueller@suse.de
- update to 3.96.0
-* Wed Nov 07 2007 - dmueller@suse.de
+* Wed Nov 07 2007 dmueller@suse.de
- update to 3.95.2
-* Thu Nov 01 2007 - dmueller@suse.de
+* Thu Nov 01 2007 dmueller@suse.de
- update to 3.95.1
-* Fri Oct 26 2007 - dmueller@suse.de
+* Fri Oct 26 2007 dmueller@suse.de
- update to KDE 4.0 beta4
-* Sat Oct 20 2007 - dmueller@suse.de
+* Sat Oct 20 2007 dmueller@suse.de
- update to 3.94.1
-* Tue Oct 09 2007 - dmueller@suse.de
+* Tue Oct 09 2007 dmueller@suse.de
- update to KDE 4.0 Beta3
-* Tue Oct 02 2007 - stbinner@suse.de
+* Tue Oct 02 2007 stbinner@suse.de
- update to 3.93.0.svn720130
-* Wed Sep 26 2007 - stbinner@suse.de
+* Wed Sep 26 2007 stbinner@suse.de
- update to 3.93.0.svn717255
-* Thu Sep 13 2007 - stbinner@suse.de
+* Thu Sep 13 2007 stbinner@suse.de
- update to 3.93.0.svn712059
-* Sat Sep 01 2007 - stbinner@suse.de
+* Sat Sep 01 2007 stbinner@suse.de
- update to KDE 4.0 Beta 2
-* Thu Aug 23 2007 - stbinner@suse.de
+* Thu Aug 23 2007 stbinner@suse.de
- update to 3.92.0.svn703910
-* Thu Aug 16 2007 - stbinner@suse.de
+* Thu Aug 16 2007 stbinner@suse.de
- update to 3.92.0.svn700761
-* Thu Aug 09 2007 - stbinner@suse.de
+* Thu Aug 09 2007 stbinner@suse.de
- update to 3.92.0.svn697375
-* Sun Jul 29 2007 - stbinner@suse.de
+* Sun Jul 29 2007 stbinner@suse.de
- update to KDE 4.0 Beta 1
-* Thu Jul 12 2007 - stbinner@suse.de
+* Thu Jul 12 2007 stbinner@suse.de
- update to 3.91.0.svn685969
-* Sat Jun 23 2007 - stbinner@suse.de
+* Sat Jun 23 2007 stbinner@suse.de
- update to 3.90.1.svn679140
-* Wed Jun 13 2007 - stbinner@suse.de
+* Wed Jun 13 2007 stbinner@suse.de
- disable build of Noatun's splitplaylist (#276925)
-* Fri Jun 08 2007 - stbinner@suse.de
+* Fri Jun 08 2007 stbinner@suse.de
- update to 3.90.1.svn670093
-* Fri Jun 01 2007 - coolo@suse.de
+* Fri Jun 01 2007 coolo@suse.de
- simplify spec file by using macros from kde4-filesystem
-* Fri May 25 2007 - stbinner@suse.de
+* Fri May 25 2007 stbinner@suse.de
- split off -devel package
-* Fri May 18 2007 - stbinner@suse.de
+* Fri May 18 2007 stbinner@suse.de
- initial version in abuild
++++++ 4_0_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.W11045/_old 2008-01-21 00:57:21.000000000 +0100
+++ /var/tmp/diff_new_pack.W11045/_new 2008-01-21 00:57:21.000000000 +0100
@@ -1,9 +1,9 @@
package: kdemultimedia-4.0.0.tar.bz2
kdemod: kdemultimedia
-current HEAD: 759076
+current HEAD: 763700
svn di between /tags/KDE/4.0.0 and /branches/KDE//branches/KDE/4.0
---- juk/cache.cpp (revision 759077)
-+++ juk/cache.cpp (revision 759077)
+--- juk/cache.cpp
++++ juk/cache.cpp
@@ -2,6 +2,9 @@
begin : Sat Sep 7 2002
copyright : (C) 2002 - 2004 by Scott Wheeler
@@ -334,8 +334,8 @@
break;
}
}
---- juk/playlistbox.cpp (revision 759077)
-+++ juk/playlistbox.cpp (revision 759077)
+--- juk/playlistbox.cpp
++++ juk/playlistbox.cpp
@@ -265,7 +265,10 @@
void PlaylistBox::removePlaylist(Playlist *playlist)
@@ -348,8 +348,8 @@
removeFileFromDict(playlist->fileName());
m_playlistDict.remove(playlist);
}
---- juk/dynamicplaylist.h (revision 759077)
-+++ juk/dynamicplaylist.h (revision 759077)
+--- juk/dynamicplaylist.h
++++ juk/dynamicplaylist.h
@@ -34,7 +34,7 @@
DynamicPlaylist(const PlaylistList &lists,
PlaylistCollection *collection,
@@ -359,8 +359,57 @@
bool setupPlaylist = true,
bool synchronizePlaying = false);
---- juk/playlist.cpp (revision 759077)
-+++ juk/playlist.cpp (revision 759077)
+--- juk/systemtray.cpp
++++ juk/systemtray.cpp
+@@ -5,7 +5,7 @@
+ copyright : (C) 2002 - 2004 by Scott Wheeler
+ email : wheeler@kde.org
+
+- copyright : (C) 2004 - 2007 by Michael Pyne
++ copyright : (C) 2004 - 2008 by Michael Pyne
+ email : michael.pyne@kdemail.net
+ ***************************************************************************/
+
+@@ -337,10 +337,7 @@
+ m_fade = true;
+ m_step = 0;
+
+-#ifdef __GNUC__
+-#warning FIXME: this will not be associated with the systray any longer
+-#endif
+- m_popup = new PassiveInfo(0);
++ m_popup = new PassiveInfo(parentWidget());
+ connect(m_popup, SIGNAL(destroyed()), SLOT(slotPopupDestroyed()));
+ connect(m_popup, SIGNAL(timeExpired()), SLOT(slotFadeOut()));
+
+@@ -389,6 +386,7 @@
+ m_fadeTimer->start(1500 / STEPS);
+
+ m_popup->setView(box);
++ m_popup->moveNear(geometry());
+ m_popup->show();
+ }
+
+@@ -397,9 +395,6 @@
+ // The following code was nicked from kpassivepopup.cpp
+ #ifdef Q_WS_X11
+
+-#ifdef __GNUC__
+-#warning the systray is no longer a widget
+-#endif
+ NETWinInfo ni(QX11Info::display(), /* winId() */ 0, QX11Info::appRootWindow(),
+ NET::WMIconGeometry );
+ NETRect frame, win;
+@@ -476,6 +471,7 @@
+ {
+ QPushButton *coverButton = new QPushButton(parent);
+
++ coverButton->setIconSize(cover.size());
+ coverButton->setIcon(cover);
+ coverButton->setFixedSize(cover.size());
+ coverButton->setFlat(true);
+--- juk/playlist.cpp
++++ juk/playlist.cpp
@@ -2,6 +2,9 @@
begin : Sat Feb 16 2002
copyright : (C) 2002 - 2004 by Scott Wheeler
@@ -379,6 +428,26 @@
#include
#include
+@@ -254,7 +258,7 @@
+ KConfigGroup config(KGlobal::config(), "PlaylistShared");
+
+ bool resizeColumnsManually = config.readEntry("ResizeColumnsManually", false);
+- action<KToggleAction>("resizeColumnsManually")->setChecked(resizeColumnsManually);
++ action("resizeColumnsManually")->setChecked(resizeColumnsManually);
+
+ // Preallocate spaces so we don't need to check later.
+ m_columnsVisible.fill(true, PlaylistItem::lastColumn() + 1);
+@@ -278,8 +282,8 @@
+ // Convert the int list into a bool list.
+
+ m_columnsVisible.fill(false);
+- foreach(int column, l)
+- m_columnsVisible[column] = true;
++ for(int i = 0; i < l.size() && i < m_columnsVisible.size(); ++i)
++ m_columnsVisible[i] = bool(l[i]);
+ }
+
+ m_inlineCompletion = KGlobalSettings::Completion(
@@ -406,7 +410,7 @@
setup();
@@ -420,8 +489,8 @@
}
void Playlist::viewportPaintEvent(QPaintEvent *pe)
---- juk/upcomingplaylist.cpp (revision 759077)
-+++ juk/upcomingplaylist.cpp (revision 759077)
+--- juk/upcomingplaylist.cpp
++++ juk/upcomingplaylist.cpp
@@ -1,6 +1,6 @@
/***************************************************************************
begin : Thu Aug 19 2004
@@ -448,8 +517,8 @@
newItem = p.createItem(FileHandle(fileName), newItem, false);
}
---- juk/searchplaylist.cpp (revision 759077)
-+++ juk/searchplaylist.cpp (revision 759077)
+--- juk/searchplaylist.cpp
++++ juk/searchplaylist.cpp
@@ -14,6 +14,7 @@
***************************************************************************/
@@ -468,8 +537,8 @@
p.setName(name);
p.setPlaylistSearch(search, false);
---- juk/juk-exception.h (revision 0)
-+++ juk/juk-exception.h (revision 759077)
+--- juk/juk-exception.h
++++ juk/juk-exception.h
@@ -0,0 +1,37 @@
+/***************************************************************************
+ begin : Tue Jan 08 2008
@@ -508,8 +577,8 @@
+#endif /* JUK_EXCEPTION_H */
+
+// vim: set et sw=4 tw=0 sta:
---- juk/playlist.h (revision 759077)
-+++ juk/playlist.h (revision 759077)
+--- juk/playlist.h
++++ juk/playlist.h
@@ -54,11 +54,11 @@
public:
@@ -525,8 +594,8 @@
/**
* This constructor should generally only be used either by the cache
---- juk/viewmode.cpp (revision 759077)
-+++ juk/viewmode.cpp (revision 759077)
+--- juk/viewmode.cpp
++++ juk/viewmode.cpp
@@ -387,7 +387,7 @@
PlaylistSearch s(playlists, components, PlaylistSearch::MatchAny, false);
@@ -536,8 +605,8 @@
m_treeViewItems.insert(itemKey, p);
}
}
---- juk/playlistsearch.cpp (revision 759077)
-+++ juk/playlistsearch.cpp (revision 759077)
+--- juk/playlistsearch.cpp
++++ juk/playlistsearch.cpp
@@ -17,6 +17,7 @@
#include "playlist.h"
#include "playlistitem.h"
@@ -556,8 +625,18 @@
if(patternSearch)
c = PlaylistSearch::Component(QRegExp(pattern), columns);
else
---- juk/historyplaylist.cpp (revision 759077)
-+++ juk/historyplaylist.cpp (revision 759077)
+--- juk/systemtray.h
++++ juk/systemtray.h
+@@ -47,6 +47,7 @@
+ Q_OBJECT
+ public:
+ PassiveInfo(QWidget *parent = 0);
++ using KPassivePopup::moveNear;
+
+ public slots:
+ void setTimeout(int delay);
+--- juk/historyplaylist.cpp
++++ juk/historyplaylist.cpp
@@ -16,6 +16,7 @@
#include "historyplaylist.h"
#include "collectionlist.h"
@@ -576,8 +655,8 @@
after = p.createItem(FileHandle(fileName), after, false);
after->setDateTime(dateTime);
}
---- juk/main.cpp (revision 759077)
-+++ juk/main.cpp (revision 759077)
+--- juk/main.cpp
++++ juk/main.cpp
@@ -44,8 +44,8 @@
int main(int argc, char *argv[])
{
@@ -589,8 +668,8 @@
"http://developer.kde.org/~wheeler/juk.html");
aboutData.addAuthor(ki18n("Scott Wheeler"), ki18n(scott), "wheeler@kde.org");
---- juk/cache.h (revision 759077)
-+++ juk/cache.h (revision 759077)
+--- juk/cache.h
++++ juk/cache.h
@@ -44,7 +44,9 @@
void load();
@@ -602,8 +681,45 @@
};
/**
---- juk/folderplaylist.cpp (revision 759077)
-+++ juk/folderplaylist.cpp (revision 759077)
+--- juk/covermanager.cpp
++++ juk/covermanager.cpp
+@@ -371,7 +371,7 @@
+ return QPixmap();
+
+ if(size == Thumbnail)
+- pix->scaled(80, 80, Qt::KeepAspectRatio, Qt::SmoothTransformation);
++ *pix = pix->scaled(80, 80, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+
+ QPixmap returnValue = *pix; // Save it early.
+
+--- juk/playlistcollection.cpp
++++ juk/playlistcollection.cpp
+@@ -835,8 +835,10 @@
+ {
+ KConfigGroup config(KGlobal::config(), "Playlists");
+ config.writeEntry("ImportPlaylists", m_importPlaylists);
+- config.writeEntry("showUpcoming", action<KToggleAction>("showUpcoming")->isChecked());
++ config.writeEntry("showUpcoming", action("showUpcoming")->isChecked());
+ config.writePathEntry("DirectoryList", m_folderList);
++
++ config.sync();
+ }
+
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -924,9 +926,9 @@
+ actions()->addAction("showUpcoming", upcomingAction);
+ upcomingAction->setCheckedState(KGuiItem(i18n("Hide &Play Queue")));
+
+- connect(historyAction, SIGNAL(toggled(bool)),
++ connect(historyAction, SIGNAL(triggered(bool)),
+ this, SLOT(slotSetHistoryPlaylistEnabled(bool)));
+- connect(upcomingAction, SIGNAL(toggled(bool)),
++ connect(upcomingAction, SIGNAL(triggered(bool)),
+ this, SLOT(slotSetUpcomingPlaylistEnabled(bool)));
+ }
+
+--- juk/folderplaylist.cpp
++++ juk/folderplaylist.cpp
@@ -14,6 +14,7 @@
#include "folderplaylist.h"
@@ -622,8 +738,129 @@
p.setFolder(folder);
p.setName(name);
return s;
---- kioslave/audiocd/plugins/lame/encoderlame.cpp (revision 759077)
-+++ kioslave/audiocd/plugins/lame/encoderlame.cpp (revision 759077)
+--- kmix/dialogselectmaster.cpp
++++ kmix/dialogselectmaster.cpp
+@@ -62,6 +62,7 @@
+ m_mainFrame = new QFrame( this );
+ setMainWidget( m_mainFrame );
+ _layout = new QVBoxLayout(m_mainFrame);
++ _layout->setMargin(0);
+
+ if ( Mixer::mixers().count() > 1 ) {
+ // More than one Mixer => show Combo-Box to select Mixer
+--- kmix/viewsliders.cpp
++++ kmix/viewsliders.cpp
+@@ -93,9 +93,9 @@
+ // add a separator before the device
+ QFrame *_frm = new QFrame(this);
+ if ( orientation == Qt::Vertical)
+- _frm->setFrameStyle(QFrame::VLine | QFrame::Raised);
++ _frm->setFrameStyle(QFrame::VLine | QFrame::Sunken);
+ else
+- _frm->setFrameStyle(QFrame::HLine | QFrame::Raised);
++ _frm->setFrameStyle(QFrame::HLine | QFrame::Sunken);
+ _separators.insert(md->id(),_frm);
+ _layoutSliders->addWidget(_frm);
+ mdw = new MDWSlider(
+@@ -190,8 +190,10 @@
+ int bottomPartExtent = 0;
+ for ( int i=0; i<_mdws.count(); i++ ) {
+ MDWSlider* mdw = ::qobject_cast(_mdws[i]);
+- if ( mdw && mdw->playbackExtentHint() > topPartExtent ) topPartExtent = mdw->playbackExtentHint();
+- if ( mdw && mdw->playbackExtentHint() > bottomPartExtent ) bottomPartExtent = mdw->playbackExtentHint();
++ if ( mdw && mdw->isVisibleTo(this) ) {
++ if ( mdw->playbackExtentHint() > topPartExtent ) topPartExtent = mdw->playbackExtentHint();
++ if ( mdw->captureExtentHint() > bottomPartExtent ) bottomPartExtent = mdw->captureExtentHint();
++ }
+ }
+ //kDebug(67100) << "topPartExtent is " << topPartExtent;
+ bool firstVisibleControlFound = false;
+--- kmix/mdwslider.cpp
++++ kmix/mdwslider.cpp
+@@ -49,6 +49,8 @@
+ #include "ksmallslider.h"
+ #include "verticaltext.h"
+
++static const int MIN_SLIDER_SIZE = 150;
++
+ /**
+ * MixDeviceWidget that represents a single mix device, inlcuding PopUp, muteLED, ...
+ *
+@@ -169,9 +171,13 @@
+ if ( _orientation == Qt::Vertical )
+ if ( playbackExtentHint() < extent )
+ m_playbackSpacer->setFixedHeight(extent-playbackExtentHint());
++ else
++ m_playbackSpacer->setFixedHeight(0);
+ else
+ if ( playbackExtentHint() < extent )
+ m_playbackSpacer->setFixedWidth(extent-playbackExtentHint());
++ else
++ m_playbackSpacer->setFixedWidth(0);
+ }
+ }
+
+@@ -198,11 +204,15 @@
+ m_defaultLabelSpacer->setFixedHeight(extent);
+ if ( captureExtentHint() < extent )
+ m_captureSpacer->setFixedHeight(extent-captureExtentHint());
++ else
++ m_captureSpacer->setFixedHeight(0);
+ }
+ else {
+ m_defaultLabelSpacer->setFixedWidth(extent);
+ if ( captureExtentHint() < extent )
+ m_captureSpacer->setFixedWidth(extent-captureExtentHint());
++ else
++ m_captureSpacer->setFixedWidth(0);
+ }
+ }
+
+@@ -459,6 +469,13 @@
+ sliderBig->setMaximum(maxvol);
+ sliderBig->setPageStep(maxvol/10);
+ sliderBig->setValue(maxvol - vol.getVolume( chid ));
++
++ if ( _orientation == Qt::Vertical ) {
++ sliderBig->setMinimumHeight( MIN_SLIDER_SIZE );
++ }
++ else {
++ sliderBig->setMinimumWidth( MIN_SLIDER_SIZE );
++ }
+ } // not small
+
+ slider->installEventFilter( this );
+--- kmix/kmixprefdlg.cpp
++++ kmix/kmixprefdlg.cpp
+@@ -47,6 +47,7 @@
+ setMainWidget( m_generalTab );
+
+ QBoxLayout *layout = new QVBoxLayout( m_generalTab );
++ layout->setMargin( 0 );
+ layout->setSpacing( KDialog::spacingHint() );
+
+ // -----------------------------------------------------------
+--- kmix/dialogviewconfiguration.cpp
++++ kmix/dialogviewconfiguration.cpp
+@@ -50,6 +50,8 @@
+
+ // The _layout will hold two items: The title and the scrollarea
+ _layout = new QVBoxLayout(frame );
++ _layout->setMargin( 0 );
++ _layout->setSpacing(KDialog::spacingHint());
+
+ // --- HEADER ---
+ // kDebug(67100) << "DialogViewConfiguration::DialogViewConfiguration add header" << "\n";
+@@ -59,7 +61,6 @@
+ QScrollArea* scrollArea = new QScrollArea(frame);
+ scrollArea->setWidgetResizable(true); // avoid unnecesary scrollbars
+ scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+- _layout->addSpacing(KDialog::spacingHint());
+ _layout->addWidget(scrollArea);
+
+ vboxForScrollView = new QWidget();
+--- kioslave/audiocd/plugins/lame/encoderlame.cpp
++++ kioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -27,11 +27,13 @@
#else
#ifdef HAVE_MACHINE_ENDIAN_H
@@ -643,8 +880,9 @@
Property changes on: .
___________________________________________________________________
-Deleted: svn:mergeinfo
-Added: svn:externals
+Name: svn:mergeinfo
+ -
+Name: svn:externals
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org