svn commit: r311761 - head/audio/amarok-kde4/files

[Max Brazhnikov]

Author: makc
Date: Wed Feb  6 12:19:37 2013
New Revision: 311761
URL: http://svnweb.freebsd.org/changeset/ports/311761

Log:
  Add upstream patch to fix build with clang

Added:
  head/audio/amarok-kde4/files/
  head/audio/amarok-kde4/files/patch-git_e3738dc   (contents, props changed)

Added: head/audio/amarok-kde4/files/patch-git_e3738dc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/amarok-kde4/files/patch-git_e3738dc	Wed Feb  6 12:19:37 2013	(r311761)
@@ -0,0 +1,64 @@
+--- ./src/core-impl/collections/support/MemoryMeta.h.orig	2013-01-17 13:53:55.000000000 +0100
++++ ./src/core-impl/collections/support/MemoryMeta.h	2013-02-06 02:39:05.627835135 +0100
+@@ -63,8 +63,8 @@
+     public:
+         Artist( const QString &name ) : MemoryMeta::Base( name ) {}
+ 
+-        virtual QString name() const { return Base::name(); }
+-        virtual Meta::TrackList tracks() { return Base::tracks(); }
++        virtual QString name() const { return MemoryMeta::Base::name(); }
++        virtual Meta::TrackList tracks() { return MemoryMeta::Base::tracks(); }
+ };
+ 
+ class Album : public Meta::Album, public Base
+@@ -87,7 +87,7 @@
+         virtual Capabilities::Capability* createCapabilityInterface( Capabilities::Capability::Type type );
+ 
+         /* Meta::Base virtual methods */
+-        virtual QString name() const { return Base::name(); }
++        virtual QString name() const { return MemoryMeta::Base::name(); }
+ 
+         /* Meta::Album virtual methods */
+         virtual bool isCompilation() const { return m_isCompilation; }
+@@ -96,7 +96,7 @@
+ 
+         virtual bool hasAlbumArtist() const { return !m_albumArtist.isNull(); }
+         virtual Meta::ArtistPtr albumArtist() const { return m_albumArtist; }
+-        virtual Meta::TrackList tracks() { return Base::tracks(); }
++        virtual Meta::TrackList tracks() { return MemoryMeta::Base::tracks(); }
+ 
+         virtual bool hasImage( int /* size */ = 0 ) const { return !m_image.isNull(); }
+         virtual QImage image( int size = 0 ) const;
+@@ -124,8 +124,8 @@
+     public:
+         Composer( const QString &name ) : MemoryMeta::Base( name ) {}
+ 
+-        virtual QString name() const { return Base::name(); }
+-        virtual Meta::TrackList tracks() { return Base::tracks(); }
++        virtual QString name() const { return MemoryMeta::Base::name(); }
++        virtual Meta::TrackList tracks() { return  MemoryMeta::Base::tracks(); }
+ };
+ 
+ class Genre : public Meta::Genre, public Base
+@@ -133,8 +133,8 @@
+     public:
+         Genre( const QString &name ) : MemoryMeta::Base( name ) {}
+ 
+-        virtual QString name() const { return Base::name(); }
+-        virtual Meta::TrackList tracks() { return Base::tracks(); }
++        virtual QString name() const { return MemoryMeta::Base::name(); }
++        virtual Meta::TrackList tracks() { return MemoryMeta::Base::tracks(); }
+ };
+ 
+ class Year : public Meta::Year, public Base
+@@ -142,8 +142,8 @@
+     public:
+         Year( const QString &name ) : MemoryMeta::Base( name ) {}
+ 
+-        virtual QString name() const { return Base::name(); }
+-        virtual Meta::TrackList tracks() { return Base::tracks(); }
++        virtual QString name() const { return MemoryMeta::Base::name(); }
++        virtual Meta::TrackList tracks() { return MemoryMeta::Base::tracks(); }
+ };
+ 
+ class AMAROK_EXPORT Track : public Meta::Track