summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-08-07 16:54:27 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-08-07 16:54:27 +0000
commit188abdb96943199b2950af7906458ed3778b9f40 (patch)
treef6cba7eb30c31782b86d02f9fff8a5da988801b3 /media-gfx
parentalpha/ia64/s390/sh/sparc stable wrt #376437 (diff)
downloadhistorical-188abdb96943199b2950af7906458ed3778b9f40.tar.gz
historical-188abdb96943199b2950af7906458ed3778b9f40.tar.bz2
historical-188abdb96943199b2950af7906458ed3778b9f40.zip
Fix building with libpng15 wrt #377363 by Stuart Longland
Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/xsane/ChangeLog5
-rw-r--r--media-gfx/xsane/xsane-0.998.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 56dcfc8dfa27..5511bce31765 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/xsane
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.86 2011/07/08 13:04:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.87 2011/08/07 16:54:27 ssuominen Exp $
+
+ 07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> xsane-0.998.ebuild:
+ Fix building with libpng15 wrt #377363 by Stuart Longland
*xsane-0.998 (08 Jul 2011)
diff --git a/media-gfx/xsane/xsane-0.998.ebuild b/media-gfx/xsane/xsane-0.998.ebuild
index a46d9dd008c8..4b4b65fcb565 100644
--- a/media-gfx/xsane/xsane-0.998.ebuild
+++ b/media-gfx/xsane/xsane-0.998.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/media-gfx/xsane/xsane-0.998.ebuild,v 1.1 2011/07/08 13:04:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.998.ebuild,v 1.2 2011/08/07 16:54:27 ssuominen Exp $
EAPI="4"
@@ -42,6 +42,9 @@ pkg_setup() {
src_prepare() {
# Apply multiple fixes from different distributions
epatch "${WORKDIR}/${P}-patches"/*.patch
+
+ # Fix compability with libpng15 wrt #377363
+ sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die
}
src_configure() {