diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2011-11-04 15:06:49 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2011-11-04 15:06:49 +0000 |
| commit | e89b1824f823d9b16788ea92937479943d76d8e2 (patch) | |
| tree | 1b83d8187784bf5a99bd9aff4d84d3060c7a0ec8 /gnustep-base | |
| parent | Add ~x86 keyword. (diff) | |
| download | gentoo-2-e89b1824f823d9b16788ea92937479943d76d8e2.tar.gz gentoo-2-e89b1824f823d9b16788ea92937479943d76d8e2.tar.bz2 gentoo-2-e89b1824f823d9b16788ea92937479943d76d8e2.zip | |
Add suport for libpng 1.5 in stable, thanks to ssuominen. Closes bug #389363
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'gnustep-base')
| -rw-r--r-- | gnustep-base/gnustep-gui/ChangeLog | 6 | ||||
| -rw-r--r-- | gnustep-base/gnustep-gui/files/gnustep-gui-0.18.0-libpng15.patch | 13 | ||||
| -rw-r--r-- | gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild | 11 |
3 files changed, 26 insertions, 4 deletions
diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog index 335a38ed76c3..5dd7c9978e63 100644 --- a/gnustep-base/gnustep-gui/ChangeLog +++ b/gnustep-base/gnustep-gui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnustep-base/gnustep-gui # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.90 2011/08/10 09:08:01 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.91 2011/11/04 15:06:49 voyageur Exp $ + + 04 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> + gnustep-gui-0.18.0.ebuild, +files/gnustep-gui-0.18.0-libpng15.patch: + Add suport for libpng 1.5 in stable, thanks to ssuominen. Closes bug #389363 10 Aug 2011; Fabian Groffen <grobian@gentoo.org> gnustep-gui-0.20.0.ebuild: Remove -Werror from OBJ_CFLAGS, bug #378179 diff --git a/gnustep-base/gnustep-gui/files/gnustep-gui-0.18.0-libpng15.patch b/gnustep-base/gnustep-gui/files/gnustep-gui-0.18.0-libpng15.patch new file mode 100644 index 000000000000..80f90b552801 --- /dev/null +++ b/gnustep-base/gnustep-gui/files/gnustep-gui-0.18.0-libpng15.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/389363 + +--- Source/NSBitmapImageRep+PNG.m ++++ Source/NSBitmapImageRep+PNG.m +@@ -229,7 +229,7 @@ + initWithBytesNoCopy: buf + length: bytes_per_row * height]; + +- if (PNG_INFO_gAMA & png_info->valid) ++ if (png_get_valid(png_struct, png_info, PNG_INFO_gAMA)) + { + double file_gamma = 2.2; + if (PNG_FLOATING_POINT) diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild index dbc2b21f7304..731f46974d4d 100644 --- a/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild +++ b/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild @@ -1,10 +1,10 @@ -# 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/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild,v 1.7 2010/11/08 13:21:25 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild,v 1.8 2011/11/04 15:06:49 voyageur Exp $ EAPI="3" -inherit gnustep-base multilib +inherit eutils gnustep-base multilib DESCRIPTION="Library of GUI classes written in Obj-C" HOMEPAGE="http://www.gnustep.org/" @@ -28,6 +28,11 @@ DEPEND="${GNUSTEP_CORE_DEPEND} app-text/aspell" RDEPEND="${DEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch + gnustep-base_src_prepare +} + src_configure() { egnustep_env |