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
commit4b0859187e790cfa7e8586da82e1bc15852e3166 (patch)
tree58de50bae83e38cf879369d7faec38dcfb31d14a /games-util/ucon64
parentAdd patch to build _snackmodule.so #395275 (diff)
downloadhistorical-4b0859187e790cfa7e8586da82e1bc15852e3166.tar.gz
historical-4b0859187e790cfa7e8586da82e1bc15852e3166.tar.bz2
historical-4b0859187e790cfa7e8586da82e1bc15852e3166.zip
Fix build with new zlib. Bug #408645
Package-Manager: portage-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/Manifest10
-rw-r--r--games-util/ucon64/files/ucon64-2.0.0-zlib.patch20
3 files changed, 31 insertions, 7 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/Manifest b/games-util/ucon64/Manifest
index 8a94c72f6466..d2c07398e538 100644
--- a/games-util/ucon64/Manifest
+++ b/games-util/ucon64/Manifest
@@ -2,15 +2,15 @@
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
+AUX ucon64-2.0.0-zlib.patch 1274 RMD160 e5bd64cb7e4a5db0688e0aff530f20eaf43e9125 SHA1 116ae4f6c71e5219dbbe5cc1aff769eb617e7075 SHA256 e8e8a3f78643630d57332747387a776e7742001507f43f494aa543121f8c98e9
DIST ucon64-2.0.0-src.tar.gz 1188488 RMD160 c28921cfae1a010db917b96be542c089690b374c SHA1 8782bbc2bf5760fafe3fa4cd02b67991d984a973 SHA256 62064324a1912387f84ac9d4c521c5d5e7b80f2567e9f61bf0ab3e1d976c0127
EBUILD ucon64-2.0.0.ebuild 1610 RMD160 a3767f674bfb179901ab36d6b3949c4d4f50a5a0 SHA1 cd10b7a28c19d4d7f3bb34a273cd0aa00cae955a SHA256 da217ad6f303579a20676c95234f36779120bfac0e77b054049e56f5cd4db2de
-MISC ChangeLog 2132 RMD160 93ad6b41d51c329e84db51cdd5a967d857c32589 SHA1 c8428cc5e888406c9d5e69ca160dd321e42fd094 SHA256 096b94ac252e23b36cb20bcf2fee850b48c6b5b4a67fc4f53f71e27ece31a865
+MISC ChangeLog 2274 RMD160 7c21eed19e303e69ff2b4159350ab3fad09c6e58 SHA1 51213a8aa206eced55b03d680ad5e99ac9878915 SHA256 b012c5a438ca555bfe725164abf5d9ce302fd478fad802f99e16959e1e9e0629
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
+iEYEARECAAYFAk9m5EkACgkQIY77eQFFFC2suQCgru5k0faYvd0jfk64EeDvUrFZ
+epwAoJq9rtiRwr4YnCJi+Y6okdDfmjjZ
+=e7rd
-----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
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>