Fix building with libpng15 (bump patchset to 5) wrt #383213 by Diego Elio Pettenò and Ian Stakenvicius

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

3 files changed, 17 insertions, 10 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 94975f604cd9..448c83746c71 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.120 2011/04/21 14:26:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.121 2011/09/17 19:11:46 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  windowmaker-0.92.0-r11.ebuild:
+  Fix building with libpng15 (bump patchset to 5) wrt #383213 by Diego Elio
+  Pettenò and Ian Stakenvicius
 
 *windowmaker-0.92.0-r11 (21 Apr 2011)
 
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index ae11d1780600..f85ea94d980c 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -5,15 +5,16 @@ AUX wmaker.desktop 221 RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d SHA1 acd9
 DIST WindowMaker-0.92.0.tar.gz 2758524 RMD160 b8bebed6a34696625ae0ae7c0ebcfdfc0ba09cdd SHA1 6f545356acde7e9bf4c11345ac1359b451a9d1bc SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6
 DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4
 DIST windowmaker-0.92.0-patchset-4.tar.bz2 226943 RMD160 afc95f3216ffba029de6798184601a21daa2c467 SHA1 2b97a62b85c6e12aa1b0c94ca61e5f86cd94f762 SHA256 369f7538d848ae4d3af8859d04fa282e0990d71b33f82666585f369bc3e8eff2
+DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 RMD160 c49fa346e3d024a5e12e576073d141f1d1c9958b SHA1 a6285c3034b80575f8a9dbda95f830f6387cd554 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc
 EBUILD windowmaker-0.92.0-r10.ebuild 6936 RMD160 3572fc8b70f7ab6cb72663ce1e82342e84bd242d SHA1 86921bc6f91748c3b32fce35d2ca233e10b7d1c6 SHA256 18ffe9767059326910f1f1eb41fe130cd771ed743777d6c426f473d94fd174f9
-EBUILD windowmaker-0.92.0-r11.ebuild 6422 RMD160 3296350b46c4face0f822137e3598d4790a2af03 SHA1 ab13d24a39e33d736e56b585c6186d3420751607 SHA256 d26d6b487e5e6be6af6cf240028caffbef4d10d7d44d9fb3b6fe4c75d9743d2b
+EBUILD windowmaker-0.92.0-r11.ebuild 6477 RMD160 6fbd490876c0cfd0662d6571447258f061ee3ece SHA1 b76c742bb4cee006081c5e7e8aaf2d83bdd65355 SHA256 cbc18f8395bc38c3293c0e9f379bc1e7bc81be5cb0361bb7f9290e1f932917f6
 EBUILD windowmaker-0.92.0-r9.ebuild 6846 RMD160 5db0d34cceefabef7ced492bf8e29f3b6d6b1463 SHA1 b4f06e7d317b77edd1dabe99e2d03d2e31e6a6d2 SHA256 3f80a22cff9be3d2ad16c598cc893345df004baa572eb2563cbeb3631dc65d41
-MISC ChangeLog 25617 RMD160 668a3e8e6937496640817143ac78229701224375 SHA1 8f58084b0ecbbb9b60d446e5ae9d68ead3cb6c74 SHA256 7928cd3aa24498f52aa4593eaf3358d54bcde0e83e39690367203e71fe5caa57
+MISC ChangeLog 25814 RMD160 47f7a65e54690821648e9fd0b82c190599bf2a6e SHA1 b2661c48c7b59665fb1e6318c6466a28316b524a SHA256 40f5d47cf37dd255266ead8bf7aa542a95ebc1e4cc224978faf31b1a0214f38c
 MISC metadata.xml 455 RMD160 41514c712d553ed4752ce045efca3d27dd036c19 SHA1 345b35512a60f3d19cf5fc4cebbfe30bd6006bf3 SHA256 7661636f854da151e83478668ff58943b0d80662f6abd2a209707d3d34b37c7c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk2wPrsACgkQFYEBGcdFJfLJWQD/WijWLVZh3cdjlTKGcjOPfVJx
-yvkRCHUyCCIBf5hdUPIBAIONTo5lVhDtuI3LpvUZx1KFe7+qq2wsVgNaOUVgfUVT
-=mViF
+iF4EAREIAAYFAk508S4ACgkQXkR9YqOcLPHFCgD/Y/+ZbtJ3O36H5p7q1E+kvWGF
+npS7Xxss+6CQlJDW++wBAKdSKA8EJlfc9pT0JMKDdpcctfE4ZSM57TuDx6JDdMPg
+=A6PM
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
index ce801b8b43f6..1d851d8f6374 100644
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild,v 1.1 2011/04/21 14:26:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild,v 1.2 2011/09/17 19:11:46 ssuominen Exp $
 
 EAPI=3
 
 inherit autotools eutils flag-o-matic
 
 # note: patchset is in gentoo/src/patchsets/windowmaker
-PATCHVER=4
+PATCHVER=5
 S=${WORKDIR}/${P/windowm/WindowM}
 
 DESCRIPTION="The fast and light GNUstep window manager"
 SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz
 	http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz
-	mirror://gentoo/${P}-patchset-${PATCHVER}.tar.bz2"
+	http://dev.gentoo.org/~ssuominen/${P}-patchset-${PATCHVER}.tar.bz2"
 HOMEPAGE="http://www.windowmaker.info/"
 
 IUSE="gif jpeg nls png tiff modelock +vdesktop xinerama"
@@ -43,6 +43,7 @@ src_prepare() {
 	epatch "${psd}"/${P}-math_h.patch
 	epatch "${psd}"/${P}-gettext.patch
 	epatch "${psd}"/${P}-libpng14.patch
+	epatch "${psd}"/${P}-libpng15.patch
 
 	# Patches from upstream HG
 	epatch "${psd}"/${P}-composite-non-24bit-depth.patch