diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-09-23 18:05:42 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-09-23 18:05:42 +0000 |
| commit | 6c8c1db837f16460e2f8b30f279df2ced1b17b69 (patch) | |
| tree | 481204967730839b562445370030117aa969c015 /games-util | |
| parent | Version bump (diff) | |
| download | historical-6c8c1db837f16460e2f8b30f279df2ced1b17b69.tar.gz historical-6c8c1db837f16460e2f8b30f279df2ced1b17b69.tar.bz2 historical-6c8c1db837f16460e2f8b30f279df2ced1b17b69.zip | |
Build with new zlib. Bug #383813
Package-Manager: portage-2.1.10.19/cvs/Linux i686
Diffstat (limited to 'games-util')
| -rw-r--r-- | games-util/ucon64/ChangeLog | 8 | ||||
| -rw-r--r-- | games-util/ucon64/Manifest | 15 | ||||
| -rw-r--r-- | games-util/ucon64/files/ucon64-2.0.0-zlib.patch | 25 | ||||
| -rw-r--r-- | games-util/ucon64/ucon64-2.0.0.ebuild | 7 |
4 files changed, 48 insertions, 7 deletions
diff --git a/games-util/ucon64/ChangeLog b/games-util/ucon64/ChangeLog index b57548984443..ce91d96ed7aa 100644 --- a/games-util/ucon64/ChangeLog +++ b/games-util/ucon64/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-util/ucon64 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/ucon64/ChangeLog,v 1.14 2010/11/04 08:20:12 tupone Exp $ +# 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 $ + + 23 Sep 2011; Tupone Alfredo <tupone@gentoo.org> ucon64-2.0.0.ebuild, + +files/ucon64-2.0.0-zlib.patch: + Build with new zlib. Bug #383813 by Diego Elio Pettenò 04 Nov 2010; Tupone Alfredo <tupone@gentoo.org> ucon64-2.0.0.ebuild, +files/ucon64-2.0.0-ovflfix.patch: diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest index 6811803bd600..8a94c72f6466 100644 --- a/games-util/ucon64/Manifest +++ b/games-util/ucon64/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX ucon64-2.0.0-ovflfix.patch 681 RMD160 acad7449f234959afc6f0d3f03a2e44258c9ba58 SHA1 8f4796f0db79efaf8ab3d9c4c545af788c845dd3 SHA256 37ceb0e0211270dbf1b8fc0453f706f5a3d797b184e4fe42345f31b1eef8cf7c +AUX ucon64-2.0.0-zlib.patch 712 RMD160 daba4295a6f08e903396c83deecb7b51c924c7cb SHA1 2cb9cd83209e5671899ca6828b6d98f349686783 SHA256 90f759d45c13b41286b9d65284ddece355e659a0339fb9f3f88b44594de3a360 DIST ucon64-2.0.0-src.tar.gz 1188488 RMD160 c28921cfae1a010db917b96be542c089690b374c SHA1 8782bbc2bf5760fafe3fa4cd02b67991d984a973 SHA256 62064324a1912387f84ac9d4c521c5d5e7b80f2567e9f61bf0ab3e1d976c0127 -EBUILD ucon64-2.0.0.ebuild 1575 RMD160 05b2af4e3ff933af62ef5d694477a5806b8d7752 SHA1 8e436ac03a2632c3f7147d608b70e853e5d78c1e SHA256 748ae3c2a659ffa814d3315181c47e9b1b44c1aef992dcae12cdfdbf2b6944af -MISC ChangeLog 1968 RMD160 0c882050055cd6992ee138deb05796c93374aea8 SHA1 9fc9d1c8d31f0fd70f3994e6a91fb0816b8ae3be SHA256 53d84584d81972b5540763b665f971c54b5604bdce6cd91ad94927a63bdac799 +EBUILD ucon64-2.0.0.ebuild 1610 RMD160 a3767f674bfb179901ab36d6b3949c4d4f50a5a0 SHA1 cd10b7a28c19d4d7f3bb34a273cd0aa00cae955a SHA256 da217ad6f303579a20676c95234f36779120bfac0e77b054049e56f5cd4db2de +MISC ChangeLog 2132 RMD160 93ad6b41d51c329e84db51cdd5a967d857c32589 SHA1 c8428cc5e888406c9d5e69ca160dd321e42fd094 SHA256 096b94ac252e23b36cb20bcf2fee850b48c6b5b4a67fc4f53f71e27ece31a865 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEARECAAYFAk58yioACgkQIY77eQFFFC3LNQCeLKP2VHk1nCpguDa6aR0P234j +z0kAoMiSb8SDStVNlm6AC03QVS+Cx0aO +=uu/o +-----END PGP SIGNATURE----- diff --git a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch new file mode 100644 index 000000000000..f7a371ab69ec --- /dev/null +++ b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch @@ -0,0 +1,25 @@ +--- misc/unzip.h.old 2011-09-23 19:53:09.708884325 +0200 ++++ misc/unzip.h 2011-09-23 19:54:00.012878355 +0200 +@@ -49,6 +49,10 @@ + #include "zlib.h" + #endif + ++#ifndef OF ++#define OF(x) x ++#endif ++ + #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) + /* like the STRICT of WIN32, we define a pointer that cannot be converted + from (void*) without cast */ +--- libdiscmage/unzip.h.old 2011-09-23 19:59:47.319837133 +0200 ++++ libdiscmage/unzip.h 2011-09-23 20:00:07.230834769 +0200 +@@ -48,6 +48,9 @@ + #ifndef _ZLIB_H + #include "zlib.h" + #endif ++#ifndef OF ++#define OF(x) x ++#endif + + #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) + /* like the STRICT of WIN32, we define a pointer that cannot be converted diff --git a/games-util/ucon64/ucon64-2.0.0.ebuild b/games-util/ucon64/ucon64-2.0.0.ebuild index 880d5f0ae4c5..b7eda810d728 100644 --- a/games-util/ucon64/ucon64-2.0.0.ebuild +++ b/games-util/ucon64/ucon64-2.0.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/ucon64/ucon64-2.0.0.ebuild,v 1.9 2010/11/04 08:20:12 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/ucon64/ucon64-2.0.0.ebuild,v 1.10 2011/09/23 18:05:42 tupone Exp $ EAPI=2 inherit eutils @@ -19,7 +19,8 @@ DEPEND="" S=${WORKDIR}/${P}-src/src src_prepare() { - epatch "${FILESDIR}"/${P}-ovflfix.patch + epatch "${FILESDIR}"/${P}-ovflfix.patch \ + "${FILESDIR}"/${P}-zlib.patch sed -i \ -e "/^CFLAGS/s/-O3/${CFLAGS}/" \ -e "/^LDFLAGS/s/-s$/${LDFLAGS}/" \ |