packages (AMAROK_1_4): amarok/amarok.spec, amarok/gcc44.patch (NEW) - add g...

[glen]

Author: glen                         Date: Tue Aug 25 11:24:55 2009 GMT
Module: packages                      Tag: AMAROK_1_4
---- Log message:
- add gcc 4.4 fixes

---- Files affected:
packages/amarok:
   amarok.spec (1.200.2.2 -> 1.200.2.3) , gcc44.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/amarok/amarok.spec
diff -u packages/amarok/amarok.spec:1.200.2.2 packages/amarok/amarok.spec:1.200.2.3
--- packages/amarok/amarok.spec:1.200.2.2	Tue Aug 25 10:50:43 2009
+++ packages/amarok/amarok.spec	Tue Aug 25 13:24:49 2009
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 # TODO:
+# - create branch diff from http://gitorious.org/amarok/history
 # - postgresql support alongside mysql
 # - NMM audio backend support (fix build - propably some BRs)
 # - make descriptions less useless
@@ -44,6 +45,7 @@
 Patch8:		%{name}-mongrel.patch
 Patch9:		%{name}-libmtp.patch
 Patch10:	kde-am.patch
+Patch11:	gcc44.patch
 URL:		http://amarok.kde.org/
 # Upgrade to 2.0.1.1 required?
 # http://www.trapkit.de/advisories/TKADV2009-002.txt
@@ -207,6 +209,7 @@
 %patch8 -p1
 %patch9 -p0
 %patch10 -p1
+%patch11 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
 	amarok/src/amarok.desktop \
@@ -453,6 +456,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200.2.3  2009/08/25 11:24:49  glen
+- add gcc 4.4 fixes
+
 Revision 1.200.2.2  2009/08/25 08:50:43  glen
 - add automake 1.11 patch
 

================================================================
Index: packages/amarok/gcc44.patch
diff -u /dev/null packages/amarok/gcc44.patch:1.1.2.1
--- /dev/null	Tue Aug 25 13:24:55 2009
+++ packages/amarok/gcc44.patch	Tue Aug 25 13:24:50 2009
@@ -0,0 +1,81 @@
+--- amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp~	2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp	2009-08-25 11:50:14.668118723 +0300
+@@ -30,6 +30,7 @@
+ #include "taglib_audiblefile.h"
+ 
+ #include <netinet/in.h> // ntohl
++#include <stdio.h>
+ 
+ using namespace TagLib;
+ 
+--- amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp~	2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp	2009-08-25 12:53:07.754187761 +0300
+@@ -30,6 +30,7 @@
+ #include <netinet/in.h> // ntohl
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdio.h>
+ 
+ using namespace TagLib;
+ 
+--- amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp~	2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp	2009-08-25 12:53:28.640852317 +0300
+@@ -28,6 +28,7 @@
+ #include "audibletag.h"
+ #include <taglib/tfile.h>
+ #include <taglib/audioproperties.h>
++#include <stdio.h>
+ 
+ namespace TagLib {
+ ////////////////////////////////////////////////////////////////////////////////
+--- amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp~	2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2009-08-25 12:53:51.247534605 +0300
+@@ -23,6 +23,7 @@
+ #include "taglib_audiblefile.h"
+ 
+ #include <string.h>
++#include <stdio.h>
+ 
+ TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
+         bool readProperties,
+--- amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp~	2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp	2009-08-25 14:04:26.540843298 +0300
+@@ -30,6 +30,7 @@
+ #include "wavfile.h"
+ 
+ #include <netinet/in.h> // ntohl
++#include <stdio.h>
+ 
+ using namespace TagLib;
+ 
+--- amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp~	2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp	2009-08-25 14:04:56.930423357 +0300
+@@ -28,6 +28,7 @@
+ #include <taglib/tfile.h>
+ #include <taglib/audioproperties.h>
+ #include <taglib/tag.h>
++#include <stdio.h>
+ 
+ namespace TagLib {
+ ////////////////////////////////////////////////////////////////////////////////
+--- amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp~	2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2009-08-25 14:05:21.403755033 +0300
+@@ -23,6 +23,7 @@
+ #include "wavfile.h"
+ 
+ #include <string.h>
++#include <stdio.h>
+ 
+ TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
+         bool readProperties,
+--- amarok-1.4.10/amarok/src/metabundlesaver.cpp~	2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10/amarok/src/metabundlesaver.cpp	2009-08-25 14:17:52.697012773 +0300
+@@ -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>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.200.2.2&r2=1.200.2.3&f=u