Fix building with libpng15 wrt #378377 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index e6cd3e80a8091d2e99941b45bf216995c4cf4669..657a14e58c090adcd7bf8ed376f7c1541b6b85cd 100644 (file)
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/magicpoint
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.45 2010/09/15 15:30:00 klausman Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.46 2011/09/14 16:10:59 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> magicpoint-1.13a.ebuild,
+  +files/magicpoint-1.13a-libpng15.patch:
+  Fix building with libpng15 wrt #378377 by Diego Elio Pettenò
 
   15 Sep 2010; Tobias Klausmann <klausman@gentoo.org>
   magicpoint-1.13a.ebuild:

diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
index 7ed86b1e1448505a02e2a37f8a3c79284eb39df6..cbf57dff6625dfc57406d7fd056840cfd8c8c906 100644 (file)
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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.13a-implicit-declaration.patch 236 RMD160 cda40b74c804ac4514c8ae1d9292f6c93d669ab3 SHA1 1ef76635f6bef03d1d371a9e08ba8a4d33906e85 SHA256 5031b2f0011b0988596d23ba3f528109eed105b6501edca7cf01da8032c11b48
+AUX magicpoint-1.13a-libpng15.patch 240 RMD160 ff96655ecaabda32c56b9a28f0e155cc8a4cd81f SHA1 c18300d6cdb92268045cd3ab09e0c318dfa1c03a SHA256 22d3887872d72cdc755184bc104aa5ff801e00546a43ee9ec6021f7e38a8f698
 DIST magicpoint-1.13a.tar.gz 890670 RMD160 067d7dee3b90ec354975d9ad4ea0c0df48cca191 SHA1 2bc662ad0a482d42578766258a143b06a4718ae3 SHA256 205e6752e3cb024bcce0583b43dafc9b89490c0016daa91d2486891edcf2cfc1
-EBUILD magicpoint-1.13a.ebuild 3398 RMD160 45c52ee7498f865a71217cdae3a893bd6daa6d7e SHA1 72bed7699ca6a7957b6690ea8bc8219454104144 SHA256 5aaefe5606d29f1e6d3b1523fe7a40124ef6435fbd483a7ab0258622a65a3477
-MISC ChangeLog 9641 RMD160 625768006af4900609eae11e9144015197ee3745 SHA1 24e8e1fc2998fee7e4de688f81c3e3868369501d SHA256 7253100c2c1bccd5d8f83d87ae859af4cee30c0cf9a88a84144cfda329f9764d
+EBUILD magicpoint-1.13a.ebuild 3183 RMD160 8e6b6a9e8961c325dd8524e4ffaf8af2a8284f63 SHA1 81fec53ea4e880faefbae279e12c59e5f553cb22 SHA256 38fa65018541d7bb39b870758feb9c12c9144aad4d9d4637e7d4220cf207de0d
+MISC ChangeLog 9828 RMD160 1ac897730b0aa2c8b841b0068373903e8d4dd9e3 SHA1 e999947c8cc61e1eb583a7089e9d354771c00728 SHA256 2efeb65833147098d57226a9847dd4a7f1ed0d7bc035575b396cb03f4a54ec6e
 MISC metadata.xml 606 RMD160 caa62195feeddd59fe00d1017f3e0daa3573e541 SHA1 5a250270e662981601e61ce6cae3c4fc6b312026 SHA256 eaf71d314fa811c9386db3172fe924d4f2d765dddcf54513ddd8997bbbe8925e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5w0koACgkQXkR9YqOcLPFiFwEAqaimjX1SfZOjayzgri8qmx65
+8tf+EL2Wy+t72oRpCEEA/RjO9KJy3FpS1iA6VJe6wtl9lp+tpeTufsYlPdXmsoG8
+=vb0l
+-----END PGP SIGNATURE-----

diff --git a/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch b/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch
new file mode 100644 (file)
index 0000000..7990b46
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch
@@ -0,0 +1,11 @@
+--- image/png.c
++++ image/png.c
+@@ -86,7 +86,7 @@
+               return NULL;
+       }
+ 
+-      if (setjmp(png_ptr->jmpbuf)) {
++      if (setjmp(png_jmpbuf(png_ptr))) {
+               png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+               fclose(fp);
+               return NULL;

diff --git a/app-office/magicpoint/magicpoint-1.13a.ebuild b/app-office/magicpoint/magicpoint-1.13a.ebuild
index 14a571bc08f613c05dd312f3e76561e0958f98f3..ab9706a9355c71a8abb3b589aeb5bc2fcfe9808b 100644 (file)
--- a/app-office/magicpoint/magicpoint-1.13a.ebuild
+++ b/app-office/magicpoint/magicpoint-1.13a.ebuild
@@ -1,7 +1,8 @@
-# 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/app-office/magicpoint/magicpoint-1.13a.ebuild,v 1.7 2010/09/15 15:30:00 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.13a.ebuild,v 1.8 2011/09/14 16:10:59 ssuominen Exp $
 
+EAPI=4
 inherit autotools elisp-common eutils fixheadtails toolchain-funcs
 
 DESCRIPTION="An X11 based presentation tool"
@@ -18,7 +19,7 @@ MY_DEPEND="x11-libs/libICE
        x11-libs/libSM
        x11-libs/libXrender
        x11-libs/libXmu
-       >=media-libs/libpng-1.2.43-r2
+       >=media-libs/libpng-1.4
        gif? ( >=media-libs/giflib-4.0.1 )
        imlib? ( media-libs/imlib )
        truetype? ( x11-libs/libXft )
@@ -37,23 +38,24 @@ RDEPEND="${MY_DEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${PN}-1.11b-gentoo.diff"
-       epatch "${FILESDIR}/${P}-implicit-declaration.patch"
+src_prepare() {
+       epatch \
+               "${FILESDIR}"/${PN}-1.11b-gentoo.diff \
+               "${FILESDIR}"/${P}-implicit-declaration.patch \
+               "${FILESDIR}"/${P}-libpng15.patch
 
+       # fix compability with libpng14
        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"
+       sed -i -e "s/ungif/gif/g" configure.in || die
        ht_fix_file configure.in
        eautoreconf
 }
 
-src_compile() {
+src_configure() {
        econf \
                $(use_enable gif) \
                $(use_enable imlib) \
@@ -63,18 +65,20 @@ src_compile() {
                --disable-vflib \
                --disable-freetype \
                --x-libraries=/usr/lib/X11 \
-               --x-includes=/usr/include/X11 || die "econf failed"
+               --x-includes=/usr/include/X11
+}
 
-       xmkmf || die "xmkmf failed"
+src_compile() {
+       xmkmf || die
        # no parallel build possibly, anywhere
-       emake -j1 Makefiles || die "emake Makefiles failed"
-       emake -j1 clean || die "emake clean failed"
+       emake -j1 Makefiles
+       emake -j1 clean
        tc-export CC
        emake -j1 CC="${CC}" CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" \
-               BINDIR=/usr/bin LIBDIR=/etc/X11 || die "emake failed"
+               BINDIR=/usr/bin LIBDIR=/etc/X11
        if use emacs; then
           cd contrib/
-          elisp-compile *.el || die "elisp-compile failed"
+          elisp-compile *.el || die
        fi
 }
 
@@ -83,20 +87,20 @@ src_install() {
                DESTDIR="${D}" \
                BINDIR=/usr/bin \
                LIBDIR=/etc/X11 \
-               install || die "emake install failed"
+               install
 
        emake -j1 \
                DESTDIR="${D}" \
                DOCHTMLDIR=/usr/share/doc/${PF} \
                MANPATH=/usr/share/man \
                MANSUFFIX=1 \
-               install.man || die "emake install.man failed"
+               install.man
 
        dobin contrib/{mgp2html.pl,mgp2latex.pl}
 
-       if use emacs ; then
+       if use emacs; then
                cd contrib/
-               elisp-install ${PN} *.el *.elc || die "elisp-install failed"
+               elisp-install ${PN} *.el *.elc || die
                elisp-site-file-install "${FILESDIR}/${SITEFILE}"
                cd -
        fi
@@ -109,8 +113,7 @@ src_install() {
                doins README* cloud.jpg dad.* embed*.mgp gradation*.mgp \
                        mgp-old*.jpg mgp.mng mgp3.xbm mgprc-sample \
                        multilingual.mgp sample*.mgp sendmail6*.mgp \
-                       tutorial*.mgp v6*.mgp v6header.* || \
-                       die "example installation failed"
+                       tutorial*.mgp v6*.mgp v6header.*
        fi
 }