Update to 2.8.0.

Submitted by:	jpaetzel@ via the KDE on FreeBSD mailing list

3 files changed, 19 insertions, 76 deletions

diff --git a/audio/amarok-kde4/files/patch-git_e3738dc b/audio/amarok-kde4/files/patch-git_e3738dc
deleted file mode 100644
index 45f961336ce3..000000000000
--- a/audio/amarok-kde4/files/patch-git_e3738dc
+++ /dev/null
@@ -1,64 +0,0 @@
---- ./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
diff --git a/audio/amarok-kde4/files/patch-src-playlistgenerator-constraints-PlaylistFileSize.cpp b/audio/amarok-kde4/files/patch-src-playlistgenerator-constraints-PlaylistFileSize.cpp
deleted file mode 100644
index e1149a52c9da..000000000000
--- a/audio/amarok-kde4/files/patch-src-playlistgenerator-constraints-PlaylistFileSize.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/playlistgenerator/constraints/PlaylistFileSize.cpp.orig	2013-02-06 11:59:32.000000000 +0100
-+++ src/playlistgenerator/constraints/PlaylistFileSize.cpp	2013-02-06 11:57:56.000000000 +0100
-@@ -172,7 +172,7 @@
-         case 2:
-             return static_cast<quint64>( m_size ) * static_cast<quint64>( 1000000000 );
-         case 3:
--            return static_cast<quint64>( m_size ) * static_cast<quint64>( 1000000000000 );
-+            return static_cast<quint64>( m_size ) * static_cast<quint64>( 1000000000000LL );
-         default:
-             return static_cast<quint64>( m_size ) * static_cast<quint64>( 1 );
-     }
-
diff --git a/audio/amarok-kde4/files/patch-src__musicbrainz__MusicDNSAudioDecoder.cpp b/audio/amarok-kde4/files/patch-src__musicbrainz__MusicDNSAudioDecoder.cpp
new file mode 100644
index 000000000000..047cf89654cd
--- /dev/null
+++ b/audio/amarok-kde4/files/patch-src__musicbrainz__MusicDNSAudioDecoder.cpp
@@ -0,0 +1,19 @@
+If this is not defined, libavutil/common.h fails because of this check:
+
+#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C)
+#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
+#endif
+
+Not submitted upstream, as newer releases build with -std=c++0x, which always
+sets __STD_CONSTANT_MACROS by default.
+--- src/musicbrainz/MusicDNSAudioDecoder.cpp.orig	2014-07-21 16:48:11.000000000 +0300
++++ src/musicbrainz/MusicDNSAudioDecoder.cpp	2014-07-21 16:49:04.000000000 +0300
+@@ -14,6 +14,8 @@
+  * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+  ****************************************************************************************/
+ 
++#define __STDC_CONSTANT_MACROS
++
+ #define DEBUG_PREFIX "MusicDNSAudioDecoder"
+ 
+ #include "MusicDNSAudioDecoder.h"