# HG changeset patch # User Christophe Lincoln # Date 1244730860 -7200 # Node ID e4d73ee23944779a855925c915f3ba65ada9d4d1 # Parent 96a2c64fe0bd7138b8a0058c91ae68d05fd1d758 id3lib: Fix build for gcc 4.4.x and remove libicon dep (use glibc iconv) diff -r 96a2c64fe0bd -r e4d73ee23944 id3lib/receipt --- a/id3lib/receipt Thu Jun 11 16:33:00 2009 +0200 +++ b/id3lib/receipt Thu Jun 11 16:34:20 2009 +0200 @@ -6,7 +6,7 @@ SHORT_DESC="Library to manipulate ID3v1 and ID3v2 tags." MAINTAINER="pankso@slitaz.org" TARBALL="$PACKAGE-$VERSION.tar.gz" -DEPENDS="libiconv zlib" +DEPENDS="zlib" BUILD_DEPENDS="zlib-dev" WEB_SITE="http://id3lib.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" @@ -15,6 +15,7 @@ compile_rules() { cd $src + patch -p1 -i ../stuff/id3lib-$VERSION-gcc-4.4.patch || exit 1 ./configure \ --prefix=/usr \ $CONFIGURE_ARGS && diff -r 96a2c64fe0bd -r e4d73ee23944 id3lib/stuff/id3lib-3.8.3-gcc-4.4.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/id3lib/stuff/id3lib-3.8.3-gcc-4.4.patch Thu Jun 11 16:34:20 2009 +0200 @@ -0,0 +1,76 @@ +--- id3lib-3.8.3/configure 2008-05-24 23:39:36.000000000 -0400 ++++ id3lib-3.8.3/configure 2008-05-24 23:39:57.000000000 -0400 +@@ -10296,8 +10296,7 @@ + + for ac_header in \ + string \ +- iomanip.h \ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + +--- id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:46.000000000 -0600 ++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:38.000000000 -0600 +@@ -30,6 +30,7 @@ + #define _ID3LIB_STRINGS_H_ + + #include ++#include + + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) + namespace std +--- id3lib-3.8.3/include/id3/writers.h 2003-03-01 18:23:00.000000000 -0600 ++++ id3lib-3.8.3/include/id3/writers.h 2008-03-05 18:23:05.000000000 -0600 +@@ -30,7 +30,7 @@ + + #include "id3/writer.h" + #include "id3/id3lib_streams.h" +-//#include ++#include + + class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer + { +--- id3lib-3.8.3/examples/demo_convert.cpp 2003-03-01 18:23:00.000000000 -0600 ++++ id3lib-3.8.3/examples/demo_convert.cpp 2008-03-05 18:26:50.000000000 -0600 +@@ -84,7 +84,7 @@ + } + } + +-int main( unsigned int argc, char * const argv[]) ++int main( int argc, char * const argv[]) + { + flags_t ulFlag = ID3TT_ALL; + gengetopt_args_info args; +--- id3lib-3.8.3/examples/demo_info.cpp 2003-03-01 18:23:00.000000000 -0600 ++++ id3lib-3.8.3/examples/demo_info.cpp 2008-03-05 18:27:40.000000000 -0600 +@@ -309,7 +309,7 @@ + + #define DEBUG + +-int main( unsigned int argc, char * const argv[]) ++int main( int argc, char * const argv[]) + { + ID3D_INIT_DOUT(); + +--- id3lib-3.8.3/examples/demo_tag.cpp 2003-03-01 18:23:00.000000000 -0600 ++++ id3lib-3.8.3/examples/demo_tag.cpp 2008-03-05 18:31:20.000000000 -0600 +@@ -46,7 +46,7 @@ + os << "v2"; + } + +-int main( unsigned int argc, char * const argv[]) ++int main( int argc, char * const argv[]) + { + int ulFlag = ID3TT_ID3; + ID3D_INIT_DOUT(); +--- id3lib-3.8.3/examples/demo_copy.cpp 2003-03-01 18:23:00.000000000 -0600 ++++ id3lib-3.8.3/examples/demo_copy.cpp 2008-03-05 18:32:44.000000000 -0600 +@@ -81,7 +81,7 @@ + } + } + +-int main( unsigned int argc, char * const argv[]) ++int main( int argc, char * const argv[]) + { + int ulFlag = ID3TT_ID3; + ID3D_INIT_DOUT();