summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-07-18 15:48:13 +0000
committerRichard Purdie <richard@openedhand.com>2008-07-18 15:48:13 +0000
commitac757c10da72b390d88f2724d329e0b0b1f4f8c1 (patch)
treed337e782ab5adda689f6fd276b9d08ea09962e2d
parentb60a7b43296ce6761abb5c7c05d2233a8f9113d1 (diff)
downloadpoky-ac757c10da72b390d88f2724d329e0b0b1f4f8c1.tar.gz
musicbrainz: Fix compile issues with gcc 4.3.1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4883 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/musicbrainz/files/gcc43_fix.patch63
-rw-r--r--meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb1
2 files changed, 64 insertions, 0 deletions
diff --git a/meta/packages/musicbrainz/files/gcc43_fix.patch b/meta/packages/musicbrainz/files/gcc43_fix.patch
new file mode 100644
index 0000000000..520837dd06
--- /dev/null
+++ b/meta/packages/musicbrainz/files/gcc43_fix.patch
@@ -0,0 +1,63 @@
1Index: libmusicbrainz-2.1.3/lib/c_wrapper.cpp
2===================================================================
3--- libmusicbrainz-2.1.3.orig/lib/c_wrapper.cpp 2008-07-18 15:40:55.000000000 +0100
4+++ libmusicbrainz-2.1.3/lib/c_wrapper.cpp 2008-07-18 15:42:05.000000000 +0100
5@@ -21,6 +21,7 @@
6 $Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $
7
8 ----------------------------------------------------------------------------*/
9+#include <cstring>
10 #include "musicbrainz.h"
11 #include "trm.h"
12 #include "mb_c.h"
13Index: libmusicbrainz-2.1.3/lib/comhttpsocket.cpp
14===================================================================
15--- libmusicbrainz-2.1.3.orig/lib/comhttpsocket.cpp 2008-07-18 15:40:55.000000000 +0100
16+++ libmusicbrainz-2.1.3/lib/comhttpsocket.cpp 2008-07-18 15:42:38.000000000 +0100
17@@ -10,6 +10,8 @@
18 #pragma warning(disable:4786)
19 #endif
20
21+#include <cstring>
22+
23 #include "comhttpsocket.h"
24 #ifdef WIN32
25 #include "../config_win32.h"
26Index: libmusicbrainz-2.1.3/lib/comsocket.cpp
27===================================================================
28--- libmusicbrainz-2.1.3.orig/lib/comsocket.cpp 2008-07-18 15:40:55.000000000 +0100
29+++ libmusicbrainz-2.1.3/lib/comsocket.cpp 2008-07-18 15:43:05.000000000 +0100
30@@ -28,6 +28,7 @@
31 programed by : Sean Ward
32 email : sward@relatable.com
33 ***************************************************************************/
34+#include <cstring>
35
36 #include "config.h"
37
38Index: libmusicbrainz-2.1.3/lib/http.cpp
39===================================================================
40--- libmusicbrainz-2.1.3.orig/lib/http.cpp 2008-07-18 15:40:55.000000000 +0100
41+++ libmusicbrainz-2.1.3/lib/http.cpp 2008-07-18 15:41:32.000000000 +0100
42@@ -23,6 +23,8 @@
43
44 ----------------------------------------------------------------------------*/
45 #include <stdio.h>
46+#include <cstring>
47+#include <cstdlib>
48 #include <sys/types.h>
49 #include <sys/stat.h>
50 #include <ctype.h>
51Index: libmusicbrainz-2.1.3/lib/sigclient.cpp
52===================================================================
53--- libmusicbrainz-2.1.3.orig/lib/sigclient.cpp 2008-07-18 15:40:55.000000000 +0100
54+++ libmusicbrainz-2.1.3/lib/sigclient.cpp 2008-07-18 15:43:27.000000000 +0100
55@@ -29,6 +29,8 @@
56 email : ijr@relatable.com
57 ***************************************************************************/
58
59+#include <cstring>
60+
61 #ifdef WIN32
62 #pragma warning(disable:4786)
63 #endif
diff --git a/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb b/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb
index e0ae4ae043..f089dc800d 100644
--- a/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb
+++ b/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb
@@ -5,6 +5,7 @@ DEPENDS = "expat"
5PR = "r1" 5PR = "r1"
6 6
7SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.3.tar.gz \ 7SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.3.tar.gz \
8 file://gcc43_fix.patch;patch=1 \
8 file://autofoo.patch;patch=1" 9 file://autofoo.patch;patch=1"
9 10
10inherit autotools pkgconfig 11inherit autotools pkgconfig