summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-05-26 10:24:27 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-05-26 10:24:27 +0000
commitd48553c4519eb400b818fc89ef757db8bcda29b2 (patch)
treed678ab2988c47dd1d59cb376b395984d151d8b92 /app-office/magicpoint
parentVersion bump. Drop old. (diff)
downloadgentoo-2-d48553c4519eb400b818fc89ef757db8bcda29b2.tar.gz
gentoo-2-d48553c4519eb400b818fc89ef757db8bcda29b2.tar.bz2
gentoo-2-d48553c4519eb400b818fc89ef757db8bcda29b2.zip
Rename png_set_gray_1_2_4_to_8 to png_set_expand_gray_1_2_4_to_8 in configure.in and image/png.c for libpng14 compability wrt #321531 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-office/magicpoint')
-rw-r--r--app-office/magicpoint/ChangeLog10
-rw-r--r--app-office/magicpoint/magicpoint-1.13a.ebuild9
2 files changed, 15 insertions, 4 deletions
diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index 7bcc3b3a3de7..1dc22fd6478c 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-office/magicpoint
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.40 2009/03/28 10:17:12 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.41 2010/05/26 10:24:27 ssuominen Exp $
+
+ 26 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+ magicpoint-1.13a.ebuild:
+ Rename png_set_gray_1_2_4_to_8 to png_set_expand_gray_1_2_4_to_8 in
+ configure.in and image/png.c for libpng14 compability wrt #321531 by Diego
+ E. Pettenò.
28 Mar 2009; Ulrich Mueller <ulm@gentoo.org> files/50magicpoint-gentoo.el,
-files/50mgp-mode-gentoo.el:
diff --git a/app-office/magicpoint/magicpoint-1.13a.ebuild b/app-office/magicpoint/magicpoint-1.13a.ebuild
index 78a4358b90e2..ebc820f18ea9 100644
--- a/app-office/magicpoint/magicpoint-1.13a.ebuild
+++ b/app-office/magicpoint/magicpoint-1.13a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.13a.ebuild,v 1.2 2009/01/04 20:24:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.13a.ebuild,v 1.3 2010/05/26 10:24:27 ssuominen Exp $
inherit autotools elisp-common eutils fixheadtails
@@ -18,6 +18,7 @@ MY_DEPEND="x11-libs/libICE
x11-libs/libSM
x11-libs/libXrender
x11-libs/libXmu
+ >=media-libs/libpng-1.2.43-r2
gif? ( >=media-libs/giflib-4.0.1 )
imlib? ( media-libs/imlib )
truetype? ( x11-libs/libXft )
@@ -42,6 +43,10 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-1.11b-gentoo.diff"
epatch "${FILESDIR}/${P}-implicit-declaration.patch"
+ sed -i \
+ -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+ configure.in image/png.c || die
+
# bug #85720
sed -i -e "s/ungif/gif/g" configure.in || die "sed failed"
ht_fix_file configure.in