summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2012-03-19 07:46:07 +0000
committerAlfredo Tupone <tupone@gentoo.org>2012-03-19 07:46:07 +0000
commitbc4e23d65c2e21675b64d9924f6a71248070ba99 (patch)
tree9afebf0fdc75b41811544c78a01920185b1df3d8 /games-util/ucon64
parentAdd patch to build _snackmodule.so #395275 (diff)
downloadgentoo-2-bc4e23d65c2e21675b64d9924f6a71248070ba99.tar.gz
gentoo-2-bc4e23d65c2e21675b64d9924f6a71248070ba99.tar.bz2
gentoo-2-bc4e23d65c2e21675b64d9924f6a71248070ba99.zip
Fix build with new zlib. Bug #408645
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'games-util/ucon64')
-rw-r--r--games-util/ucon64/ChangeLog8
-rw-r--r--games-util/ucon64/files/ucon64-2.0.0-zlib.patch20
2 files changed, 26 insertions, 2 deletions
diff --git a/games-util/ucon64/ChangeLog b/games-util/ucon64/ChangeLog
index ce91d96ed7aa..141ae5415848 100644
--- a/games-util/ucon64/ChangeLog
+++ b/games-util/ucon64/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-util/ucon64
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/ucon64/ChangeLog,v 1.15 2011/09/23 18:05:42 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/ucon64/ChangeLog,v 1.16 2012/03/19 07:46:07 tupone Exp $
+
+ 19 Mar 2012; Tupone Alfredo <tupone@gentoo.org>
+ files/ucon64-2.0.0-zlib.patch:
+ Fix build with new zlib. Bug #408645 by Piotr Szymaniak
23 Sep 2011; Tupone Alfredo <tupone@gentoo.org> ucon64-2.0.0.ebuild,
+files/ucon64-2.0.0-zlib.patch:
diff --git a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
index f7a371ab69ec..7a122713d232 100644
--- a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
+++ b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
@@ -23,3 +23,23 @@
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
+--- libdiscmage/misc_z.c.old 2012-03-19 08:39:41.975022496 +0100
++++ libdiscmage/misc_z.c 2012-03-19 08:40:13.109803301 +0100
+@@ -27,6 +27,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#define Z_SOLO
+ #include <zlib.h>
+ #include "misc_z.h"
+ #include "misc.h"
+--- misc/archive.c.old 2012-03-19 08:41:06.478999810 +0100
++++ misc/archive.c 2012-03-19 08:41:24.134741668 +0100
+@@ -27,6 +27,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#define Z_SOLO
+ #include <zlib.h>
+ #ifdef HAVE_BYTESWAP_H
+ #include <byteswap.h>