Date: Friday, January 25, 2013 @ 15:25:22
Author: andrea
Revision: 175972
Cleanup
Deleted:
amarok/trunk/amarok-2.5.0-ffmpeg-fixes.patch
amarok/trunk/contextviewfix.patch
amarok/trunk/toolbarfix.patch
---------------------------------+
amarok-2.5.0-ffmpeg-fixes.patch | 19 -----------
contextviewfix.patch | 14 --------
toolbarfix.patch | 61 --------------------------------------
3 files changed, 94 deletions(-)
Deleted: amarok-2.5.0-ffmpeg-fixes.patch
===================================================================
--- amarok-2.5.0-ffmpeg-fixes.patch 2013-01-25 14:23:37 UTC (rev 175971)
+++ amarok-2.5.0-ffmpeg-fixes.patch 2013-01-25 14:25:22 UTC (rev 175972)
@@ -1,19 +0,0 @@
-diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp
amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
---- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07
16:12:22.000000000 +0300
-+++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07
16:14:56.000000000 +0300
-@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run()
- foreach( Meta::TrackPtr track, m_tracks )
- {
- //TODO replace with "avformat_open_input" since av_open_input_file is
deprecated
-- if( av_open_input_file( &pFormatCtx, ( const char *
)track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) )
-+ if( avformat_open_input( &pFormatCtx, ( const char *
)track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) )
- {
- warning() << QLatin1String( "Unable to open input file: " ) +
track->playableUrl().toLocalFile();
- continue;
-@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run()
- }
-
-
--#include "MusicDNSAudioDecoder.moc"
-\ No newline at end of file
-+#include "MusicDNSAudioDecoder.moc"
Deleted: contextviewfix.patch
===================================================================
--- contextviewfix.patch 2013-01-25 14:23:37 UTC (rev 175971)
+++ contextviewfix.patch 2013-01-25 14:25:22 UTC (rev 175972)
@@ -1,14 +0,0 @@
-diff --git
a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-index a23305f..8fa6f9b 100644
---- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-+++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
- if(!view())
- return;
-
-- QRectF rect = view()->sceneRect();
-+ // mimic ContextView::resizeEvent(), nothing else seems to work, bug
292895
-+ QRectF rect( view()->pos(), view()->maximumViewportSize() );
- setGeometry( rect );
- m_applets->setGeometry( rect );
- m_applets->refresh();
\ No newline at end of file
Deleted: toolbarfix.patch
===================================================================
--- toolbarfix.patch 2013-01-25 14:23:37 UTC (rev 175971)
+++ toolbarfix.patch 2013-01-25 14:25:22 UTC (rev 175972)
@@ -1,61 +0,0 @@
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp
amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp 2011-12-15
08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp 2012-01-29
20:20:01.901360205 +0100
-@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P
- }
- }
-
-+void Context::AppletToolbar::setContainment( Containment * containment )
-+{
-+ m_cont = containment;
-+}
-+
-+Context::Containment *
-+Context::AppletToolbar::containment() const
-+{
-+ return m_cont;
-+}
-+
- QSizeF
- Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF
&constraint ) const
- {
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h
amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.h 2011-12-15
08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h 2012-01-29
20:17:52.414686784 +0100
-@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi
-
- void appletRemoved( Plasma::Applet* applet );
-
-+ void setContainment( Containment * containment );
-+ Containment* containment() const;
-+
- signals:
- void showApplet( Plasma::Applet* );
- void appletAddedToToolbar( Plasma::Applet* applet, int loc );
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig
-diff -rup amarok-2.5.0/src/context/ToolbarView.cpp
amarok-2.5.0.new/src/context/ToolbarView.cpp
---- amarok-2.5.0/src/context/ToolbarView.cpp 2011-12-15 08:36:48.000000000
+0100
-+++ amarok-2.5.0.new/src/context/ToolbarView.cpp 2012-01-29
20:17:52.394686782 +0100
-@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm
- setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-
- // now we create the toolbar
-- m_toolbar = new AppletToolbar( containment );
-+ m_toolbar = new AppletToolbar(0);
-+ scene->addItem(m_toolbar.data());
-+ m_toolbar.data()->setContainment( qobject_cast<Context::Containment
*>(containment) );
- m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
- m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
-
-@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm
-
- Context::ToolbarView::~ToolbarView()
- {
--
-+ delete m_toolbar.data();
- }
-
- void
-Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig
