Fix build with gcc4.3

9 files changed, 123 insertions, 1 deletions

diff --git a/audio/amarok-kde3/distinfo b/audio/amarok-kde3/distinfo
index 6ac302f4e0a..0ce930fa70c 100644
--- a/audio/amarok-kde3/distinfo
+++ b/audio/amarok-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/02/16 08:59:12 wiz Exp $
+$NetBSD: distinfo,v 1.2 2011/01/29 21:36:10 markd Exp $
 
 SHA1 (amarok-1.4.10.tar.bz2) = cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd
 RMD160 (amarok-1.4.10.tar.bz2) = f86c71dd0459e0cf1ff586cd6de240ca6501cf62
@@ -7,3 +7,11 @@ SHA1 (patch-aa) = 53316f334f45a8a4780ae71061d528374a75cb5a
 SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf
 SHA1 (patch-ac) = ea6900aafc3cd99069ac59929ae14296662d095f
 SHA1 (patch-ad) = eea8105897ce4cd9d4a086430ec0588125b3517b
+SHA1 (patch-ae) = ceeccf0eaa9091bd2422354abdf98c34f8a9802b
+SHA1 (patch-af) = 4c9f82603e8209ce1f598749b3d81dfaf8df5f46
+SHA1 (patch-ag) = 7d3353973722af565b37d47e4dac360bee2e25bc
+SHA1 (patch-ah) = 9feed2c659c7c543ddd25568c79e3f853b1bb8e8
+SHA1 (patch-ai) = 8afc89b7511971012d2335d1032dc99fbc8df32c
+SHA1 (patch-aj) = 667768476d217c78540368e450ca6048fa86d931
+SHA1 (patch-ak) = cc0b3d773af3441d99a0b3a5327ca694a0961d56
+SHA1 (patch-al) = f7cf6ade2fcdd4993287bde82cf41231dbb5b512
diff --git a/audio/amarok-kde3/patches/patch-ae b/audio/amarok-kde3/patches/patch-ae
new file mode 100644
index 00000000000..4e563825bc2
--- /dev/null
+++ b/audio/amarok-kde3/patches/patch-ae
@@ -0,0 +1,15 @@
+$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 );
diff --git a/audio/amarok-kde3/patches/patch-af b/audio/amarok-kde3/patches/patch-af
new file mode 100644
index 00000000000..8df121611b9
--- /dev/null
+++ b/audio/amarok-kde3/patches/patch-af
@@ -0,0 +1,14 @@
+$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 { 
+ 
diff --git a/audio/amarok-kde3/patches/patch-ag b/audio/amarok-kde3/patches/patch-ag
new file mode 100644
index 00000000000..48798a62127
--- /dev/null
+++ b/audio/amarok-kde3/patches/patch-ag
@@ -0,0 +1,14 @@
+$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
diff --git a/audio/amarok-kde3/patches/patch-ah b/audio/amarok-kde3/patches/patch-ah
new file mode 100644
index 00000000000..774835f6dbc
--- /dev/null
+++ b/audio/amarok-kde3/patches/patch-ah
@@ -0,0 +1,14 @@
+$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;
+ 
diff --git a/audio/amarok-kde3/patches/patch-ai b/audio/amarok-kde3/patches/patch-ai
new file mode 100644
index 00000000000..9917138649a
--- /dev/null
+++ b/audio/amarok-kde3/patches/patch-ai
@@ -0,0 +1,14 @@
+$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
+ 
diff --git a/audio/amarok-kde3/patches/patch-aj b/audio/amarok-kde3/patches/patch-aj
new file mode 100644
index 00000000000..8ad48a2b1c9
--- /dev/null
+++ b/audio/amarok-kde3/patches/patch-aj
@@ -0,0 +1,14 @@
+$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,
diff --git a/audio/amarok-kde3/patches/patch-ak b/audio/amarok-kde3/patches/patch-ak
new file mode 100644
index 00000000000..a329f990b14
--- /dev/null
+++ b/audio/amarok-kde3/patches/patch-ak
@@ -0,0 +1,14 @@
+$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 { 
+ 
diff --git a/audio/amarok-kde3/patches/patch-al b/audio/amarok-kde3/patches/patch-al
new file mode 100644
index 00000000000..0d540de02e1
--- /dev/null
+++ b/audio/amarok-kde3/patches/patch-al
@@ -0,0 +1,15 @@
+$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>