wok-current rev 3345

id3lib: Fix build for gcc 4.4.x and remove libicon dep (use glibc iconv)
author Christophe Lincoln <pankso@slitaz.org>
date Thu Jun 11 16:34:20 2009 +0200 (2009-06-11)
parents 96a2c64fe0bd
children 0ef2d770cbeb
files id3lib/receipt id3lib/stuff/id3lib-3.8.3-gcc-4.4.patch
line diff
     1.1 --- a/id3lib/receipt	Thu Jun 11 16:33:00 2009 +0200
     1.2 +++ b/id3lib/receipt	Thu Jun 11 16:34:20 2009 +0200
     1.3 @@ -6,7 +6,7 @@
     1.4  SHORT_DESC="Library to manipulate ID3v1  and ID3v2 tags."
     1.5  MAINTAINER="pankso@slitaz.org"
     1.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.7 -DEPENDS="libiconv zlib"
     1.8 +DEPENDS="zlib"
     1.9  BUILD_DEPENDS="zlib-dev"
    1.10  WEB_SITE="http://id3lib.sourceforge.net/"
    1.11  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.12 @@ -15,6 +15,7 @@
    1.13  compile_rules()
    1.14  {
    1.15  	cd $src
    1.16 +	patch -p1 -i ../stuff/id3lib-$VERSION-gcc-4.4.patch || exit 1
    1.17  	./configure \
    1.18  		--prefix=/usr \
    1.19  		$CONFIGURE_ARGS &&
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/id3lib/stuff/id3lib-3.8.3-gcc-4.4.patch	Thu Jun 11 16:34:20 2009 +0200
     2.3 @@ -0,0 +1,76 @@
     2.4 +--- id3lib-3.8.3/configure      2008-05-24 23:39:36.000000000 -0400
     2.5 ++++ id3lib-3.8.3/configure   2008-05-24 23:39:57.000000000 -0400
     2.6 +@@ -10296,8 +10296,7 @@
     2.7 + 
     2.8 + for ac_header in \
     2.9 +   string                        \
    2.10 +-  iomanip.h                     \
    2.11 + 
    2.12 + do
    2.13 + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    2.14 + 
    2.15 +--- id3lib-3.8.3/include/id3/id3lib_strings.h	2008-03-05 18:19:46.000000000 -0600
    2.16 ++++ id3lib-3.8.3/include/id3/id3lib_strings.h	2008-03-05 18:19:38.000000000 -0600
    2.17 +@@ -30,6 +30,7 @@
    2.18 + #define _ID3LIB_STRINGS_H_
    2.19 + 
    2.20 + #include <string>
    2.21 ++#include <cstring>
    2.22 + 
    2.23 + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
    2.24 + namespace std
    2.25 +--- id3lib-3.8.3/include/id3/writers.h	2003-03-01 18:23:00.000000000 -0600
    2.26 ++++ id3lib-3.8.3/include/id3/writers.h	2008-03-05 18:23:05.000000000 -0600
    2.27 +@@ -30,7 +30,7 @@
    2.28 + 
    2.29 + #include "id3/writer.h"
    2.30 + #include "id3/id3lib_streams.h"
    2.31 +-//#include <string.h>
    2.32 ++#include <string.h>
    2.33 + 
    2.34 + class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
    2.35 + {
    2.36 +--- id3lib-3.8.3/examples/demo_convert.cpp	2003-03-01 18:23:00.000000000 -0600
    2.37 ++++ id3lib-3.8.3/examples/demo_convert.cpp	2008-03-05 18:26:50.000000000 -0600
    2.38 +@@ -84,7 +84,7 @@
    2.39 +   }
    2.40 + }
    2.41 + 
    2.42 +-int main( unsigned int argc, char * const argv[])
    2.43 ++int main( int argc, char * const argv[])
    2.44 + {
    2.45 +   flags_t ulFlag = ID3TT_ALL;
    2.46 +   gengetopt_args_info args;
    2.47 +--- id3lib-3.8.3/examples/demo_info.cpp	2003-03-01 18:23:00.000000000 -0600
    2.48 ++++ id3lib-3.8.3/examples/demo_info.cpp	2008-03-05 18:27:40.000000000 -0600
    2.49 +@@ -309,7 +309,7 @@
    2.50 + 
    2.51 + #define DEBUG
    2.52 + 
    2.53 +-int main( unsigned int argc, char * const argv[])
    2.54 ++int main( int argc, char * const argv[])
    2.55 + {
    2.56 +   ID3D_INIT_DOUT();
    2.57 + 
    2.58 +--- id3lib-3.8.3/examples/demo_tag.cpp	2003-03-01 18:23:00.000000000 -0600
    2.59 ++++ id3lib-3.8.3/examples/demo_tag.cpp	2008-03-05 18:31:20.000000000 -0600
    2.60 +@@ -46,7 +46,7 @@
    2.61 +     os << "v2";
    2.62 + }
    2.63 + 
    2.64 +-int main( unsigned int argc, char * const argv[])
    2.65 ++int main( int argc, char * const argv[])
    2.66 + {
    2.67 +   int ulFlag = ID3TT_ID3;
    2.68 +   ID3D_INIT_DOUT();
    2.69 +--- id3lib-3.8.3/examples/demo_copy.cpp	2003-03-01 18:23:00.000000000 -0600
    2.70 ++++ id3lib-3.8.3/examples/demo_copy.cpp	2008-03-05 18:32:44.000000000 -0600
    2.71 +@@ -81,7 +81,7 @@
    2.72 +   }
    2.73 + }
    2.74 + 
    2.75 +-int main( unsigned int argc, char * const argv[])
    2.76 ++int main( int argc, char * const argv[])
    2.77 + {
    2.78 +   int ulFlag = ID3TT_ID3;
    2.79 +   ID3D_INIT_DOUT();