summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-02-18 08:26:15 +0000
committerTim Harder <radhermit@gentoo.org>2012-02-18 08:26:15 +0000
commit50a12690021e189744e47ea5c807566347e9e00d (patch)
tree80db7e4433853b3d935ea2188cb35a18cb766a0a /games-emulation
parentIntrospection option was being ignored at configure time, bug #403567 by Patr... (diff)
downloadhistorical-50a12690021e189744e47ea5c807566347e9e00d.tar.gz
historical-50a12690021e189744e47ea5c807566347e9e00d.tar.bz2
historical-50a12690021e189744e47ea5c807566347e9e00d.zip
Fix build with zlib-1.2.6 (bug #403487).
Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/visualboyadvance/ChangeLog9
-rw-r--r--games-emulation/visualboyadvance/Manifest17
-rw-r--r--games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib-1.2.6.patch12
-rw-r--r--games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild7
4 files changed, 34 insertions, 11 deletions
diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index afad996d777e..6f7c80f14aa3 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-emulation/visualboyadvance
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.38 2011/12/12 19:07:33 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.39 2012/02/18 08:26:15 radhermit Exp $
+
+ 18 Feb 2012; Tim Harder <radhermit@gentoo.org>
+ visualboyadvance-1.7.2-r3.ebuild,
+ +files/visualboyadvance-1.7.2-zlib-1.2.6.patch:
+ Fix build with zlib-1.2.6 (bug #403487).
*visualboyadvance-1.7.2-r3 (12 Dec 2011)
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index c9b810185dfe..213fe4c8294c 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX 1.7.2-gcc34.patch 1354 RMD160 6a3764040df0e166ca7c9e984bd6553264685460 SHA1 8e4b8f2abb93119c0fd7576bff981cf0d771076c SHA256 82c4ec3170fc982eaf5665c44ce2b767868d81f522adf45325df4a7a680d9ac5
AUX 1.7.2-gcc41.patch 1441 RMD160 bb1ddefb515022876c1ad7479b4308be4b77fab7 SHA1 531384f5d8e7f6c39951a5c946de12de618a309e SHA256 ec5f42182e6daabe560d3437ca0f95054dc5355dd32a972f923d8ba98bba88e6
@@ -8,17 +8,22 @@ AUX visualboyadvance-1.7.2-glibc2.10.patch 1827 RMD160 0d1d604dae7fd8e577eb594ca
AUX visualboyadvance-1.7.2-libpng15.patch 230 RMD160 b75ae02c13c872959efe1e6c01ed5f1efc67cdd0 SHA1 2745f29042c78f471660ebd4c0dbd9d932284632 SHA256 5715dd370b8ca891b81f3b0c7dd53dd08bf297964fbfeb0bf032244e525c5618
AUX visualboyadvance-1.7.2-ovflfix.patch 368 RMD160 696033358f8a5ab02d7b4cea0a69297524d27cca SHA1 8db91f206ddf22e07dfdd6c8457cce1e2e4d193c SHA256 8768ed788210362a367b13cff2794379ec2b2058ba5cc61228bae0519c80277a
AUX visualboyadvance-1.7.2-uninit.patch 530 RMD160 2fdb59ba6038290f5e50339ff489e04a5070de77 SHA1 4eb9a2d4f098fad9e87bfd8447b2707cc622b3a4 SHA256 ba2d6f3dde29a40616b566770c215caa23353f7e8b1e44053c6299727c9402af
+AUX visualboyadvance-1.7.2-zlib-1.2.6.patch 532 RMD160 15564d910e81160157b3b3cac698657dfd03d9a3 SHA1 6c34f6d35235bafa6f84ab39462031ff26f3161f SHA256 2a853ad88a5a7ff1af61ea9e798243ab642bf92fffb63d72b736e5c763f921e4
AUX visualboyadvance-1.7.2-zlib.patch 4367 RMD160 56cb490856d5e6c602b334064f968d7d6b250ab8 SHA1 a56314ef4dd06d20e14310c617c022ea0604d085 SHA256 c1928b1b32a71b6112816746dd8c4019c957500701020042f460379272c2f571
DIST VisualBoyAdvance-src-1.7.2.tar.gz 1410762 RMD160 44f94a4f270f2cda25879681c52892f6978caf99 SHA1 04d82406079563fd17cda07f72488185e9152f51 SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7
DIST visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2 2892 RMD160 48ffe6634bd2407eef688e13dff56b645fa95339 SHA1 d05d162544aec4e346e2d4a259b6594dd12e0475 SHA256 cf61ddf1e806d3c3152a7102414929d96614319a84481333a9fca7dc640dd74b
EBUILD visualboyadvance-1.7.2-r2.ebuild 2073 RMD160 f4f41de66978fa1394ff77f63cb1e1a6681d03ba SHA1 4a6a6032db7eb91a3a311fd7e5410ef4218edaca SHA256 e0ff89fdfbd508614f1e05b0ea03353ef5f4cb260b43bb3ef889d836944ea34e
-EBUILD visualboyadvance-1.7.2-r3.ebuild 2155 RMD160 b84e15a5498ecfd81f759e16e231ef9483c57c28 SHA1 bb351ba9f7bf72e77c4b0782a0342666c0187b63 SHA256 d5c7bb8ea0bdfef1745889d42de05b8fea1164e3441c9ad12b4458d36b06c91d
-MISC ChangeLog 6253 RMD160 cc9c484af0000e4458375355adef554ef73d6ab4 SHA1 30e1372218c355f74e15f64c7a98ff145e957e7a SHA256 a8927b4248b0a7efb427cfd8629b0672a5957e9990386678c0a7f835a114d24f
+EBUILD visualboyadvance-1.7.2-r3.ebuild 2198 RMD160 29d310479ebb95f7d35b49beb07cb5e6a6afb59e SHA1 260f82cd3f4eb32aaa365fc845c26d082c2d7e60 SHA256 388dabb506f9d81c134097228f0417fc8642b6f331eea234e4530c289186a908
+MISC ChangeLog 6435 RMD160 33430b055a36f7d41443ca25eb2f0783bd97fc49 SHA1 33f6c89534a72627b38503a3475525c11bee269a SHA256 ea7b5efa6d5590c4536c42ba5d509a326b7ba237e4409692db00a26fb0c1d2cd
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk7mULwACgkQIY77eQFFFC3kRgCgnftPVJr7w20j98Ixlv/ZdcHc
-jQUAoNOsJybpLhk4UZBAPLzJUNgsNpJe
-=XxyS
+iQEcBAEBCgAGBQJPP2CtAAoJEEqz6FtPBkyj6rkIALjlFWxPosD2x6DeMJu1SmhU
+v1EcG3yqEmb9HI1P6AWyh9JdoahdkrqaGVexf7qwDoHfhSLM8ydL2sFqgICKyEvC
+xa0Epc3r7uBNgvu2IHJStTjd0o/A0xG+IM7v5zQdp9MCYzTjfokdnMpe8uBcHVjS
+t4GpAQkRkzwMnF/KgfgsxOvKDuVSQXbHmkOOAAXBUv9N8WFoTK2+H22sQtdu/ng1
+UVr3dnUgL1yTXRw8x/FJfYtH+ZXBktI+5ESA/794/aN66BOJAS+UtgEL5JKEAj1k
+Xyms9dPgV8oMt1Ck4aFXIN3WnPn4b+OCPQVGw2dFgWaEYnDwG25JcjSLsfg6GO8=
+=e6Th
-----END PGP SIGNATURE-----
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib-1.2.6.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib-1.2.6.patch
new file mode 100644
index 000000000000..a24ddcba9a56
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib-1.2.6.patch
@@ -0,0 +1,12 @@
+diff -ur VisualBoyAdvance-1.7.2.orig/src/Util.cpp VisualBoyAdvance-1.7.2/src/Util.cpp
+--- VisualBoyAdvance-1.7.2.orig/src/Util.cpp 2004-05-20 10:42:37.000000000 -0700
++++ VisualBoyAdvance-1.7.2/src/Util.cpp 2012-02-18 00:21:40.655194387 -0800
+@@ -984,7 +984,7 @@
+
+ gzFile utilGzOpen(const char *file, const char *mode)
+ {
+- utilGzWriteFunc = (int (*)(void *,void * const, unsigned int))gzwrite;
++ utilGzWriteFunc = (int (*)(gzFile, void * const, unsigned int))gzwrite;
+ utilGzReadFunc = gzread;
+ utilGzCloseFunc = gzclose;
+
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild
index f3fe7652c890..956a33c0ac8e 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild,v 1.1 2011/12/12 19:07:33 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild,v 1.2 2012/02/18 08:26:15 radhermit Exp $
EAPI=2
inherit eutils flag-o-matic autotools games
@@ -47,7 +47,8 @@ src_prepare() {
"${FILESDIR}"/${P}-glibc2.10.patch \
"${FILESDIR}"/${P}-ovflfix.patch \
"${FILESDIR}"/${P}-libpng15.patch \
- "${FILESDIR}"/${P}-zlib.patch
+ "${FILESDIR}"/${P}-zlib.patch \
+ "${FILESDIR}"/${P}-zlib-1.2.6.patch
eautoreconf