From owner-svn-ports-all@FreeBSD.ORG  Wed Feb  6 12:19:37 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B7D834DD;
 Wed,  6 Feb 2013 12:19:37 +0000 (UTC)
 (envelope-from makc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A09A9661;
 Wed,  6 Feb 2013 12:19:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r16CJbdV008238;
 Wed, 6 Feb 2013 12:19:37 GMT (envelope-from makc@svn.freebsd.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r16CJblc008237;
 Wed, 6 Feb 2013 12:19:37 GMT (envelope-from makc@svn.freebsd.org)
Message-Id: <201302061219.r16CJblc008237@svn.freebsd.org>
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Wed, 6 Feb 2013 12:19:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311761 - head/audio/amarok-kde4/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Feb 2013 12:19:37 -0000

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