[amarok/el5] Cover Patch
Keiran Smith
affix at fedoraproject.org
Sun Mar 18 22:49:17 UTC 2012
commit 92aaee5345c13fdd39e8628e231b06aaddc255f2
Author: Keiran Smith <affix at affix.me>
Date: Sun Mar 18 22:48:35 2012 +0000
Cover Patch
amarok-1.4.10-coverfetcher.patch | 53 +++++++++++++++++++------------------
amarok.spec | 5 +++-
2 files changed, 31 insertions(+), 27 deletions(-)
---
diff --git a/amarok-1.4.10-coverfetcher.patch b/amarok-1.4.10-coverfetcher.patch
index c591c01..1913499 100644
--- a/amarok-1.4.10-coverfetcher.patch
+++ b/amarok-1.4.10-coverfetcher.patch
@@ -1,5 +1,5 @@
-diff -urN amarok-1.4.10/amarok/src/Makefile.am.coverfetcher amarok-1.4.10/amarok/src/Makefile.am
---- amarok-1.4.10/amarok/src/Makefile.am.coverfetcher 2009-08-22 11:38:19.885762485 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/Makefile.am amarok-1.4.10/amarok/src/Makefile.am
+--- amarok-1.4.10.orig/amarok/src/Makefile.am 2009-08-22 11:38:19.885762485 -0400
+++ amarok-1.4.10/amarok/src/Makefile.am 2009-08-22 13:22:31.982159988 -0400
@@ -125,7 +125,6 @@
podcastsettingsbase.ui \
@@ -9,8 +9,8 @@ diff -urN amarok-1.4.10/amarok/src/Makefile.am.coverfetcher amarok-1.4.10/amarok
scancontroller.cpp \
scriptmanager.cpp \
scriptmanagerbase.ui \
-diff -urN amarok-1.4.10/amarok/src/Makefile.in.coverfetcher amarok-1.4.10/amarok/src/Makefile.in
---- amarok-1.4.10/amarok/src/Makefile.in.coverfetcher 2009-08-22 11:38:19.885762485 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/Makefile.in amarok-1.4.10/amarok/src/Makefile.in
+--- amarok-1.4.10.orig/amarok/src/Makefile.in 2009-08-22 11:38:19.885762485 -0400
+++ amarok-1.4.10/amarok/src/Makefile.in 2009-08-22 13:23:46.073894860 -0400
@@ -95,7 +95,7 @@
playlistbrowseritem.lo playlistitem.lo playlistloader.lo \
@@ -119,8 +119,8 @@ diff -urN amarok-1.4.10/amarok/src/Makefile.in.coverfetcher amarok-1.4.10/amarok
browserbar.o: browserbar.moc
$(srcdir)/mediadevicemanager.cpp: Options1.h Options2.h Options4.h Options5.h Options7.h Options8.h dbsetup.h deletedialogbase.h firstrunwizard.h newdynamic.h organizecollectiondialog.h podcastsettingsbase.h scriptmanagerbase.h tagdialogbase.h tagguesserconfigdialog.h trackpickerdialogbase.h
$(srcdir)/playlistbrowseritem.cpp: Options1.h Options2.h Options4.h Options5.h Options7.h Options8.h dbsetup.h deletedialogbase.h firstrunwizard.h newdynamic.h organizecollectiondialog.h podcastsettingsbase.h scriptmanagerbase.h tagdialogbase.h tagguesserconfigdialog.h trackpickerdialogbase.h
-diff -urN amarok-1.4.10/amarok/src/app.cpp.coverfetcher amarok-1.4.10/amarok/src/app.cpp
---- amarok-1.4.10/amarok/src/app.cpp.coverfetcher 2009-08-22 11:38:20.442735663 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/app.cpp amarok-1.4.10/amarok/src/app.cpp
+--- amarok-1.4.10.orig/amarok/src/app.cpp 2009-08-22 11:38:20.442735663 -0400
+++ amarok-1.4.10/amarok/src/app.cpp 2009-08-22 13:22:21.017638995 -0400
@@ -41,7 +41,6 @@
#include "playlistbrowser.h"
@@ -130,8 +130,8 @@ diff -urN amarok-1.4.10/amarok/src/app.cpp.coverfetcher amarok-1.4.10/amarok/src
#include "scriptmanager.h"
#include "scrobbler.h"
#include "statusbar.h"
-diff -urN amarok-1.4.10/amarok/src/collectionbrowser.cpp.coverfetcher amarok-1.4.10/amarok/src/collectionbrowser.cpp
---- amarok-1.4.10/amarok/src/collectionbrowser.cpp.coverfetcher 2009-08-22 11:38:19.648775016 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/collectionbrowser.cpp amarok-1.4.10/amarok/src/collectionbrowser.cpp
+--- amarok-1.4.10.orig/amarok/src/collectionbrowser.cpp 2009-08-22 11:38:19.648775016 -0400
+++ amarok-1.4.10/amarok/src/collectionbrowser.cpp 2009-08-22 13:49:11.268351838 -0400
@@ -1471,7 +1471,7 @@
@@ -142,8 +142,8 @@ diff -urN amarok-1.4.10/amarok/src/collectionbrowser.cpp.coverfetcher amarok-1.4
#ifndef AMAZON_SUPPORT
menu.setItemEnabled( FETCH, false );
#endif
-diff -urN amarok-1.4.10/amarok/src/collectiondb.cpp.coverfetcher amarok-1.4.10/amarok/src/collectiondb.cpp
---- amarok-1.4.10/amarok/src/collectiondb.cpp.coverfetcher 2009-08-22 11:38:20.439736108 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/collectiondb.cpp amarok-1.4.10/amarok/src/collectiondb.cpp
+--- amarok-1.4.10.orig/amarok/src/collectiondb.cpp 2009-08-22 11:38:20.439736108 -0400
+++ amarok-1.4.10/amarok/src/collectiondb.cpp 2009-08-22 13:44:46.547974864 -0400
@@ -1029,13 +1029,6 @@
void
@@ -323,8 +323,8 @@ diff -urN amarok-1.4.10/amarok/src/collectiondb.cpp.coverfetcher amarok-1.4.10/a
query( "INSERT INTO lyrics SELECT * FROM lyrics_fix;" );
query( "INSERT INTO playlists SELECT * FROM playlists_fix;" );
}
-diff -urN amarok-1.4.10/amarok/src/collectiondb.h.coverfetcher amarok-1.4.10/amarok/src/collectiondb.h
---- amarok-1.4.10/amarok/src/collectiondb.h.coverfetcher 2009-08-22 11:38:19.663776347 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/collectiondb.h amarok-1.4.10/amarok/src/collectiondb.h
+--- amarok-1.4.10.orig/amarok/src/collectiondb.h 2009-08-22 11:38:19.663776347 -0400
+++ amarok-1.4.10/amarok/src/collectiondb.h 2009-08-22 12:37:54.798174576 -0400
@@ -434,7 +434,7 @@
/** Saves images located on the user's filesystem */
@@ -347,8 +347,8 @@ diff -urN amarok-1.4.10/amarok/src/collectiondb.h.coverfetcher amarok-1.4.10/ama
DbConnection::DbConnectionType getDbConnectionType() const { return m_dbConnType; }
bool isConnected();
void releasePreviousConnection(QThread *currThread);
-diff -urN amarok-1.4.10/amarok/src/contextbrowser.cpp.coverfetcher amarok-1.4.10/amarok/src/contextbrowser.cpp
---- amarok-1.4.10/amarok/src/contextbrowser.cpp.coverfetcher 2009-08-22 11:38:20.437735462 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/contextbrowser.cpp amarok-1.4.10/amarok/src/contextbrowser.cpp
+--- amarok-1.4.10.orig/amarok/src/contextbrowser.cpp 2009-08-22 11:38:20.437735462 -0400
+++ amarok-1.4.10/amarok/src/contextbrowser.cpp 2009-08-22 13:51:47.817348629 -0400
@@ -175,9 +175,9 @@
QString albumImageTooltip( const QString &albumImage, int size )
@@ -388,8 +388,8 @@ diff -urN amarok-1.4.10/amarok/src/contextbrowser.cpp.coverfetcher amarok-1.4.10
/* open konqueror with musicbrainz search result for artist-album */
else if ( url.protocol() == "musicbrainz" )
{
-diff -urN amarok-1.4.10/amarok/src/coverfetcher.cpp.coverfetcher amarok-1.4.10/amarok/src/coverfetcher.cpp
---- amarok-1.4.10/amarok/src/coverfetcher.cpp.coverfetcher 2009-08-22 11:38:20.561728744 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/coverfetcher.cpp amarok-1.4.10/amarok/src/coverfetcher.cpp
+--- amarok-1.4.10.orig/amarok/src/coverfetcher.cpp 2009-08-22 11:38:20.561728744 -0400
+++ amarok-1.4.10/amarok/src/coverfetcher.cpp 2009-08-22 14:24:39.841020123 -0400
@@ -17,6 +17,7 @@
#include <qlabel.h>
@@ -786,8 +786,8 @@ diff -urN amarok-1.4.10/amarok/src/coverfetcher.cpp.coverfetcher amarok-1.4.10/a
m_coverUrls.clear();
m_coverNames.clear();
break;
-diff -urN amarok-1.4.10/amarok/src/coverfetcher.h.coverfetcher amarok-1.4.10/amarok/src/coverfetcher.h
---- amarok-1.4.10/amarok/src/coverfetcher.h.coverfetcher 2009-08-22 11:38:19.643818604 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/coverfetcher.h amarok-1.4.10/amarok/src/coverfetcher.h
+--- amarok-1.4.10.orig/amarok/src/coverfetcher.h 2009-08-22 11:38:19.643818604 -0400
+++ amarok-1.4.10/amarok/src/coverfetcher.h 2009-08-22 13:46:21.224819113 -0400
@@ -56,17 +56,11 @@
@@ -839,8 +839,8 @@ diff -urN amarok-1.4.10/amarok/src/coverfetcher.h.coverfetcher amarok-1.4.10/ama
/// The fetch failed, finish up and log an error message
void finishWithError( const QString &message, KIO::Job *job = 0 );
-diff -urN amarok-1.4.10/amarok/src/covermanager.cpp.coverfetcher amarok-1.4.10/amarok/src/covermanager.cpp
---- amarok-1.4.10/amarok/src/covermanager.cpp.coverfetcher 2009-08-22 11:38:19.646776054 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/covermanager.cpp amarok-1.4.10/amarok/src/covermanager.cpp
+--- amarok-1.4.10.orig/amarok/src/covermanager.cpp 2009-08-22 11:38:19.646776054 -0400
+++ amarok-1.4.10/amarok/src/covermanager.cpp 2009-08-22 13:48:38.643794369 -0400
@@ -163,29 +163,11 @@
m_viewMenu->setItemChecked( AllAlbums, true );
@@ -919,8 +919,8 @@ diff -urN amarok-1.4.10/amarok/src/covermanager.cpp.coverfetcher amarok-1.4.10/a
void CoverManager::coverFetched( const QString &artist, const QString &album ) //SLOT
{
-diff -urN amarok-1.4.10/amarok/src/covermanager.h.coverfetcher amarok-1.4.10/amarok/src/covermanager.h
---- amarok-1.4.10/amarok/src/covermanager.h.coverfetcher 2009-08-22 11:38:20.558728891 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/covermanager.h amarok-1.4.10/amarok/src/covermanager.h
+--- amarok-1.4.10.orig/amarok/src/covermanager.h 2009-08-22 11:38:20.558728891 -0400
+++ amarok-1.4.10/amarok/src/covermanager.h 2009-08-22 13:48:49.188329042 -0400
@@ -42,13 +42,8 @@
@@ -948,8 +948,8 @@ diff -urN amarok-1.4.10/amarok/src/covermanager.h.coverfetcher amarok-1.4.10/ama
int m_currentView;
//status bar widgets
-diff -urN amarok-1.4.10/amarok/src/refreshimages.cpp.coverfetcher amarok-1.4.10/amarok/src/refreshimages.cpp
---- amarok-1.4.10/amarok/src/refreshimages.cpp.coverfetcher 2009-08-22 11:38:19.643818604 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/refreshimages.cpp amarok-1.4.10/amarok/src/refreshimages.cpp
+--- amarok-1.4.10.orig/amarok/src/refreshimages.cpp 2009-08-22 11:38:19.643818604 -0400
+++ amarok-1.4.10/amarok/src/refreshimages.cpp 1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-// (c) 2005 Ian Monroe <ian at monroe.nu>
@@ -1115,8 +1115,8 @@ diff -urN amarok-1.4.10/amarok/src/refreshimages.cpp.coverfetcher amarok-1.4.10/
-}
-
-#include "refreshimages.moc"
-diff -urN amarok-1.4.10/amarok/src/refreshimages.h.coverfetcher amarok-1.4.10/amarok/src/refreshimages.h
---- amarok-1.4.10/amarok/src/refreshimages.h.coverfetcher 2009-08-22 11:38:19.644775619 -0400
+diff -urN amarok-1.4.10.orig/amarok/src/refreshimages.h amarok-1.4.10/amarok/src/refreshimages.h
+--- amarok-1.4.10.orig/amarok/src/refreshimages.h 2009-08-22 11:38:19.644775619 -0400
+++ amarok-1.4.10/amarok/src/refreshimages.h 1969-12-31 19:00:00.000000000 -0500
@@ -1,38 +0,0 @@
-// (c) 2005 Ian Monroe <ian at monroe.nu>
@@ -1157,3 +1157,4 @@ diff -urN amarok-1.4.10/amarok/src/refreshimages.h.coverfetcher amarok-1.4.10/am
- QMap<QString, JobInfo> m_jobInfo;
-};
-#endif
+
diff --git a/amarok.spec b/amarok.spec
index 346f190..550d575 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -34,7 +34,7 @@ Name: amarok
%endif
Summary: Media player
Version: 1.4.10
-Release: 7.%{snap}svn%{?dist}
+Release: 8.%{snap}svn%{?dist}
Group: Applications/Multimedia
License: GPLv2+
@@ -334,6 +334,9 @@ rm -fr $RPM_BUILD_ROOT
%changelog
+* Mon Nov 09 2009 Keiran "Affix" Smith <fedora at affix.me> - 1.4.10-8.20090624
+- Fix coverfetcher patch (#523071)
+
* Mon Nov 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-7.20090624
- updated wikipedia patch too (#523071)
More information about the scm-commits
mailing list