rpms/amarok/devel amarok-2.0.1.1-gcc44.patch, 1.2, 1.3 amarok.spec, 1.135, 1.136
Than Ngo
than at fedoraproject.org
Tue Feb 24 22:16:00 UTC 2009
Author: than
Update of /cvs/extras/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7712
Modified Files:
amarok-2.0.1.1-gcc44.patch amarok.spec
Log Message:
fix build issue against gcc-4.4
amarok-2.0.1.1-gcc44.patch:
Index: amarok-2.0.1.1-gcc44.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok-2.0.1.1-gcc44.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amarok-2.0.1.1-gcc44.patch 24 Feb 2009 14:19:09 -0000 1.2
+++ amarok-2.0.1.1-gcc44.patch 24 Feb 2009 22:15:29 -0000 1.3
@@ -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 @@
#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"
Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- amarok.spec 24 Feb 2009 13:44:30 -0000 1.135
+++ amarok.spec 24 Feb 2009 22:15:29 -0000 1.136
@@ -63,7 +63,9 @@
pushd %{_target_platform}
%{cmake_kde4} ..
popd
-
+pushd src/scriptengine/generator/generator
+./generate.sh
+popd
make %{?_smp_mflags} -C %{_target_platform}
More information about the fedora-extras-commits
mailing list