Sat Jan 29 21:36:10 2011 UTC ()
Fix build with gcc4.3


(markd)
diff -r1.1.1.1 -r1.2 pkgsrc/audio/amarok-kde3/distinfo
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-ae
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-af
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-ag
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-ah
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-ai
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-aj
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-ak
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-al

cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/amarok-kde3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/amarok-kde3/Attic/distinfo 2010/02/16 08:59:12 1.1.1.1
+++ pkgsrc/audio/amarok-kde3/Attic/distinfo 2011/01/29 21:36:10 1.2
@@ -1,9 +1,17 @@ @@ -1,9 +1,17 @@
1$NetBSD: distinfo,v 1.1.1.1 2010/02/16 08:59:12 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2011/01/29 21:36:10 markd Exp $
2 2
3SHA1 (amarok-1.4.10.tar.bz2) = cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd 3SHA1 (amarok-1.4.10.tar.bz2) = cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd
4RMD160 (amarok-1.4.10.tar.bz2) = f86c71dd0459e0cf1ff586cd6de240ca6501cf62 4RMD160 (amarok-1.4.10.tar.bz2) = f86c71dd0459e0cf1ff586cd6de240ca6501cf62
5Size (amarok-1.4.10.tar.bz2) = 12812583 bytes 5Size (amarok-1.4.10.tar.bz2) = 12812583 bytes
6SHA1 (patch-aa) = 53316f334f45a8a4780ae71061d528374a75cb5a 6SHA1 (patch-aa) = 53316f334f45a8a4780ae71061d528374a75cb5a
7SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf 7SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf
8SHA1 (patch-ac) = ea6900aafc3cd99069ac59929ae14296662d095f 8SHA1 (patch-ac) = ea6900aafc3cd99069ac59929ae14296662d095f
9SHA1 (patch-ad) = eea8105897ce4cd9d4a086430ec0588125b3517b 9SHA1 (patch-ad) = eea8105897ce4cd9d4a086430ec0588125b3517b
 10SHA1 (patch-ae) = ceeccf0eaa9091bd2422354abdf98c34f8a9802b
 11SHA1 (patch-af) = 4c9f82603e8209ce1f598749b3d81dfaf8df5f46
 12SHA1 (patch-ag) = 7d3353973722af565b37d47e4dac360bee2e25bc
 13SHA1 (patch-ah) = 9feed2c659c7c543ddd25568c79e3f853b1bb8e8
 14SHA1 (patch-ai) = 8afc89b7511971012d2335d1032dc99fbc8df32c
 15SHA1 (patch-aj) = 667768476d217c78540368e450ca6048fa86d931
 16SHA1 (patch-ak) = cc0b3d773af3441d99a0b3a5327ca694a0961d56
 17SHA1 (patch-al) = f7cf6ade2fcdd4993287bde82cf41231dbb5b512

File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.1 2011/01/29 21:36:10 markd Exp $

fix build with gcc4.5

--- amarok/src/osd.h.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/osd.h
@@ -37,7 +37,7 @@ class OSDWidget : public QWidget
 
       public slots:
         /** calls setText() then show(), after setting image if needed */
-        void show( const QString &text, QImage newImage = QImage::QImage() );
+        void show( const QString &text, QImage newImage = QImage() );
         void ratingChanged( const short rating );
         void ratingChanged( const QString& path, int rating );
         void volChanged( unsigned char volume );

File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-af
$NetBSD: patch-af,v 1.1 2011/01/29 21:36:10 markd Exp $

fix build with gcc4.3

--- amarok/src/metadata/audible/taglib_audiblefile.h.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/metadata/audible/taglib_audiblefile.h
@@ -29,6 +29,7 @@
 #include <taglib/tfile.h>
 #include "audibleproperties.h"
 #include "audibletag.h"
+#include <cstdio>
 
 namespace TagLib { 
 

File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-ag
$NetBSD: patch-ag,v 1.1 2011/01/29 21:36:10 markd Exp $

include <string.h> for strcmp()

--- amarok/src/metadata/mp4/mp4properties.cpp.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/metadata/mp4/mp4properties.cpp
@@ -23,6 +23,7 @@ email                : andrew.leadbetter
 
 
 #include <tstring.h>
+#include <string.h>
 
 #include <config.h>
 #ifdef HAVE_SYSTEMS_H

File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-ah
$NetBSD: patch-ah,v 1.1 2011/01/29 21:36:10 markd Exp $

fix build with gcc4.3

--- amarok/src/metadata/mp4/mp4tag.cpp.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/metadata/mp4/mp4tag.cpp
@@ -24,6 +24,7 @@ email                : andrew.leadbetter
 
 #include <tag.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 using namespace TagLib;
 

File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-ai
$NetBSD: patch-ai,v 1.1 2011/01/29 21:36:10 markd Exp $

fix build with gcc4.3

--- amarok/src/metadata/mp4/mp4file.cpp.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/metadata/mp4/mp4file.cpp
@@ -30,6 +30,7 @@ email                : aumuell@reserv.at
 #include <audioproperties.h>
 
 #include <stdint.h>
+#include <stdlib.h>
 
 #define MP4V2_HAS_WRITE_BUG 1
 

File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-aj
$NetBSD: patch-aj,v 1.1 2011/01/29 21:36:10 markd Exp $

fix build with gcc4.3

--- amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
@@ -24,6 +24,7 @@
 
 #include "taglib_mp4filetyperesolver.h"
 #include "mp4file.h"
+#include <string.h>
 
 TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
         bool readProperties,

File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.1 2011/01/29 21:36:10 markd Exp $

fix build with gcc4.3

--- amarok/src/metadata/wav/wavfile.h.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/metadata/wav/wavfile.h
@@ -28,6 +28,7 @@
 
 #include <taglib/tfile.h>
 #include "wavproperties.h"
+#include <cstdio>
 
 namespace TagLib { 
 

File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-al
$NetBSD: patch-al,v 1.1 2011/01/29 21:36:10 markd Exp $

fix build with gcc4.3

--- amarok/src/metabundlesaver.cpp.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/metabundlesaver.cpp
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdio.h>
+#include <cstdio>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>