Fix building with libpng14 wrt #308741 by Locke Shinseiko.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

diff --git a/games-board/gtkatlantic/ChangeLog b/games-board/gtkatlantic/ChangeLog
index cfe4272f4c8def1db01b5c7aee2a2ca34525e0e7..0b2e893662b7586cfa86d9f8ad8713c261b83c17 100644 (file)
--- 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/Manifest b/games-board/gtkatlantic/Manifest
index 44c92a01c5d7ee4eb161c89b7881b306488409ce..b55d97bd59302ce3dd2f6848394795e9ba018ab1 100644 (file)
--- a/games-board/gtkatlantic/Manifest
+++ b/games-board/gtkatlantic/Manifest
@@ -1,4 +1,5 @@
+AUX gtkatlantic-0.4.2-libpng14.patch 418 RMD160 e011204098a69f9fe2243abd439134427eb52dde SHA1 030e66aa288d2090021ca35eb275a7ff07390a53 SHA256 e6dbf82f166cecb37fbaeed44433009c20ca4c568d3c77be7426ad7362c2cd47
 DIST gtkatlantic-0.4.2.tar.bz2 779687 RMD160 2da135e34563cf27163bdae096764c41927303d2 SHA1 806c802d614f17706ea6cda5daaee87e42c89b33 SHA256 44af09fba5a71f2e6462206b6e6f32ac89c91afd9383c5860e632fa31491bd75
-EBUILD gtkatlantic-0.4.2.ebuild 722 RMD160 ce4a7ec7ddbde5e35b4c57fb80d8564b22d4c9e1 SHA1 d2e1bd7bc8ae5ba7895615a2df8fc5c6bfebc4c3 SHA256 16c0de880438c45ce4daad6febff606b7cc8bd02c878a6fd78a7438ce11c1bcd
-MISC ChangeLog 2185 RMD160 1b8c61afad7aa5c601712575f95d2c8c333aa6a4 SHA1 b694b13685e5d73d1172a237a6b732e3227aa52d SHA256 0960110c236d498abca6556f108d23502572d654dc667f51e9c51674e4f35e99
+EBUILD gtkatlantic-0.4.2.ebuild 800 RMD160 9d5a7fd7483952bb52f6b41e881ab580b604a1f1 SHA1 014479ade0b5fcfac8659451e80cf6d4e1eb010c SHA256 a088c6c0531abb2f335ed56d3b9a6ad116041cf85de9c24f6f361c6a65a97598
+MISC ChangeLog 2375 RMD160 f74e094ae325fed9ab593c1bd5fdb5b515160e2d SHA1 44949e894475f4ef698430d9d80841ce00885df2 SHA256 13ee3acc4082aa073f9243173e0cd9405930bbaf47f7a157cc569c16df7dabe0
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

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 (file)
index 0000000..4c25959
--- /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 bb48a65324fd285bde90bdb6242e486ee57e18b6..2185133b2c0812f1a4f8c5457568b7fe3bea0fd2 100644 (file)
--- 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