diff options
| author | obache <obache@pkgsrc.org> | 2012-02-07 09:04:56 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-02-07 09:04:56 +0000 |
| commit | 8c9be2f52bf359ce09f7d73d19e8703b6b308ad1 (patch) | |
| tree | 781f140d8ab3360173b2fcb3b763906462dc902e /audio | |
| parent | c2b2551f353fc00d7c4a009853a8e5f0d81b2942 (diff) | |
| download | pkgsrc-8c9be2f52bf359ce09f7d73d19e8703b6b308ad1.tar.gz | |
change the last fix to safe way.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/py-id3lib/distinfo | 4 | ||||
| -rw-r--r-- | audio/py-id3lib/patches/patch-aa | 25 |
2 files changed, 15 insertions, 14 deletions
diff --git a/audio/py-id3lib/distinfo b/audio/py-id3lib/distinfo index ef97b59fdfe..cfec5906cc4 100644 --- a/audio/py-id3lib/distinfo +++ b/audio/py-id3lib/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2012/02/05 22:27:09 sbd Exp $ +$NetBSD: distinfo,v 1.6 2012/02/07 09:04:56 obache Exp $ SHA1 (pyid3lib-0.5.1.tar.bz2) = 5026f9aa7f868a081a7caecc54cbdbc0cdaea27b RMD160 (pyid3lib-0.5.1.tar.bz2) = cec0607aab0eeaaa953428a4d06c7b7a19232616 Size (pyid3lib-0.5.1.tar.bz2) = 21207 bytes -SHA1 (patch-aa) = f5df1b2756fdcc1f6f37a2670400187db732836e +SHA1 (patch-aa) = 5d25f1d1d3547445ffd09769a6a6c0b1980526a8 diff --git a/audio/py-id3lib/patches/patch-aa b/audio/py-id3lib/patches/patch-aa index 8ce3f301664..33caec539d7 100644 --- a/audio/py-id3lib/patches/patch-aa +++ b/audio/py-id3lib/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.4 2012/02/05 22:27:09 sbd Exp $ +$NetBSD: patch-aa,v 1.5 2012/02/07 09:04:56 obache Exp $ -Fix for LP64 on python > 2.4. +* Fix for LP64 on python > 2.4. +* `strchr' for `const char*' may return `const char*'. --- pyid3lib.cc.orig 2003-02-16 23:50:20.000000000 +0000 +++ pyid3lib.cc @@ -91,7 +92,7 @@ Fix for LP64 on python > 2.4. { ID3_Frame* newframe; -@@ -382,7 +393,7 @@ static ID3_Frame** frames_from_dictseq( +@@ -382,7 +393,7 @@ static ID3_Frame** frames_from_dictseq( return NULL; } @@ -109,12 +110,12 @@ Fix for LP64 on python > 2.4. ID3_Field* field; ID3_FieldID flid; -@@ -1054,7 +1065,7 @@ static PyObject* id3_getattr( ID3Object* - fld = frame->GetField( ID3FN_TEXT ); - str = fld->GetRawText(); - -- if ( (slash = strchr( str, '/' )) != NULL ) -+ if ( (slash = (char *)strchr( str, '/' )) != NULL ) - result = Py_BuildValue( "ii", atoi( str ), atoi( slash+1 ) ); - else - result = Py_BuildValue( "(i)", atoi( str ) ); +@@ -1013,7 +1024,7 @@ static PyObject* id3_getattr( ID3Object* + { + ID3_Frame* frame; + const char* str; +- char* slash; ++ const char* slash; + ID3_Field* fld; + int i; + |