[rpms/amarok] epel10.2: fix build issue against gcc-4.4

[rpms/amarok] epel10.2: fix build issue against gcc-4.4

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : c82afe204ad74d6fbb0a25a95a58b723a40e3aee
Author : Than Ngo <than@fedoraproject.org>
Date   : 2009-02-24T22:15:29+00:00
Stats  : +78/-36 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/c82afe204ad74d6fbb0a25a95a58b723a40e3aee?branch=epel10.2

Log:
fix build issue against gcc-4.4

---
diff --git a/amarok-2.0.1.1-gcc44.patch b/amarok-2.0.1.1-gcc44.patch
index 0d015b0..764a9ec 100644
--- a/amarok-2.0.1.1-gcc44.patch
+++ b/amarok-2.0.1.1-gcc44.patch
@@ -1,31 +1,83 @@
-diff -up amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.orig amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp
---- amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.orig	2009-02-24 14:59:01.000000000 +0100
-+++ amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp	2009-02-24 14:59:52.000000000 +0100
-@@ -22,6 +22,7 @@
-  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
-  *   MA  02110-1301  USA                                                   *
-  ***************************************************************************/
+diff -up amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig amarok-2.0.1.1/src/metadata/audible/audibletag.cpp
+--- amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig	2009-02-24 17:53:43.000000000 +0100
++++ amarok-2.0.1.1/src/metadata/audible/audibletag.cpp	2009-02-24 17:54:03.000000000 +0100
+@@ -25,6 +25,7 @@
+ 
+ #include "audibletag.h"
+ 
 +#include <cstdio>
+ #include <tag.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff -up amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp.orig amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp
+--- amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp.orig	2009-02-24 18:22:41.000000000 +0100
++++ amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp	2009-02-24 18:23:05.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include "audibletag.h"
+ #include "../tfile_helper.h"
+ #include <audioproperties.h>
++#include <cstdio>
+ #include <string.h>
  
- #include "audibleproperties.h"
+ namespace TagLib {
+diff -up amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
+--- amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig	2009-02-24 18:23:44.000000000 +0100
++++ amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2009-02-24 18:23:57.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include "taglib_audiblefiletyperesolver.h"
+ #include "taglib_audiblefile.h"
  
-diff -up amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig amarok-2.0.1.1/src/metadata/audible/audibletag.cpp
-diff -up amarok-2.0.1.1/src/metadata/audible/audibletag.h.orig amarok-2.0.1.1/src/metadata/audible/audibletag.h
---- amarok-2.0.1.1/src/metadata/audible/audibletag.h.orig	2009-02-24 15:02:20.000000000 +0100
-+++ amarok-2.0.1.1/src/metadata/audible/audibletag.h	2009-02-24 15:02:41.000000000 +0100
-@@ -27,7 +27,7 @@
- #define TAGLIB_AUDIBLETAG_H
++#include <cstdio>
+ #include <string.h>
  
- #include <config-amarok.h>  
--
+ TagLib::File *AudibleFileTypeResolver::createFile(TagLib::FileName fileName,
+diff -up amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfile.cpp
+--- amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig	2009-02-24 18:24:38.000000000 +0100
++++ amarok-2.0.1.1/src/metadata/wav/wavfile.cpp	2009-02-24 18:25:01.000000000 +0100
+@@ -27,6 +27,7 @@
+ 
+ #include "../tfile_helper.h"
+ #include <audioproperties.h>
 +#include <cstdio>
  #include <tag.h>
  
  namespace TagLib {
-diff -up amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfile.cpp
-diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.orig amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h
---- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.orig	2009-02-24 14:39:35.000000000 +0100
-+++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h	2009-02-24 14:39:51.000000000 +0100
+diff -up amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp
+--- amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp.orig	2009-02-24 18:26:23.000000000 +0100
++++ amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp	2009-02-24 18:26:36.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include "wavfiletyperesolver.h"
+ #include "wavfile.h"
+ 
++#include <cstdio>
+ #include <string.h>
+ 
+ TagLib::File *WavFileTypeResolver::createFile(TagLib::FileName fileName,
+diff -up amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp
+--- amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp.orig	2009-02-24 18:25:40.000000000 +0100
++++ amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp	2009-02-24 18:25:52.000000000 +0100
+@@ -25,6 +25,7 @@
+ 
+ #include "wavproperties.h"
+ 
++#include <cstdio>
+ #include <tstring.h>
+ #include <stdint.h>
+ 
+diff -up amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.gcc4 amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp
+--- amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.gcc4	2009-01-06 13:49:08.000000000 +0100
++++ amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp	2009-02-24 16:33:55.000000000 +0100
+@@ -22,6 +22,7 @@
+  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+  *   MA  02110-1301  USA                                                   *
+  ***************************************************************************/
++#include <cstdio>
+ 
+ #include "audibleproperties.h"
+ 
+diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.gcc4 amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h
+--- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.gcc4	2009-02-24 16:41:44.000000000 +0100
++++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h	2009-02-24 16:42:48.000000000 +0100
 @@ -15,6 +15,7 @@
  #ifndef PP_INTERNAL_H
  #define PP_INTERNAL_H
@@ -34,21 +86,9 @@ diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-inter
  #include <algorithm>
  
  namespace rpp {
-diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-macro-expander.h.orig amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-macro-expander.h
---- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-macro-expander.h.orig	2009-02-24 15:05:53.000000000 +0100
-+++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-macro-expander.h	2009-02-24 15:06:08.000000000 +0100
-@@ -15,6 +15,8 @@
- #ifndef PP_MACRO_EXPANDER_H
- #define PP_MACRO_EXPANDER_H
- 
-+#include <cstdio>
-+
- namespace rpp {
- 
- struct pp_frame
-diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.orig amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp
---- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.orig	2009-02-24 14:38:14.000000000 +0100
-+++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp	2009-02-24 14:38:47.000000000 +0100
+diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.gcc4 amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp
+--- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.gcc4	2009-01-06 13:50:11.000000000 +0100
++++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp	2009-02-24 16:33:55.000000000 +0100
 @@ -14,6 +14,7 @@
  
  #include "preprocessor.h"

diff --git a/amarok.spec b/amarok.spec
index 263e906..046490d 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -63,7 +63,9 @@ mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
-
+pushd src/scriptengine/generator/generator
+./generate.sh
+popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 

[rpms/amarok] epel10.2: fix build issue against gcc-4.4

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : a5dad4556cab54554aa6fa5d4398879906795a39
Author : Than Ngo <than@fedoraproject.org>
Date   : 2009-02-25T15:56:56+00:00
Stats  : +0/-3 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/a5dad4556cab54554aa6fa5d4398879906795a39?branch=epel10.2

Log:
fix build issue against gcc-4.4

---
diff --git a/amarok.spec b/amarok.spec
index 046490d..b5fa5e1 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -63,9 +63,6 @@ mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
-pushd src/scriptengine/generator/generator
-./generate.sh
-popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 

[rpms/amarok] epel10.2: fix build issue against gcc-4.4

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 388b764f84c723cfb23dfb1331dd293d4997e321
Author : Than Ngo <than@fedoraproject.org>
Date   : 2009-02-24T14:19:09+00:00
Stats  : +43/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/388b764f84c723cfb23dfb1331dd293d4997e321?branch=epel10.2

Log:
fix build issue against gcc-4.4

---
diff --git a/amarok-2.0.1.1-gcc44.patch b/amarok-2.0.1.1-gcc44.patch
index 673a4ad..0d015b0 100644
--- a/amarok-2.0.1.1-gcc44.patch
+++ b/amarok-2.0.1.1-gcc44.patch
@@ -1,3 +1,28 @@
+diff -up amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.orig amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp
+--- amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.orig	2009-02-24 14:59:01.000000000 +0100
++++ amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp	2009-02-24 14:59:52.000000000 +0100
+@@ -22,6 +22,7 @@
+  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+  *   MA  02110-1301  USA                                                   *
+  ***************************************************************************/
++#include <cstdio>
+ 
+ #include "audibleproperties.h"
+ 
+diff -up amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig amarok-2.0.1.1/src/metadata/audible/audibletag.cpp
+diff -up amarok-2.0.1.1/src/metadata/audible/audibletag.h.orig amarok-2.0.1.1/src/metadata/audible/audibletag.h
+--- amarok-2.0.1.1/src/metadata/audible/audibletag.h.orig	2009-02-24 15:02:20.000000000 +0100
++++ amarok-2.0.1.1/src/metadata/audible/audibletag.h	2009-02-24 15:02:41.000000000 +0100
+@@ -27,7 +27,7 @@
+ #define TAGLIB_AUDIBLETAG_H
+ 
+ #include <config-amarok.h>  
+-
++#include <cstdio>
+ #include <tag.h>
+ 
+ namespace TagLib {
+diff -up amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfile.cpp
 diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.orig amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h
 --- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.orig	2009-02-24 14:39:35.000000000 +0100
 +++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h	2009-02-24 14:39:51.000000000 +0100
@@ -9,6 +34,18 @@ diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-inter
  #include <algorithm>
  
  namespace rpp {
+diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-macro-expander.h.orig amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-macro-expander.h
+--- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-macro-expander.h.orig	2009-02-24 15:05:53.000000000 +0100
++++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-macro-expander.h	2009-02-24 15:06:08.000000000 +0100
+@@ -15,6 +15,8 @@
+ #ifndef PP_MACRO_EXPANDER_H
+ #define PP_MACRO_EXPANDER_H
+ 
++#include <cstdio>
++
+ namespace rpp {
+ 
+ struct pp_frame
 diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.orig amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp
 --- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.orig	2009-02-24 14:38:14.000000000 +0100
 +++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp	2009-02-24 14:38:47.000000000 +0100

diff --git a/amarok.spec b/amarok.spec
index d72a95b..263e906 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # From amarok svn, r871433 (Note that this was reverted later, I believe the
 # reasoning for reverting was incorrect. -- tmz :)
 Patch0:  amarok-libgpod-0.7.0.patch
+Patch1:  amarok-2.0.1.1-gcc44.patch
 
 Patch100: amarok-2.0.1.1-qt45.patch
 
@@ -52,6 +53,7 @@ Amarok is a multimedia player with:
 %prep
 %setup -q
 %patch0 -p0 -b .libgpod-0.7.0
+%patch1 -p1 -b .gcc4
 
 %patch100 -p0 -b .qt45
 
@@ -120,6 +122,9 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %changelog
+* Tue Feb 24 2009 Than Ngo <than@redhat.com> 2.0.1.1-6
+- fix build issue against gcc-4.4
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

[rpms/amarok] epel10.2: fix build issue against gcc-4.4

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : c33223d6755a467fe06e4083b71e2df5ac1210bb
Author : Than Ngo <than@fedoraproject.org>
Date   : 2009-02-24T13:44:30+00:00
Stats  : +22/-0 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/c33223d6755a467fe06e4083b71e2df5ac1210bb?branch=epel10.2

Log:
fix build issue against gcc-4.4

---
diff --git a/amarok-2.0.1.1-gcc44.patch b/amarok-2.0.1.1-gcc44.patch
new file mode 100644
index 0000000..673a4ad
--- /dev/null
+++ b/amarok-2.0.1.1-gcc44.patch
@@ -0,0 +1,22 @@
+diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.orig amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h
+--- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.orig	2009-02-24 14:39:35.000000000 +0100
++++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h	2009-02-24 14:39:51.000000000 +0100
+@@ -15,6 +15,7 @@
+ #ifndef PP_INTERNAL_H
+ #define PP_INTERNAL_H
+ 
++#include <cstdio>
+ #include <algorithm>
+ 
+ namespace rpp {
+diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.orig amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp
+--- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.orig	2009-02-24 14:38:14.000000000 +0100
++++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp	2009-02-24 14:38:47.000000000 +0100
+@@ -14,6 +14,7 @@
+ 
+ #include "preprocessor.h"
+ 
++#include <cstdio>
+ #include <string>
+ 
+ // register callback for include hooks