pkg/43783: audio/id3lib fails on Linux [patch]

[cheusov%tut.by@localhost]

>Number:         43783
>Category:       pkg
>Synopsis:       audio/id3lib fails on Linux [patch]
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Aug 21 11:55:00 +0000 2010
>Originator:     Aleksey Cheusov
>Release:        NetBSD 5.1_RC3
>Organization:
>Environment:
System: NetBSD asrock.chizhovka.net 5.1_RC3 NetBSD 5.1_RC3 (GENERIC) #1: Mon 
Jun 28 00:06:07 EEST 2010 
cheusov%asrock.chizhovka.net@localhost:/srv/obj/sys/arch/amd64/compile/GENERIC 
amd64
Architecture: x86_64
Machine: amd64
>Description:
audio/id3lib fails on Linux Debian Lenny for a couple of reasons.
1) configure phase

     checking for iomanip.h... no
     configure: error: Missing a vital header file for id3lib
     *** Error code 1

   Actually iomanip.h is not used in the source code.

2) 
   In file included from ../include/id3/utils.h:37,
      from ../include/id3/tag.h:34,
      from c_wrapper.cpp:30:
   ../include/id3/id3lib_strings.h: In static member function 'static unsigned 
char* std::char_traits<unsigned char>::move(unsigned char*, const unsigned 
char*, size_t)':
   ../include/id3/id3lib_strings.h:87: error: 'memmove' was not declared in 
this scope
   ../include/id3/id3lib_strings.h: In static member function 'static unsigned 
char* std::char_traits<unsigned char>::copy(unsigned char*, const unsigned 
char*, size_t)':
   ../include/id3/id3lib_strings.h:91: error: 'memcpy' was not declared in this 
scope
   *** Error code 1

3) gcc also dies when it sees 'int main (unsigned int argc,...)'
   It expects 'int argc' instead of 'unsigned int argc'

>How-To-Repeat:
Build package on Debian Lenny
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/id3lib/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile    20 May 2010 21:12:13 -0000      1.29
+++ Makefile    21 Aug 2010 11:46:32 -0000
@@ -17,6 +17,8 @@
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 
+CONFIGURE_ENV+=                ac_cv_header_iomanip_h=yes
+
 CPPFLAGS+=-DID3_NEED_WCHAR_TEMPLATE
 
 .include "../../devel/zlib/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/id3lib/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo    20 May 2010 21:12:13 -0000      1.16
+++ distinfo    21 Aug 2010 11:46:32 -0000
@@ -3,10 +3,15 @@
 SHA1 (id3lib-3.8.3.tar.gz) = c92c880da41d1ec0b242745a901702ae87970838
 RMD160 (id3lib-3.8.3.tar.gz) = bfa2499ec649ed40815ad0a370c78eb1517952c4
 Size (id3lib-3.8.3.tar.gz) = 950726 bytes
-SHA1 (patch-aa) = 35e7df9577fd7fdd8657dca32207e34b580a0b57
+SHA1 (patch-aa) = 200160f5997c09b97ef27627506811c00f44cb17
+SHA1 (patch-ab) = 9be3c4d325a9521e1a9e360e38f82720472c093f
+SHA1 (patch-ac) = 3296d3430722e5f105e50712d6b1cbcc34a692bf
+SHA1 (patch-ad) = c16f79674215f370de293181674e88e9dacd34d9
+SHA1 (patch-ae) = f61b5e2687febf40e19314b0e1851ad434416f72
 SHA1 (patch-af) = 0266e9220791b7b14a35dc9b7564ab75cbc6562b
 SHA1 (patch-ag) = a047fe90d83c88e0f6d0a6a0595a440ef49276e3
 SHA1 (patch-ah) = 42a04014cc839565063daa395884b757214eb911
 SHA1 (patch-ai) = c0521a6d62d17826c9b1f35f6be51e1b72c48e7c
 SHA1 (patch-aj) = 626952e7bbddbcf5db66a0509f62d588ccaed17a
 SHA1 (patch-ak) = f7d1155a7750b455ac590d5777b332a55542393d
+SHA1 (patch-al) = 1cf47f908a4ae261aba01e6c6d6998930c477413
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/audio/id3lib/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa    23 Sep 2006 13:26:24 -0000      1.4
+++ patches/patch-aa    21 Aug 2010 11:46:32 -0000
@@ -2,7 +2,15 @@
 
 --- include/id3/id3lib_strings.h.orig  2003-03-02 00:23:00.000000000 +0000
 +++ include/id3/id3lib_strings.h
-@@ -100,10 +100,10 @@ namespace std
+@@ -30,6 +30,7 @@
+ #define _ID3LIB_STRINGS_H_
+ 
+ #include <string>
++#include <string.h>
+ 
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 
1000))
+ namespace std
+@@ -100,10 +101,10 @@ namespace std
  
        static char_type
        to_char_type(const int_type& __c)
@@ -15,7 +23,7 @@
  
        static bool
        eq_int_type(const int_type& __c1, const int_type& __c2)
-@@ -117,7 +117,8 @@ namespace std
+@@ -117,7 +118,8 @@ namespace std
        { return eq_int_type(__c, eof()) ? int_type(0) : __c; }
      };
  
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ab    21 Aug 2010 11:46:32 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- examples/demo_convert.cpp.orig     2003-03-02 00:23:00.000000000 +0000
++++ examples/demo_convert.cpp
+@@ -84,7 +84,7 @@ void DisplayTags(ostream &os, luint nTag
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+   flags_t ulFlag = ID3TT_ALL;
+   gengetopt_args_info args;
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ac    21 Aug 2010 11:46:32 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- examples/demo_copy.cpp.orig        2003-03-02 00:23:00.000000000 +0000
++++ examples/demo_copy.cpp
+@@ -81,7 +81,7 @@ void DisplayTags(ostream &os, luint nTag
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
Index: patches/patch-ad
===================================================================
RCS file: patches/patch-ad
diff -N patches/patch-ad
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ad    21 Aug 2010 11:46:32 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- examples/demo_info.cpp.orig        2003-03-02 00:23:00.000000000 +0000
++++ examples/demo_info.cpp
+@@ -309,7 +309,7 @@ void PrintInformation(const ID3_Tag &myT
+ 
+ #define DEBUG
+ 
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+   ID3D_INIT_DOUT();
+ 
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ae    21 Aug 2010 11:46:32 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- examples/demo_tag.cpp.orig 2003-03-02 00:23:00.000000000 +0000
++++ examples/demo_tag.cpp
+@@ -46,7 +46,7 @@ void DisplayTags(ostream &os, luint nTag
+     os << "v2";
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
Index: patches/patch-al
===================================================================
RCS file: patches/patch-al
diff -N patches/patch-al
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-al    21 Aug 2010 11:46:32 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- include/id3/writers.h.orig 2003-03-02 00:23:00.000000000 +0000
++++ 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
+ {