rpms/amarok/F-9 amarok-1.4.10-gcc44.patch, NONE, 1.1 amarok.spec, 1.118, 1.119

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30015

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.10-gcc44.patch 
Log Message:
gcc44 patch


amarok-1.4.10-gcc44.patch:

--- NEW FILE amarok-1.4.10-gcc44.patch ---
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp	2009-03-31 22:12:29.000000000 -0600
@@ -31,6 +31,8 @@
 
 #include <netinet/in.h> // ntohl
 
+#include <stdio.h>
+
 using namespace TagLib;
 
 
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp	2009-03-31 22:08:16.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp	2009-03-31 22:11:57.000000000 -0600
@@ -30,6 +30,7 @@
 #include <netinet/in.h> // ntohl
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 using namespace TagLib;
 
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp	2009-03-31 22:13:06.000000000 -0600
@@ -29,6 +29,8 @@
 #include <taglib/tfile.h>
 #include <taglib/audioproperties.h>
 
+#include <stdio.h>
+
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
 // public members
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2009-03-31 22:16:01.000000000 -0600
@@ -23,6 +23,7 @@
 #include "taglib_audiblefile.h"
 
 #include <string.h>
+#include <stdio.h>
 
 TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
         bool readProperties,
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp	2009-03-31 22:18:22.000000000 -0600
@@ -29,6 +29,8 @@
 #include <taglib/audioproperties.h>
 #include <taglib/tag.h>
 
+#include <stdio.h>
+
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
 // public members
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp	2009-03-31 22:18:06.000000000 -0600
@@ -31,6 +31,8 @@
 
 #include <netinet/in.h> // ntohl
 
+#include <stdio.h>
+
 using namespace TagLib;
 
 struct WavHeader
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2009-03-31 22:19:55.000000000 -0600
@@ -23,6 +23,7 @@
 #include "wavfile.h"
 
 #include <string.h>
+#include <stdio.h>
 
 TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
         bool readProperties,
diff -Naur amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp amarok-1.4.10/amarok/src/metabundlesaver.cpp
--- amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metabundlesaver.cpp	2009-03-31 22:30:30.000000000 -0600
@@ -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>


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-9/amarok.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- amarok.spec	14 Apr 2009 14:13:46 -0000	1.118
+++ amarok.spec	16 Apr 2009 16:38:28 -0000	1.119
@@ -49,6 +49,7 @@
 Patch2:     amarok-1.4.7-xdg.patch
 # Fix for newer libmtp >= 0.3
 Patch3:     amarok-1.4.10-libmtp03.patch 
+Patch4:     amarok-1.4.10-gcc44.patch
 
 ## upstream patches
 # security backport: http://websvn.kde.org/?view=rev&revision=908415
@@ -159,6 +160,8 @@
 %patch3 -p1 -b .libmtp03
 %endif
 
+%patch4 -p1 -b .gcc44
+
 %patch100 -p4 -b .aa_security
 %patch101 -p1 -b .wikipedia