package/multimedia/id3lib/hotfix-gcc43.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../id3lib/gcc43.patch
   5 # Copyright (C) 2008 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 diff -ur id3lib-3.8.3/configure id3lib-3.8.3.new/configure
  18 --- id3lib-3.8.3/configure      2003-03-02 00:23:00.000000000 +0000
  19 +++ id3lib-3.8.3.new/configure  2008-04-28 20:19:32.000000000 +0100
  20 @@ -10296,7 +10296,7 @@
  21
  22  for ac_header in \
  23    string                        \
  24 -  iomanip.h                     \
  25 +  iomanip                       \
  26
  27  do
  28  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  29 diff -ur id3lib-3.8.3/examples/demo_convert.cpp id3lib-3.8.3.new/examples/demo_convert.cpp
  30 --- id3lib-3.8.3/examples/demo_convert.cpp      2003-03-02 00:23:00.000000000 +0000
  31 +++ id3lib-3.8.3.new/examples/demo_convert.cpp  2008-04-28 20:16:12.000000000 +0100
  32 @@ -84,7 +84,7 @@
  33    }
  34  }
  35
  36 -int main( unsigned int argc, char * const argv[])
  37 +int main( int argc, char * const argv[])
  38  {
  39    flags_t ulFlag = ID3TT_ALL;
  40    gengetopt_args_info args;
  41 diff -ur id3lib-3.8.3/examples/demo_copy.cpp id3lib-3.8.3.new/examples/demo_copy.cpp
  42 --- id3lib-3.8.3/examples/demo_copy.cpp 2003-03-02 00:23:00.000000000 +0000
  43 +++ id3lib-3.8.3.new/examples/demo_copy.cpp     2008-04-28 20:16:12.000000000 +0100
  44 @@ -81,7 +81,7 @@
  45    }
  46  }
  47
  48 -int main( unsigned int argc, char * const argv[])
  49 +int main( int argc, char * const argv[])
  50  {
  51    int ulFlag = ID3TT_ID3;
  52    ID3D_INIT_DOUT();
  53 diff -ur id3lib-3.8.3/examples/demo_info.cpp id3lib-3.8.3.new/examples/demo_info.cpp
  54 --- id3lib-3.8.3/examples/demo_info.cpp 2003-03-02 00:23:00.000000000 +0000
  55 +++ id3lib-3.8.3.new/examples/demo_info.cpp     2008-04-28 20:16:12.000000000 +0100
  56 @@ -309,7 +309,7 @@
  57
  58  #define DEBUG
  59
  60 -int main( unsigned int argc, char * const argv[])
  61 +int main( int argc, char * const argv[])
  62  {
  63    ID3D_INIT_DOUT();
  64
  65 diff -ur id3lib-3.8.3/examples/demo_tag.cpp id3lib-3.8.3.new/examples/demo_tag.cpp
  66 --- id3lib-3.8.3/examples/demo_tag.cpp  2003-03-02 00:23:00.000000000 +0000
  67 +++ id3lib-3.8.3.new/examples/demo_tag.cpp      2008-04-28 20:16:12.000000000 +0100
  68 @@ -46,7 +46,7 @@
  69      os << "v2";
  70  }
  71
  72 -int main( unsigned int argc, char * const argv[])
  73 +int main( int argc, char * const argv[])
  74  {
  75    int ulFlag = ID3TT_ID3;
  76    ID3D_INIT_DOUT();
  77 diff -ur id3lib-3.8.3/include/id3/id3lib_strings.h id3lib-3.8.3.new/include/id3/id3lib_strings.h
  78 --- id3lib-3.8.3/include/id3/id3lib_strings.h   2003-03-02 00:23:00.000000000 +0000
  79 +++ id3lib-3.8.3.new/include/id3/id3lib_strings.h       2008-04-28 20:15:32.000000000 +0100
  80 @@ -30,6 +30,7 @@
  81  #define _ID3LIB_STRINGS_H_
  82
  83  #include <string>
  84 +#include <cstring>
  85
  86  #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
  87  namespace std
  88 diff -ur id3lib-3.8.3/include/id3/writers.h id3lib-3.8.3.new/include/id3/writers.h
  89 --- id3lib-3.8.3/include/id3/writers.h  2003-03-02 00:23:00.000000000 +0000
  90 +++ id3lib-3.8.3.new/include/id3/writers.h      2008-04-28 20:15:32.000000000 +0100
  91 @@ -30,7 +30,7 @@
  92
  93  #include "id3/writer.h"
  94  #include "id3/id3lib_streams.h"
  95 -//#include <string.h>
  96 +#include <cstring>
  97
  98  class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
  99  {