summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorStanislav Brabec <utx@penguin.cz>2009-05-26 19:33:31 +0000
committerutx@penguin.cz <utx@penguin.cz>2009-05-26 19:33:31 +0000
commitb9254b786f77ca7455c36d705abc5b2d6d27aece (patch)
tree4aa73f60c5f68967c27da12c8e1d9b5519a8466c /recipes
parent31d61332a420537ee647427b980d054a2f55e453 (diff)
libmusicbrainz: Fixed build.
Diffstat (limited to 'recipes')
-rw-r--r--recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch58
-rw-r--r--recipes/musicbrainz/libmusicbrainz_2.1.5.bb4
2 files changed, 61 insertions, 1 deletions
diff --git a/recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch b/recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch
new file mode 100644
index 0000000000..c9685301b4
--- /dev/null
+++ b/recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch
@@ -0,0 +1,58 @@
+diff -Naur libmusicbrainz-2.1.5.org/lib/comhttpsocket.cpp libmusicbrainz-2.1.5/lib/comhttpsocket.cpp
+--- libmusicbrainz-2.1.5.org/lib/comhttpsocket.cpp 2008-01-07 11:36:10.105820000 +0100
++++ libmusicbrainz-2.1.5/lib/comhttpsocket.cpp 2008-01-07 11:38:45.794974000 +0100
+@@ -20,6 +20,7 @@
+ #endif
+ #include <stdlib.h>
+ #include <assert.h>
++#include <cstring>
+
+ const char* g_strCOMVer = "libmusicbrainz/"VERSION;
+
+diff -Naur libmusicbrainz-2.1.5.org/lib/comsocket.cpp libmusicbrainz-2.1.5/lib/comsocket.cpp
+--- libmusicbrainz-2.1.5.org/lib/comsocket.cpp 2008-01-07 11:36:10.145783000 +0100
++++ libmusicbrainz-2.1.5/lib/comsocket.cpp 2008-01-07 11:44:12.604854000 +0100
+@@ -34,6 +34,7 @@
+ #include "comsocket.h"
+ #ifndef WIN32
+
++#include <string.h>
+ #include <netinet/tcp.h>
+ #include <errno.h>
+ #include <stdio.h>
+diff -Naur libmusicbrainz-2.1.5.org/lib/c_wrapper.cpp libmusicbrainz-2.1.5/lib/c_wrapper.cpp
+--- libmusicbrainz-2.1.5.org/lib/c_wrapper.cpp 2008-01-07 11:36:10.083846000 +0100
++++ libmusicbrainz-2.1.5/lib/c_wrapper.cpp 2008-01-07 11:41:45.093496000 +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"
+diff -Naur libmusicbrainz-2.1.5.org/lib/http.cpp libmusicbrainz-2.1.5/lib/http.cpp
+--- libmusicbrainz-2.1.5.org/lib/http.cpp 2008-01-07 11:36:10.210725000 +0100
++++ libmusicbrainz-2.1.5/lib/http.cpp 2008-01-07 11:46:38.053245000 +0100
+@@ -23,7 +23,8 @@
+
+ ----------------------------------------------------------------------------*/
+ #include <stdlib.h>
+-#include <stdio.h>
++#include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+diff -Naur libmusicbrainz-2.1.5.org/lib/sigclient.cpp libmusicbrainz-2.1.5/lib/sigclient.cpp
+--- libmusicbrainz-2.1.5.org/lib/sigclient.cpp 2008-01-07 11:36:10.338589000 +0100
++++ libmusicbrainz-2.1.5/lib/sigclient.cpp 2008-01-07 11:48:42.883323000 +0100
+@@ -33,6 +33,8 @@
+ #pragma warning(disable:4786)
+ #endif
+
++#include <string.h>
++
+ #include "sigclient.h"
+ #include "comhttpsocket.h"
+
diff --git a/recipes/musicbrainz/libmusicbrainz_2.1.5.bb b/recipes/musicbrainz/libmusicbrainz_2.1.5.bb
index 7ab0997218..452e874e1f 100644
--- a/recipes/musicbrainz/libmusicbrainz_2.1.5.bb
+++ b/recipes/musicbrainz/libmusicbrainz_2.1.5.bb
@@ -4,7 +4,9 @@ HOMEPAGE = "http://musicbrainz.org"
LICENSE = "LGPL"
DEPENDS = "expat"
-SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
+# gcc43.patch from openSUSE
+SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz \
+ file://libmusicbrainz-2.1.5-gcc43.patch;patch=1"
inherit autotools pkgconfig