Fix id3lib build with gcc 4.3

SVN-Revision: 14781

diff --git a/libs/id3lib/patches/120-fix-configure-remove-check-for-iomanip_h.patch b/libs/id3lib/patches/120-fix-configure-remove-check-for-iomanip_h.patch
new file mode 100644 (file)
index 0000000..26944cc
--- /dev/null
+++ b/libs/id3lib/patches/120-fix-configure-remove-check-for-iomanip_h.patch
@@ -0,0 +1,24 @@
+diff --git a/configure b/configure
+index 37b66f3..723ca1e 100755
+--- a/configure
++++ b/configure
+@@ -10296,7 +10296,6 @@ done
+ 
+ for ac_header in \
+   string                        \
+-  iomanip.h                     \
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+diff --git a/configure.in b/configure.in
+index c857735..abfe4cd 100644
+--- a/configure.in
++++ b/configure.in
+@@ -227,7 +227,6 @@ AC_CHECK_HEADERS(fstream iostream iomanip vector \
+ )
+ AC_CHECK_HEADERS(               \
+   string                        \
+-  iomanip.h                     \
+   ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
+ )
+ 

diff --git a/libs/id3lib/patches/130-fix-includes.patch b/libs/id3lib/patches/130-fix-includes.patch
new file mode 100644 (file)
index 0000000..d3e636a
--- /dev/null
+++ b/libs/id3lib/patches/130-fix-includes.patch
@@ -0,0 +1,25 @@
+diff --git a/include/id3/id3lib_strings.h b/include/id3/id3lib_strings.h
+index 02a9aba..101b797 100644
+--- a/include/id3/id3lib_strings.h
++++ b/include/id3/id3lib_strings.h
+@@ -29,6 +29,7 @@
+ #ifndef _ID3LIB_STRINGS_H_
+ #define _ID3LIB_STRINGS_H_
+ 
++#include <string.h>
+ #include <string>
+ #include <streambuf>
+ 
+diff --git a/include/id3/writers.h b/include/id3/writers.h
+index 1cbb0dc..4bc8f77 100644
+--- a/include/id3/writers.h
++++ b/include/id3/writers.h
+@@ -30,7 +30,7 @@
+ 
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
++#include <string.h>
+ 
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ {

diff --git a/libs/id3lib/patches/140-dont-build-examples.patch b/libs/id3lib/patches/140-dont-build-examples.patch
new file mode 100644 (file)
index 0000000..61b97e0
--- /dev/null
+++ b/libs/id3lib/patches/140-dont-build-examples.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.in b/Makefile.in
+index 8c121c5..b2131c2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -132,8 +132,8 @@ EXTRA_DIST = \
+ @ID3_NEEDZLIB_TRUE@zlib_subdir = zlib
+ @ID3_NEEDZLIB_FALSE@zlib_subdir = 
+ 
+-SUBDIRS = . m4 $(zlib_subdir) doc include id3com src examples
+-DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj
++SUBDIRS = . m4 $(zlib_subdir) doc include id3com src
++DIST_SUBDIRS = . m4 zlib doc include id3com src prj libprj
+ 
+ INCLUDES = @ID3LIB_DEBUG_FLAGS@
+