diff options
| author | makc <makc@FreeBSD.org> | 2013-02-06 20:19:37 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-02-06 20:19:37 +0800 |
| commit | 6eed2bb80646b07065c27658e4ae4f2cfc37ec7d (patch) | |
| tree | 1e758a4cf828ccbd669c76cfea1cec46bf5f0e66 /audio | |
| parent | 95f5f217ab37faf2d23f9e88bf09116d72fce043 (diff) | |
| download | freebsd-ports-gnome-6eed2bb80646b07065c27658e4ae4f2cfc37ec7d.tar.gz freebsd-ports-gnome-6eed2bb80646b07065c27658e4ae4f2cfc37ec7d.tar.zst freebsd-ports-gnome-6eed2bb80646b07065c27658e4ae4f2cfc37ec7d.zip | |
Add upstream patch to fix build with clang
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/amarok-kde4/files/patch-git_e3738dc | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/audio/amarok-kde4/files/patch-git_e3738dc b/audio/amarok-kde4/files/patch-git_e3738dc new file mode 100644 index 000000000000..45f961336ce3 --- /dev/null +++ b/audio/amarok-kde4/files/patch-git_e3738dc @@ -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 |