diff options
| author | hans <hans@pkgsrc.org> | 2012-03-15 20:16:24 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-03-15 20:16:24 +0000 |
| commit | 664b7cb58f0146b2a02823cc50058d730c43eee2 (patch) | |
| tree | 5ba2c0d3bdaf0d2e2dcd2b7663ddf2ae3b96a234 /audio | |
| parent | 8e79b62190d06af299321fa8905f450aec2259ac (diff) | |
| download | pkgsrc-664b7cb58f0146b2a02823cc50058d730c43eee2.tar.gz | |
Fix this properly. Tested on NetBSD and SunOS.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/milkytracker/distinfo | 4 | ||||
| -rw-r--r-- | audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp | 37 |
2 files changed, 18 insertions, 23 deletions
diff --git a/audio/milkytracker/distinfo b/audio/milkytracker/distinfo index 3e3cca0f401..8e5d3510cbc 100644 --- a/audio/milkytracker/distinfo +++ b/audio/milkytracker/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2012/01/24 18:58:36 hans Exp $ +$NetBSD: distinfo,v 1.4 2012/03/15 20:16:24 hans Exp $ SHA1 (milkytracker-0.90.80.tar.bz2) = e6adedee56a6a1bf096b5311c319954ea54977dc RMD160 (milkytracker-0.90.80.tar.bz2) = cb535a50c29b8d722617007054921065e71c1615 Size (milkytracker-0.90.80.tar.bz2) = 1799270 bytes SHA1 (patch-aa) = 8e0a8d58c54995483f639b7f2d936b0b1ffd1a8f -SHA1 (patch-src_compression_zziplib_generic_fseeko.cpp) = 08eb2a831a3be8b26e377642c90e1b5c2b9f0021 +SHA1 (patch-src_compression_zziplib_generic_fseeko.cpp) = 002754ec91a5d3b986fabe9266cc8999ac148c82 diff --git a/audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp b/audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp index 0ee6ca6ce25..e5a092595ff 100644 --- a/audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp +++ b/audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp @@ -1,23 +1,18 @@ -$NetBSD: patch-src_compression_zziplib_generic_fseeko.cpp,v 1.1 2012/01/11 19:01:48 hans Exp $ +$NetBSD: patch-src_compression_zziplib_generic_fseeko.cpp,v 1.2 2012/03/15 20:16:24 hans Exp $ -Don't jump over variable initialization. - ---- src/compression/zziplib/generic/fseeko.cpp.orig 2008-01-05 18:33:45.000000000 +0100 -+++ src/compression/zziplib/generic/fseeko.cpp 2011-12-30 16:11:43.327510421 +0100 -@@ -445,6 +445,7 @@ struct zzip_entry_file /* : zzip_file_he - zzip__new__ ZZIP_ENTRY_FILE* - zzip_entry_fopen (ZZIP_ENTRY* entry, int takeover) - { -+ ___ zzip_off_t seek; - if (! entry) return 0; - if (! takeover) { - ZZIP_ENTRY* found = (ZZIP_ENTRY*)malloc (sizeof(*entry)); -@@ -472,7 +473,7 @@ zzip_entry_fopen (ZZIP_ENTRY* entry, int - file->zlib.zalloc = Z_NULL; - file->zlib.zfree = Z_NULL; +--- src/compression/zziplib/generic/fseeko.cpp.orig 2008-01-05 17:33:45.000000000 +0000 ++++ src/compression/zziplib/generic/fseeko.cpp +@@ -52,13 +52,8 @@ + #include <zzip___mmap.h> + #include <zzip___fnmatch.h> + +-#if __STDC_VERSION__+0 > 199900L +-#define ___ +-#define ____ +-#else + #define ___ { + #define ____ } +-#endif -- ___ zzip_off_t seek = file->data; -+ seek = file->data; - seek += sizeof(file->buffer); seek -= seek & (sizeof(file->buffer)-1); - assert (file->data < seek); /* pre-read to next PAGESIZE boundary... */ - fseeko (file->entry->diskfile, file->data + file->dataoff, SEEK_SET); + #ifndef ZZIP_HAVE_FSEEKO + #define fseeko fseek |