Fix building with libpng15 wrt #385851 by "Zosiek"

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

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 4dcc85abc51ba266c9b254b9c93cfbe8a01b3438..ffe3c0c4a4b5a9e1123fa8d4a250fb6c824ac833 100644 (file)
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/afterstep
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.97 2010/11/08 13:43:13 voyageur Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.98 2011/10/06 12:19:45 ssuominen Exp $
+
+  06 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> afterstep-2.2.9.ebuild,
+  +files/afterstep-2.2.9-libpng15.patch:
+  Fix building with libpng15 wrt #385851 by "Zosiek"
 
   08 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org>
   afterstep-2.2.9.ebuild:

diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 7522aa3f91af405e557cfafa2a21b4bc1c231c45..99a1810961ee195b807ddb3c52b48aa3d3b8a87f 100644 (file)
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX afterstep 29 RMD160 a1fafb8971d47c7cebfe972bb74bbef19de4ac52 SHA1 7ce7a198aef7adb7484981fed4b84798311f5409 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5
 AUX afterstep-2.2.9-alpha.patch 475 RMD160 8945b4685e011e49a0c81c835cbe37bf275046c7 SHA1 d80c3791133c101fa4a914cd442d7b1afe9815e2 SHA256 3208d1126ba14fc8c39c537cea701b2c89bcf9f778645add0e3465ce74139cd6
 AUX afterstep-2.2.9-ldflags.patch 1374 RMD160 e0a947fe48de238eb0a8ebdbfa365254dc550c21 SHA1 d037e2736cc18849a6a52e72f2e399bcdb403aed SHA256 80d9ff3b0106ff9315eb2f4406d29c6f95a10818f7821866e39a405c1cc3b562
+AUX afterstep-2.2.9-libpng15.patch 1132 RMD160 6d08dc54c73771ebb6d05a57b94884dd211d4502 SHA1 8789eadee2f29c5c875c972cb2001a92b7e5e608 SHA256 4b08424b98d0b18f744f0a5fe0000f9149963b84bc28487a3e3f8eae1804560d
 AUX afterstep-2.2.9-make_session_data_file.patch 422 RMD160 b4e694ac6514d34dfbee5f6fe15ffa109e5bfbad SHA1 932abcf0c2fb469e45e95035244d97df40c8dfe1 SHA256 3fa0e494903d374db0da66de432e407889356cd50d1072aa4078516f5d31b5a3
 AUX no-alternatives-2.2.9.patch 1214 RMD160 c6a02643da9c82c5228800a399ffd6ce89c0b542 SHA1 140e5d5d011df340ece7f36a88c7f49540786a89 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f
 DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
-EBUILD afterstep-2.2.9.ebuild 3686 RMD160 658664ff8ab7615c14cca89f3e74a8ee57c3d2b3 SHA1 223cacc2de892b212ee5282e9ba7a008f6bad535 SHA256 793c7f490ed24f5445bfaedb6e95f6589faa7a11551cd902934609048694a398
-MISC ChangeLog 13919 RMD160 c9b4ad069617db0a21fceb60991a2575059047b9 SHA1 87969fbe45dec8135b460fe5f24579e20bc26ae4 SHA256 b023099f923cd9310fc31d0098663e97b67ca6a9de710f394ed1da07fc305f5d
+EBUILD afterstep-2.2.9.ebuild 3667 RMD160 06443bbddd590b51ab0a62a0abb3196511982327 SHA1 0d0a06252ac7be9830825dfbaa90656445eaa19c SHA256 e5440404eb6d54d5c03b8314d10b3d8d0b8a78ac1363c4d5724cad9f607ad297
+MISC ChangeLog 14093 RMD160 301368cda6a6be54e5ebc31adb48a857b0275e5c SHA1 a9e1208f1d54db117dc49a23d754b2f87c7ae866 SHA256 8fd4b37aae05f54673212c284d195db74e1916c2db1226157bc4f92094af691e
 MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJOjZ0KAAoJEEdUh39IaPFNX5QH/1FE9N2rRGq5RTLmFFoJ7TeT
+B42hI3SjkWcoDf3aEwShN176rKtnIDozdah8OaeCd1e/ixceDMy4LVBOc5gqEbz5
+gZt+7JTGfNjkZNVdgAKfYU1vIekgP1PplfBoAhmlz2nAaXNA69ChQVGWfiKa9r9B
+6aujEvkMpU0Nrxnt8LxYBjieGaT/EpQ/2h+i+/n2Po4a/9agZZVwMfRWISUwvzhR
+s1kaEuyb7BJBP+xGLs5tOrHV/GJ82Ic3bBlhFnDKbbo6gTCVVJJvwW99i3xR2GAg
+2HXOOlcan3WaHxnyrpruCQTn9/1RhXd/z62MdWcJlkrF5LMi+Rjz52SS7+U/W4U=
+=DENC
+-----END PGP SIGNATURE-----

diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
index deef0f448890a24df45bbd4026f52acfa847d5df..b7b7cd45bafc7dcd2b3931f94719c0aff19195f7 100644 (file)
--- a/x11-wm/afterstep/afterstep-2.2.9.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild
@@ -1,8 +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/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.16 2010/11/08 13:43:13 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.17 2011/10/06 12:19:45 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools flag-o-matic eutils
 
 DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
@@ -43,10 +43,12 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/AfterStep-${PV}
 
 src_prepare() {
-       epatch "${FILESDIR}"/no-alternatives-${PV}.patch \
+       epatch \
+               "${FILESDIR}"/no-alternatives-${PV}.patch \
                "${FILESDIR}"/${P}-make_session_data_file.patch \
                "${FILESDIR}"/${P}-alpha.patch \
-               "${FILESDIR}"/${P}-ldflags.patch
+               "${FILESDIR}"/${P}-ldflags.patch \
+               "${FILESDIR}"/${P}-libpng15.patch
 
        sed -i \
                -e '/CFLAGS="-O3"/d' \
@@ -69,7 +71,7 @@ src_prepare() {
 src_compile() {
        # gcc: ../libAfterConf/libAfterConf.a: No such file or directory
        # make[1]: *** [PrintDesktopEntries] Error 1
-       emake -j1 || die
+       emake -j1
 }
 
 src_configure() {
@@ -105,11 +107,11 @@ src_configure() {
                --disable-availability \
                --disable-staticlibs \
                --enable-ascp=no \
-               ${myconf} || die "configure failed"
+               ${myconf}
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
+       emake DESTDIR="${D}" install
 
        # Create a symlink from MonitorWharf to Wharf
        rm "${D}"/usr/bin/MonitorWharf

diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch b/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch
new file mode 100644 (file)
index 0000000..b420489
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch
@@ -0,0 +1,31 @@
+--- libAfterImage/export.c
++++ libAfterImage/export.c
+@@ -483,7 +483,7 @@
+       png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+       if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-                      if( setjmp(png_ptr->jmpbuf) )
++                      if( setjmp(png_jmpbuf(png_ptr)) )
+                       {
+                               png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+                               info_ptr = NULL ;
+--- libAfterImage/import.c
++++ libAfterImage/import.c
+@@ -1251,7 +1251,7 @@
+                        * the normal method of doing things with libpng).  REQUIRED unless you
+                        * set up your own error handlers in the png_create_read_struct() earlier.
+                        */
+-                      if ( !setjmp (png_ptr->jmpbuf))
++                      if ( !setjmp (png_jmpbuf(png_ptr)))
+                       {
+                               ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
+@@ -1468,7 +1468,7 @@
+ 
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
+    memcpy(data, buf->buffer, length);
+    buf->buffer += length;
+ }