[libmusicbrainz] rebase patch

[Rex Dieter]

commit b9ff309cfcd38b56dcbc26345868a6b50f20b358
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Feb 11 13:19:07 2011 -0600

    rebase patch

 libmusicbrainz-2.1.5-gcc43.patch |   48 +++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/libmusicbrainz-2.1.5-gcc43.patch b/libmusicbrainz-2.1.5-gcc43.patch
index ac1bcbf..0a55e1e 100644
--- a/libmusicbrainz-2.1.5-gcc43.patch
+++ b/libmusicbrainz-2.1.5-gcc43.patch
@@ -1,18 +1,6 @@
-diff -up libmusicbrainz-2.1.5/lib/sigclient.cpp.gcc43 libmusicbrainz-2.1.5/lib/sigclient.cpp
---- libmusicbrainz-2.1.5/lib/sigclient.cpp.gcc43	2006-11-14 10:34:49.000000000 -0600
-+++ libmusicbrainz-2.1.5/lib/sigclient.cpp	2008-02-22 08:52:01.000000000 -0600
-@@ -33,6 +33,8 @@ email                : ijr at relatable.com
- #pragma warning(disable:4786)
- #endif
- 
-+#include <string.h>
-+
- #include "sigclient.h"
- #include "comhttpsocket.h"
- 
 diff -up libmusicbrainz-2.1.5/lib/comhttpsocket.cpp.gcc43 libmusicbrainz-2.1.5/lib/comhttpsocket.cpp
 --- libmusicbrainz-2.1.5/lib/comhttpsocket.cpp.gcc43	2006-11-14 10:34:49.000000000 -0600
-+++ libmusicbrainz-2.1.5/lib/comhttpsocket.cpp	2008-02-22 08:50:38.000000000 -0600
++++ libmusicbrainz-2.1.5/lib/comhttpsocket.cpp	2011-02-11 13:18:27.368524283 -0600
 @@ -19,6 +19,7 @@
  #include "comsocket.h"
  #endif
@@ -23,7 +11,7 @@ diff -up libmusicbrainz-2.1.5/lib/comhttpsocket.cpp.gcc43 libmusicbrainz-2.1.5/l
  const char* g_strCOMVer = "libmusicbrainz/"VERSION;
 diff -up libmusicbrainz-2.1.5/lib/comsocket.cpp.gcc43 libmusicbrainz-2.1.5/lib/comsocket.cpp
 --- libmusicbrainz-2.1.5/lib/comsocket.cpp.gcc43	2006-11-14 10:34:49.000000000 -0600
-+++ libmusicbrainz-2.1.5/lib/comsocket.cpp	2008-02-22 08:51:03.000000000 -0600
++++ libmusicbrainz-2.1.5/lib/comsocket.cpp	2011-02-11 13:18:27.369524291 -0600
 @@ -37,6 +37,7 @@ ________________________________________
  #include <netinet/tcp.h>
  #include <errno.h>
@@ -32,9 +20,20 @@ diff -up libmusicbrainz-2.1.5/lib/comsocket.cpp.gcc43 libmusicbrainz-2.1.5/lib/c
  #include <sys/time.h>
  #include <sys/types.h>
  #include <unistd.h>
+diff -up libmusicbrainz-2.1.5/lib/c_wrapper.cpp.gcc43 libmusicbrainz-2.1.5/lib/c_wrapper.cpp
+--- libmusicbrainz-2.1.5/lib/c_wrapper.cpp.gcc43	2006-11-14 10:34:49.000000000 -0600
++++ libmusicbrainz-2.1.5/lib/c_wrapper.cpp	2011-02-11 13:18:27.369524291 -0600
+@@ -21,6 +21,7 @@
+      $Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $
+ 
+ ----------------------------------------------------------------------------*/
++#include <string.h>
+ #include "musicbrainz.h"
+ #include "trm.h"
+ #include "mb_c.h"
 diff -up libmusicbrainz-2.1.5/lib/http.cpp.gcc43 libmusicbrainz-2.1.5/lib/http.cpp
 --- libmusicbrainz-2.1.5/lib/http.cpp.gcc43	2007-05-11 01:21:21.000000000 -0500
-+++ libmusicbrainz-2.1.5/lib/http.cpp	2008-02-22 08:51:25.000000000 -0600
++++ libmusicbrainz-2.1.5/lib/http.cpp	2011-02-11 13:18:27.369524291 -0600
 @@ -24,6 +24,7 @@
  ----------------------------------------------------------------------------*/
  #include <stdlib.h>
@@ -43,14 +42,15 @@ diff -up libmusicbrainz-2.1.5/lib/http.cpp.gcc43 libmusicbrainz-2.1.5/lib/http.c
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <ctype.h>
-diff -up libmusicbrainz-2.1.5/lib/c_wrapper.cpp.gcc43 libmusicbrainz-2.1.5/lib/c_wrapper.cpp
---- libmusicbrainz-2.1.5/lib/c_wrapper.cpp.gcc43	2006-11-14 10:34:49.000000000 -0600
-+++ libmusicbrainz-2.1.5/lib/c_wrapper.cpp	2008-02-22 08:50:15.000000000 -0600
-@@ -21,6 +21,7 @@
-      $Id: libmusicbrainz-2.1.5-gcc43.patch,v 1.3 2009/02/19 18:12:48 rdieter Exp $
+diff -up libmusicbrainz-2.1.5/lib/sigclient.cpp.gcc43 libmusicbrainz-2.1.5/lib/sigclient.cpp
+--- libmusicbrainz-2.1.5/lib/sigclient.cpp.gcc43	2006-11-14 10:34:49.000000000 -0600
++++ libmusicbrainz-2.1.5/lib/sigclient.cpp	2011-02-11 13:18:27.368524283 -0600
+@@ -33,6 +33,8 @@ email                : ijr at relatable.com
+ #pragma warning(disable:4786)
+ #endif
  
- ----------------------------------------------------------------------------*/
 +#include <string.h>
- #include "musicbrainz.h"
- #include "trm.h"
- #include "mb_c.h"
++
+ #include "sigclient.h"
+ #include "comhttpsocket.h"
+