From ac757c10da72b390d88f2724d329e0b0b1f4f8c1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 18 Jul 2008 15:48:13 +0000
Subject: 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
---
 meta/packages/musicbrainz/files/gcc43_fix.patch   | 63 +++++++++++++++++++++++
 meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb |  1 +
 2 files changed, 64 insertions(+)
 create mode 100644 meta/packages/musicbrainz/files/gcc43_fix.patch

(limited to 'meta')

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 @@
+Index: libmusicbrainz-2.1.3/lib/c_wrapper.cpp
+===================================================================
+--- libmusicbrainz-2.1.3.orig/lib/c_wrapper.cpp	2008-07-18 15:40:55.000000000 +0100
++++ libmusicbrainz-2.1.3/lib/c_wrapper.cpp	2008-07-18 15:42:05.000000000 +0100
+@@ -21,6 +21,7 @@
+      $Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $
+ 
+ ----------------------------------------------------------------------------*/
++#include <cstring>
+ #include "musicbrainz.h"
+ #include "trm.h"
+ #include "mb_c.h"
+Index: libmusicbrainz-2.1.3/lib/comhttpsocket.cpp
+===================================================================
+--- libmusicbrainz-2.1.3.orig/lib/comhttpsocket.cpp	2008-07-18 15:40:55.000000000 +0100
++++ libmusicbrainz-2.1.3/lib/comhttpsocket.cpp	2008-07-18 15:42:38.000000000 +0100
+@@ -10,6 +10,8 @@
+ #pragma warning(disable:4786)
+ #endif
+ 
++#include <cstring>
++
+ #include "comhttpsocket.h"
+ #ifdef WIN32
+ #include "../config_win32.h"
+Index: libmusicbrainz-2.1.3/lib/comsocket.cpp
+===================================================================
+--- libmusicbrainz-2.1.3.orig/lib/comsocket.cpp	2008-07-18 15:40:55.000000000 +0100
++++ libmusicbrainz-2.1.3/lib/comsocket.cpp	2008-07-18 15:43:05.000000000 +0100
+@@ -28,6 +28,7 @@
+     programed by         : Sean Ward
+     email                : sward@relatable.com
+  ***************************************************************************/
++#include <cstring>
+ 
+ #include "config.h"
+ 
+Index: libmusicbrainz-2.1.3/lib/http.cpp
+===================================================================
+--- libmusicbrainz-2.1.3.orig/lib/http.cpp	2008-07-18 15:40:55.000000000 +0100
++++ libmusicbrainz-2.1.3/lib/http.cpp	2008-07-18 15:41:32.000000000 +0100
+@@ -23,6 +23,8 @@
+ 
+ ----------------------------------------------------------------------------*/
+ #include <stdio.h> 
++#include <cstring>
++#include <cstdlib>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+Index: libmusicbrainz-2.1.3/lib/sigclient.cpp
+===================================================================
+--- libmusicbrainz-2.1.3.orig/lib/sigclient.cpp	2008-07-18 15:40:55.000000000 +0100
++++ libmusicbrainz-2.1.3/lib/sigclient.cpp	2008-07-18 15:43:27.000000000 +0100
+@@ -29,6 +29,8 @@
+ email                : ijr@relatable.com
+ ***************************************************************************/
+ 
++#include <cstring>
++
+ #ifdef WIN32
+ #pragma warning(disable:4786)
+ #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"
 PR = "r1"
 
 SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.3.tar.gz \
+           file://gcc43_fix.patch;patch=1 \
            file://autofoo.patch;patch=1"
 
 inherit autotools pkgconfig
-- 
cgit v1.2.3