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
commita10afea8a50c4c18c7a8ed7c9761d15a398f8d1b (patch)
treedbaf78ad5597f83472f1d2f0f5e2e352217e8438 /games-emulation/visualboyadvance
parentCleanup (diff)
downloadgentoo-2-a10afea8a50c4c18c7a8ed7c9761d15a398f8d1b.tar.gz
gentoo-2-a10afea8a50c4c18c7a8ed7c9761d15a398f8d1b.tar.bz2
gentoo-2-a10afea8a50c4c18c7a8ed7c9761d15a398f8d1b.zip
Fix build with zlib-1.2.6 (bug #403487).
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'games-emulation/visualboyadvance')
-rw-r--r--games-emulation/visualboyadvance/ChangeLog9
-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
3 files changed, 23 insertions, 5 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/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