diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2011-02-15 17:57:52 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2011-02-15 17:57:52 +0000 |
| commit | 3238fcb120f430e34a7524d65b8881f136d056c6 (patch) | |
| tree | c2a4ef6fcec4eb7446039dfd6537e0bbbc78d354 /games-puzzle/pingus | |
| parent | Version bump. (diff) | |
| download | historical-3238fcb120f430e34a7524d65b8881f136d056c6.tar.gz historical-3238fcb120f430e34a7524d65b8881f136d056c6.tar.bz2 historical-3238fcb120f430e34a7524d65b8881f136d056c6.zip | |
add patch for working with libpng15 submitted by Lars Wendler via bug #355065
Package-Manager: portage-2.1.9.25/cvs/Linux i686
Diffstat (limited to 'games-puzzle/pingus')
| -rw-r--r-- | games-puzzle/pingus/ChangeLog | 9 | ||||
| -rw-r--r-- | games-puzzle/pingus/Manifest | 5 | ||||
| -rw-r--r-- | games-puzzle/pingus/files/pingus-0.7.3-libpng15.patch | 15 | ||||
| -rw-r--r-- | games-puzzle/pingus/pingus-0.7.3.ebuild | 8 |
4 files changed, 30 insertions, 7 deletions
diff --git a/games-puzzle/pingus/ChangeLog b/games-puzzle/pingus/ChangeLog index 446903cf9fa8..29fb391befe2 100644 --- a/games-puzzle/pingus/ChangeLog +++ b/games-puzzle/pingus/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-puzzle/pingus -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.29 2010/11/19 22:40:35 mr_bones_ Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.30 2011/02/15 17:57:52 mr_bones_ Exp $ + + 15 Feb 2011; Michael Sterrett <mr_bones_@gentoo.org> pingus-0.7.3.ebuild, + +files/pingus-0.7.3-libpng15.patch: + add patch for working with libpng15 submitted by Lars Wendler via bug + #355065 19 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org> pingus-0.7.3.ebuild: use scons-utils diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest index c0db6d9b24b6..d6e8e5410aa8 100644 --- a/games-puzzle/pingus/Manifest +++ b/games-puzzle/pingus/Manifest @@ -1,5 +1,6 @@ +AUX pingus-0.7.3-libpng15.patch 406 RMD160 8bbb216ef3b7c93c7ac7193e24da6548e861efbe SHA1 3b5dc536e1b04594495c7a36f31bde8a2e4de06a SHA256 adea10884d4ede7cb2452b4242c3de7137a87de6952bdc87461b97ad1ed6ea29 AUX pingus-0.7.3-paths.patch 961 RMD160 9409f3d2fb56f81b0b0e5f8bfc17b3ad625c8b99 SHA1 5cf09662a9d812c77eb0699a45b1bfdbe7ded769 SHA256 d5e65707a4a9fb78c77d648a29e76ea3fe78c0038a099efbc1cb4272c70238ff DIST pingus-0.7.3.tar.bz2 11127278 RMD160 664d259a98a172d10480be9aa4ec87a424ecd6f1 SHA1 ca7fe5cea65fb3392d1e81056a879831925502f2 SHA256 e35be18a01a9a24a2013e809c216decdbd5a66e2fec7ad38f6d32b28b6b85637 -EBUILD pingus-0.7.3.ebuild 1203 RMD160 5a62c33f7ab7a139c63383d32c970d6d99b1d362 SHA1 e9d01b1212caba32445e78633e7bb8eff0c08edf SHA256 063e536754f30d73403028c2dd73a109466f2a308bf71394f41faaf8e1beeff6 -MISC ChangeLog 4619 RMD160 a8b0161b2dc8637f5635d6ab5ea8fbf87f0da432 SHA1 170dc30614e4dfa2469745d8deb56e1c92da766f SHA256 808d41620d22b9e790f02405e6c8cf951bb2c47cb9a46ace0de6082cd28b3ea0 +EBUILD pingus-0.7.3.ebuild 1245 RMD160 c5af5116cd788b44aeced523d94e48302833464d SHA1 81c1012d25ff1476e3758553a8990cce6da00027 SHA256 8549d7da4f62124def2ca5da58a243c525470c3f38fff7ef76090887a605d16b +MISC ChangeLog 4816 RMD160 c0a60d1cdbe6a0d626af0a3e15b3ec78a8bba3fe SHA1 a9e4323779574c9a7fcf059b18e915b505daa74e SHA256 cd218a3f68a9dcfb00f99f3e87723271ab49cd290065b604b31005bbffedae55 MISC metadata.xml 1036 RMD160 ccb350bc7dae29efd8711bd3b1b8636360e45805 SHA1 361bd933c8c672f4bd625bd5263a112d66a19592 SHA256 0a0a3a34e8835dd9d091dec06a62b46d7193737768e5db7e044ae446c1551720 diff --git a/games-puzzle/pingus/files/pingus-0.7.3-libpng15.patch b/games-puzzle/pingus/files/pingus-0.7.3-libpng15.patch new file mode 100644 index 000000000000..9260a9bbad4a --- /dev/null +++ b/games-puzzle/pingus/files/pingus-0.7.3-libpng15.patch @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2011/01/20 23:41:02 wiz Exp $ + +Fix build with png-1.5. + +--- src/screenshot.cpp.orig 2007-09-30 16:07:08.000000000 +0000 ++++ src/screenshot.cpp +@@ -159,7 +159,7 @@ Screenshot::save_png(const std::string& + return; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem reading the file + fclose(fp); diff --git a/games-puzzle/pingus/pingus-0.7.3.ebuild b/games-puzzle/pingus/pingus-0.7.3.ebuild index ea019aa0470a..dc3c5a94e287 100644 --- a/games-puzzle/pingus/pingus-0.7.3.ebuild +++ b/games-puzzle/pingus/pingus-0.7.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.3.ebuild,v 1.5 2010/11/19 22:40:35 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.3.ebuild,v 1.6 2011/02/15 17:57:52 mr_bones_ Exp $ EAPI=2 inherit eutils scons-utils toolchain-funcs games @@ -21,7 +21,9 @@ DEPEND="media-libs/libsdl[joystick,video] dev-libs/boost" src_prepare() { - epatch "${FILESDIR}"/${P}-paths.patch + epatch \ + "${FILESDIR}"/${P}-paths.patch \ + "${FILESDIR}"/${P}-libpng15.patch sed -i \ -e "s:GENTOO_BINDIR:${GAMES_BINDIR}:" \ -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \ |