Rename png_set_gray_1_2_4_to_8 to png_set_expand_gray_1_2_4_to_8 in configure.in...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index 7bcc3b3a3de765edcd8f25f4fa61f71792f76383..1dc22fd6478c7a1a398ae126797373111783f2f0 100644 (file)
--- 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/Manifest b/app-office/magicpoint/Manifest
index 1fe49f37ac8c304c2f5543a8a0c1cc67001ef4b3..66dd931e257f20afec8ea59733cad0389fed5027 100644 (file)
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50magicpoint-gentoo.el 195 RMD160 68d7e6b0045a8ecd0954c08316ac93c199800546 SHA1 2a601792bf53b379e1f76aafce77737c9c761cec SHA256 7c1e59dcef2d74a065deccfdb3a507fd09b32201f27e90e8f86557c15082ea56
 AUX magicpoint-1.11b-gentoo.diff 1412 RMD160 91ad19240d3ca19af511449e21233e871a5d1252 SHA1 344f0990c136113ed79e3e5a60202fd3e5e35fe7 SHA256 64111b050a4ca31c97c975e4bbbe150474e4fd8a3fbec3dfc3adae45587647d3
 AUX magicpoint-1.12a-implicit-declaration.patch 782 RMD160 8e0a826674a1d56cc054cd6969783e11badb5715 SHA1 aa1289d8adafc3bc926a7aeb6d94f7741ac3d942 SHA256 b1321aa0b89e2687c2566a0d280d4d1627f68bf06941eb37db98e9ffad41c194
@@ -8,13 +5,6 @@ AUX magicpoint-1.13a-implicit-declaration.patch 236 RMD160 cda40b74c804ac4514c8a
 DIST magicpoint-1.12a.tar.gz 884584 RMD160 a01f835a63a9e93d377861f472990e3f3a70b724 SHA1 2600ba10744be421d7968748390036c16a96f831 SHA256 8b999e76d569d31830c9a54ee2c9a2e1004e7c04b0ad3ea8d0d7f47518d58198
 DIST magicpoint-1.13a.tar.gz 890670 RMD160 067d7dee3b90ec354975d9ad4ea0c0df48cca191 SHA1 2bc662ad0a482d42578766258a143b06a4718ae3 SHA256 205e6752e3cb024bcce0583b43dafc9b89490c0016daa91d2486891edcf2cfc1
 EBUILD magicpoint-1.12a-r1.ebuild 3155 RMD160 1858bcb18fe6ae7c6a2a2fd8630c83b939945059 SHA1 f49b23a72651bb568d8d9b4308736d6ac446c804 SHA256 134bded73c329c658937e1519bd13c91b34859829f4e31d28c33da7d3bc0f00f
-EBUILD magicpoint-1.13a.ebuild 3157 RMD160 a404e47587d99283935f33246ff63b9e58fe10a6 SHA1 1e74f857ff158bea2b3f4aa68df9931480758dac SHA256 bfb2ad628dfa54cc0ead8426ee2e850f4b1dc46804faec083e8b5201947b8f44
-MISC ChangeLog 8953 RMD160 820d7f0e98ca59b4456f7594799696f029f4076b SHA1 0f216ff83d6f30d2f8de34eecf9c3805f6efe974 SHA256 e6cf48ed981cba692520bd40f221cfbe4883e9da8b08938b1d0d003017854af3
+EBUILD magicpoint-1.13a.ebuild 3306 RMD160 9c1b199254198d977bea7ba86ce024d710e5d6fb SHA1 2a7c05f557dc76e67d5c33efe17b77c0ecc73be7 SHA256 6da0b832028da36da393bd75c4fcb6829d17fc37ed443912f02ccd889d86b769
+MISC ChangeLog 9203 RMD160 1253c51b4ee303bdd64ec272a45bf3e71643c122 SHA1 7a085bddf69d30ff6eae2ba7f205418f010422de SHA256 f73f3f97238b3e771c3a573a564b2e1fc5c98a5033fdc96b6566e01ac9240c7f
 MISC metadata.xml 606 RMD160 caa62195feeddd59fe00d1017f3e0daa3573e541 SHA1 5a250270e662981601e61ce6cae3c4fc6b312026 SHA256 eaf71d314fa811c9386db3172fe924d4f2d765dddcf54513ddd8997bbbe8925e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAknN+X0ACgkQOeoy/oIi7uwEWQCg017dRDJmOfCdkbQhFPhPtwLb
-dYcAoKEBBEppSowbi4i7DGxrndbmkcWq
-=oyJo
------END PGP SIGNATURE-----

diff --git a/app-office/magicpoint/magicpoint-1.13a.ebuild b/app-office/magicpoint/magicpoint-1.13a.ebuild
index 78a4358b90e2d95bae94c8235e6e3e2f261f605b..ebc820f18ea9c1b5ec72cc2a6691366f2530bf7d 100644 (file)
--- 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