summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-09 22:05:35 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-09 22:05:35 +0000
commitb742152618f9ce66defd8ccfd97f798839e4d29d (patch)
tree3ee9e34a6f0c4d1ca5e3d917ac7d56cea43a60f3 /games-board/gtkatlantic
parentMarked ppc stable for bug #303727. (diff)
downloadgentoo-2-b742152618f9ce66defd8ccfd97f798839e4d29d.tar.gz
gentoo-2-b742152618f9ce66defd8ccfd97f798839e4d29d.tar.bz2
gentoo-2-b742152618f9ce66defd8ccfd97f798839e4d29d.zip
Fix building with libpng14 wrt #308741 by Locke Shinseiko.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'games-board/gtkatlantic')
-rw-r--r--games-board/gtkatlantic/ChangeLog8
-rw-r--r--games-board/gtkatlantic/files/gtkatlantic-0.4.2-libpng14.patch14
-rw-r--r--games-board/gtkatlantic/gtkatlantic-0.4.2.ebuild13
3 files changed, 29 insertions, 6 deletions
diff --git a/games-board/gtkatlantic/ChangeLog b/games-board/gtkatlantic/ChangeLog
index cfe4272f4c8d..0b2e893662b7 100644
--- a/games-board/gtkatlantic/ChangeLog
+++ b/games-board/gtkatlantic/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-board/gtkatlantic
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gtkatlantic/ChangeLog,v 1.15 2008/01/24 07:57:28 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkatlantic/ChangeLog,v 1.16 2010/03/09 22:05:34 ssuominen Exp $
+
+ 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+ gtkatlantic-0.4.2.ebuild, +files/gtkatlantic-0.4.2-libpng14.patch:
+ Fix building with libpng14 wrt #308741 by Locke Shinseiko.
24 Jan 2008; Tristan Heaven <nyhm@gentoo.org> gtkatlantic-0.4.2.ebuild:
Add pkgconfig dep, bug #206308
diff --git a/games-board/gtkatlantic/files/gtkatlantic-0.4.2-libpng14.patch b/games-board/gtkatlantic/files/gtkatlantic-0.4.2-libpng14.patch
new file mode 100644
index 000000000000..4c2595911299
--- /dev/null
+++ b/games-board/gtkatlantic/files/gtkatlantic-0.4.2-libpng14.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/308741
+http://aur.archlinux.org/packages/gtkatlantic/gtkatlantic/libpng14.patch
+
+--- src/readpng.c
++++ src/readpng.c
+@@ -33,7 +33,7 @@ gboolean readpng_init(FILE *infile, png_
+ png_uint_32 width, height;
+
+ fread(sig, 1, 8, infile);
+- if (!png_check_sig(sig, 8))
++ if (png_sig_cmp(sig, 0, 8))
+ return FALSE;
+
+ *png_struct = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
diff --git a/games-board/gtkatlantic/gtkatlantic-0.4.2.ebuild b/games-board/gtkatlantic/gtkatlantic-0.4.2.ebuild
index bb48a65324fd..2185133b2c08 100644
--- a/games-board/gtkatlantic/gtkatlantic-0.4.2.ebuild
+++ b/games-board/gtkatlantic/gtkatlantic-0.4.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gtkatlantic/gtkatlantic-0.4.2.ebuild,v 1.3 2008/01/24 07:57:28 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkatlantic/gtkatlantic-0.4.2.ebuild,v 1.4 2010/03/09 22:05:34 ssuominen Exp $
-inherit games
+EAPI=2
+inherit eutils games
DESCRIPTION="Monopoly-like game that works with the monopd server"
HOMEPAGE="http://gtkatlantic.gradator.net/"
@@ -13,12 +14,16 @@ SLOT="0"
KEYWORDS="~amd64 ppc x86"
IUSE=""
-RDEPEND="=x11-libs/gtk+-2*
+RDEPEND="x11-libs/gtk+:2
dev-libs/libxml2
media-libs/libpng"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-libpng14.patch
+}
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
dodoc AUTHORS ChangeLog NEWS README