summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-09-15 19:24:43 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-09-15 19:24:43 +0000
commitaa9c4b3bfff32a453a37a7351d7a2f9dfb95d3b3 (patch)
tree5473a308a050d8e5bf3d6a87e68d3d5333ce61df /x11-libs
parentLastrite net-ftp/ftpcube wrt #201314, #330683 (diff)
downloadgentoo-2-aa9c4b3bfff32a453a37a7351d7a2f9dfb95d3b3.tar.gz
gentoo-2-aa9c4b3bfff32a453a37a7351d7a2f9dfb95d3b3.tar.bz2
gentoo-2-aa9c4b3bfff32a453a37a7351d7a2f9dfb95d3b3.zip
Fix building with libpng15 wrt #380833 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/wxGTK/ChangeLog5
-rw-r--r--x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild4
2 files changed, 7 insertions, 2 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 2e8349f4da00..3936d59de44a 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/wxGTK
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.269 2011/07/16 09:32:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.270 2011/09/15 19:24:43 ssuominen Exp $
+
+ 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> wxGTK-2.6.4.0-r6.ebuild:
+ Fix building with libpng15 wrt #380833 by Diego Elio Pettenò
16 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> wxGTK-2.8.11.0.ebuild:
ppc64 stable wrt #364203
diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
index 04502598a514..c783fa6c8747 100644
--- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.11 2011/03/29 13:01:08 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.12 2011/09/15 19:24:43 ssuominen Exp $
EAPI=1
inherit eutils versionator flag-o-matic
@@ -58,6 +58,8 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ sed -i -e 's:voidp:png_voidp:' src/common/imagpng.cpp || die # Bug 380833
+
# General Patches
epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch