diff options
| author | dholland <dholland@pkgsrc.org> | 2012-05-10 22:11:20 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-05-10 22:11:20 +0000 |
| commit | 4e5e046cdf1d1ab0732e86e651430291dc04e67f (patch) | |
| tree | 4a05e7005a076498dce112333e66f22af81ffe82 /emulators | |
| parent | f61986874e4d380a74d314efb78b32b3b2a99730 (diff) | |
| download | pkgsrc-4e5e046cdf1d1ab0732e86e651430291dc04e67f.tar.gz | |
Add a cast to some indescribably horrible code to fix a build failure seen
in the last Linux bulk build.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/ucon64/distinfo | 4 | ||||
| -rw-r--r-- | emulators/ucon64/patches/patch-af | 21 |
2 files changed, 21 insertions, 4 deletions
diff --git a/emulators/ucon64/distinfo b/emulators/ucon64/distinfo index 8eae1bee3a7..e5b3c96eaaf 100644 --- a/emulators/ucon64/distinfo +++ b/emulators/ucon64/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2006/10/23 11:17:55 tv Exp $ +$NetBSD: distinfo,v 1.5 2012/05/10 22:11:20 dholland Exp $ SHA1 (ucon64-2.0.0-src.tar.gz) = 8782bbc2bf5760fafe3fa4cd02b67991d984a973 RMD160 (ucon64-2.0.0-src.tar.gz) = c28921cfae1a010db917b96be542c089690b374c @@ -8,4 +8,4 @@ SHA1 (patch-ab) = 25f5311844511674d5e64efe7c35cf86dacc34a9 SHA1 (patch-ac) = 9c7febe59e1c8e6959f56e34ced83a31fa54c294 SHA1 (patch-ad) = c41895de15bc2a48bf5de1535f03d070ade79ea3 SHA1 (patch-ae) = bfb38ecec2408deaaef881fa33943e2c45bccd4d -SHA1 (patch-af) = 5fea372717e49f3d161c544e5ee01a8d23d688ba +SHA1 (patch-af) = 84476b894a34bb1d7074526340eaa97fcbcfd0aa diff --git a/emulators/ucon64/patches/patch-af b/emulators/ucon64/patches/patch-af index e00b7f6237b..b8186b53aa5 100644 --- a/emulators/ucon64/patches/patch-af +++ b/emulators/ucon64/patches/patch-af @@ -1,6 +1,14 @@ -$NetBSD: patch-af,v 1.1 2005/12/09 11:48:11 joerg Exp $ +$NetBSD: patch-af,v 1.2 2012/05/10 22:11:20 dholland Exp $ ---- misc/archive.c.orig 2005-12-09 11:42:47.000000000 +0000 +- don't declare own errno +- fix build failure where gzgetc() is a macro (seen in a recent Linux + bulk build) + +XXX: what this code is doing (mixing gzFile* and FILE* indiscriminately +XXX: without even casting) is vile and will probably stop compiling at +XXX: some point. + +--- misc/archive.c.orig 2004-12-12 01:16:54.000000000 +0000 +++ misc/archive.c @@ -48,9 +48,6 @@ Foundation, Inc., 675 Mass Ave, Cambridg #define MAXBUFSIZE 32768 @@ -12,3 +20,12 @@ $NetBSD: patch-af,v 1.1 2005/12/09 11:48:11 joerg Exp $ int fsizeof (const char *filename) // If USE_ZLIB is defined this function is very slow. Please avoid to use +@@ -498,7 +495,7 @@ fgetc2 (FILE *file) + if (fmode == FM_NORMAL) + return fgetc (file); + else if (fmode == FM_GZIP) +- return gzgetc (file); ++ return gzgetc ((struct gzFile *)file); + else if (fmode == FM_ZIP) + { + char c; |