pkgs/by-name/id/id3lib/id3lib-3.8.3-gcc43-1.patch

   1 http://www.linuxfromscratch.org/patches/downloads/id3lib/id3lib-3.8.3-gcc43-1.patch
   2
   3 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
   4 Date: 2008-11-21
   5 Initial Package Version: 3.8.3
   6 Upstream Status: unknown
   7 Origin: fedora
   8 Description: Allows it to compile with gcc-4.3.
   9
  10 diff -up id3lib-3.8.3/include/id3/id3lib_strings.h~ id3lib-3.8.3/include/id3/id3lib_strings.h
  11 --- id3lib-3.8.3/include/id3/id3lib_strings.h~  2003-03-02 02:23:00.000000000 +0200
  12 +++ id3lib-3.8.3/include/id3/id3lib_strings.h   2008-01-04 01:30:52.000000000 +0200
  13 @@ -29,6 +29,7 @@
  14  #ifndef _ID3LIB_STRINGS_H_
  15  #define _ID3LIB_STRINGS_H_
  16
  17 +#include <cstring>
  18  #include <string>
  19
  20  #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
  21 diff -up id3lib-3.8.3/configure.in~ id3lib-3.8.3/configure.in
  22 --- id3lib-3.8.3/configure.in~  2008-01-04 11:39:01.000000000 +0100
  23 +++ id3lib-3.8.3/configure.in   2008-01-04 11:39:01.000000000 +0100
  24 @@ -227,7 +227,6 @@ AC_CHECK_HEADERS(fstream iostream iomani
  25  )
  26  AC_CHECK_HEADERS(               \
  27    string                        \
  28 -  iomanip.h                     \
  29    ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
  30  )
  31
  32 diff -up id3lib-3.8.3/configure~ id3lib-3.8.3/configure
  33 --- id3lib-3.8.3/configure~     2008-01-04 11:39:10.000000000 +0100
  34 +++ id3lib-3.8.3/configure      2008-01-04 11:39:10.000000000 +0100
  35 @@ -22976,7 +22976,6 @@ done
  36
  37  for ac_header in \
  38    string                        \
  39 -  iomanip.h                     \
  40
  41  do
  42  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  43 diff -up id3lib-3.8.3/include/id3/writers.h~ id3lib-3.8.3/include/id3/writers.h
  44 --- id3lib-3.8.3/include/id3/writers.h~ 2008-01-04 11:59:39.000000000 +0100
  45 +++ id3lib-3.8.3/include/id3/writers.h  2008-01-04 11:59:39.000000000 +0100
  46 @@ -28,9 +28,9 @@
  47  #ifndef _ID3LIB_WRITERS_H_
  48  #define _ID3LIB_WRITERS_H_
  49
  50 +#include <cstring>
  51  #include "id3/writer.h"
  52  #include "id3/id3lib_streams.h"
  53 -//#include <string.h>
  54
  55  class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
  56  {
  57 diff -up id3lib-3.8.3/examples/demo_info.cpp~ id3lib-3.8.3/examples/demo_info.cpp
  58 --- id3lib-3.8.3/examples/demo_info.cpp~        2008-01-04 12:00:56.000000000 +0100
  59 +++ id3lib-3.8.3/examples/demo_info.cpp 2008-01-04 12:00:56.000000000 +0100
  60 @@ -309,7 +309,7 @@ void PrintInformation(const ID3_Tag &myT
  61
  62  #define DEBUG
  63
  64 -int main( unsigned int argc, char * const argv[])
  65 +int main(int argc, char * const argv[])
  66  {
  67    ID3D_INIT_DOUT();
  68
  69 diff -up id3lib-3.8.3/examples/demo_copy.cpp~ id3lib-3.8.3/examples/demo_copy.cpp
  70 --- id3lib-3.8.3/examples/demo_copy.cpp~        2008-01-04 12:01:26.000000000 +0100
  71 +++ id3lib-3.8.3/examples/demo_copy.cpp 2008-01-04 12:01:26.000000000 +0100
  72 @@ -81,7 +81,7 @@ void DisplayTags(ostream &os, luint nTag
  73    }
  74  }
  75
  76 -int main( unsigned int argc, char * const argv[])
  77 +int main(int argc, char * const argv[])
  78  {
  79    int ulFlag = ID3TT_ID3;
  80    ID3D_INIT_DOUT();
  81 diff -up id3lib-3.8.3/examples/demo_convert.cpp~ id3lib-3.8.3/examples/demo_convert.cpp
  82 --- id3lib-3.8.3/examples/demo_convert.cpp~     2008-01-04 12:01:20.000000000 +0100
  83 +++ id3lib-3.8.3/examples/demo_convert.cpp      2008-01-04 12:01:20.000000000 +0100
  84 @@ -84,7 +84,7 @@ void DisplayTags(ostream &os, luint nTag
  85    }
  86  }
  87
  88 -int main( unsigned int argc, char * const argv[])
  89 +int main(int argc, char * const argv[])
  90  {
  91    flags_t ulFlag = ID3TT_ALL;
  92    gengetopt_args_info args;
  93 diff -up id3lib-3.8.3/examples/demo_tag.cpp~ id3lib-3.8.3/examples/demo_tag.cpp
  94 --- id3lib-3.8.3/examples/demo_tag.cpp~ 2008-01-04 12:01:41.000000000 +0100
  95 +++ id3lib-3.8.3/examples/demo_tag.cpp  2008-01-04 12:01:41.000000000 +0100
  96 @@ -46,7 +46,7 @@ void DisplayTags(ostream &os, luint nTag
  97      os << "v2";
  98  }
  99
 100 -int main( unsigned int argc, char * const argv[])
 101 +int main(int argc, char * const argv[])
 102  {
 103    int ulFlag = ID3TT_ID3;
 104    ID3D_INIT_DOUT();