Fix building with libpng15 wrt #378505 by Ian Stakenvicius and Diego Elio Pettenò

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

4 files changed, 35 insertions, 16 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 0716dfa1c0cb..fea63e515bf3 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.66 2011/05/27 11:28:39 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.67 2011/08/09 17:38:39 ssuominen Exp $
+
+  09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> slim-1.3.2-r3.ebuild,
+  +files/slim-1.3.2-libpng15.patch:
+  Fix building with libpng15 wrt #378505 by Ian Stakenvicius and Diego Elio
+  Pettenò
 
   27 May 2011; Naohiro Aota <naota@gentoo.org> slim-1.3.2-r3.ebuild,
   +files/slim-1.3.2-bsd-install.patch:
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 02b53147c83e..846800355d6e 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch 754 RMD160 079984153eb6ca97dafc94b065aeff6c57cf19ee SHA1 25fc499e10133c5325823453202aefdf828c3c21 SHA256 72995a16600174994864b9af959659d321c1fc6aa093650ed0b95b6760d91a13
 AUX 15287-fix-pam-authentication-with-pam_unix2.patch 3017 RMD160 ae6a20b9eb313bd6b9f93726d5519309a2bafc85 SHA1 e17c582fe0cc1d2a07e51d410db2d61c11aba4c6 SHA256 ced3b92f48ba09cd61287b72737ea58e499a7eedd4f61e25ee1b148d0b6cfbb3
@@ -8,16 +8,17 @@ AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fe
 AUX 346037-stop_setting_host_for_pam_ck_connector_so.patch 328 RMD160 62012df3cccf607d8cba139b0754a7238bfb1dd3 SHA1 04f26bc3ad82dab47c8911f3ac069b756fe5a1a8 SHA256 51bee429be20f2538b19b84c311b136761acdf2b857661af11749e45cc73ad44
 AUX Xsession 4215 RMD160 86ab057ea3f78a9604811a1bff7e5aad88c2f717 SHA1 46dc684b873b190b74df199eae39b38e0f5ffccc SHA256 55671397563aa32d89e66658e6594f17d4ddcddd1ad6aa2d7582ba56ceec7628
 AUX slim-1.3.2-bsd-install.patch 1315 RMD160 290a7c31b077bce33b120ab55b9bdd3c6262d2be SHA1 a50d2e3e2810af82ab9bef058a72286734afd338 SHA256 bfb5a506b3baec6d24e6f0cfba34f045768bbccccc652af11199f30a7c45d843
+AUX slim-1.3.2-libpng15.patch 247 RMD160 b28d9a376f4c01baa8b1aec0c5e0e76294997255 SHA1 3cd674e548f4e0aadbbd32a67b4efd1ed263afef SHA256 f84e3e4c069ec103a5f4ec2a60698bf9d035346b604dee59b6efc883c7f14042
 AUX slim-1.3.2-r2-config.diff 2572 RMD160 217c3d64b77e0af496670cee82849a0500516d0d SHA1 7dbc1b0df45a49688b52bfc701acc3dc15019394 SHA256 7ea06809e15f40c5113d8c05df2b6ca4eb4ba9ebc1e9fc1747b080337997384d
 AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
 DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8
-EBUILD slim-1.3.2-r3.ebuild 3778 RMD160 763d39acab6d0600a11595dc362a31a16a456bbf SHA1 508cdc04ddf85fa3714cde5ee462c5e0cd0480f4 SHA256 6e89a92f21ac53a9676f1596118e5e016c7d9ceba1a976e8f36538363b9437ae
-MISC ChangeLog 10648 RMD160 9b8103f0a6d746eb55b94c69539f52007b756e5c SHA1 68a0a5afb610a13573c852cb054a595c8e58ec3c SHA256 df382515f42c84bf0281bd2589af09769fdc673676f3a945ea62598a24e79a01
+EBUILD slim-1.3.2-r3.ebuild 3845 RMD160 c05d3a83231ff745710f184913797e54fa65d847 SHA1 a215c9cb6e4f01b59bccad3096c2efd9a0d021f2 SHA256 52b09e2d2a8b78c35b82001d5c71eb177494e15652c6a6ce34eeafc111858bc0
+MISC ChangeLog 10852 RMD160 4ea84c1f80e09e334162dc5f3b075f359d8ed8d7 SHA1 b369afd9ba162013efdf449a635bb6e9d9618df5 SHA256 30e008ee15a6bac4ce16bb1e699a518d60eabdab1f09d44cf748acdc8aba7f09
 MISC metadata.xml 377 RMD160 6320bad8fc67d0814f8d74a83480ba2fb4ed5d2f SHA1 0e938430a8782f832c96a778c2a287f1787cce06 SHA256 4c607a49c6e35158356c67f5b1111626d66b7d72f4fc85f2303eb9b0e7600a8f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (FreeBSD)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3fiu4ACgkQGpDnPLSHuMDalgCeOXBaAVyrJnxLC9w/RjSflerv
-ai0An0sNZ5FojY6jMW+f87WN0Ax0dHsr
-=vNEr
+iF4EAREIAAYFAk5BcJYACgkQXkR9YqOcLPFKrQD9HoD88R7FfvuJoWW+39TuiCDY
+s9b5XsjniGRk5c+5ehYA/37hDpPog0pI9w3rELOR8EgzyshXOibBhbYd6+ZWzosb
+=UX+8
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/files/slim-1.3.2-libpng15.patch b/x11-misc/slim/files/slim-1.3.2-libpng15.patch
new file mode 100644
index 000000000000..720608567d81
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.2-libpng15.patch
@@ -0,0 +1,11 @@
+--- png.c
++++ png.c
+@@ -57,7 +57,7 @@
+         return(0);
+     }
+   
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+         png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+         fclose(infile);
diff --git a/x11-misc/slim/slim-1.3.2-r3.ebuild b/x11-misc/slim/slim-1.3.2-r3.ebuild
index 22df5492b819..85542081e707 100644
--- a/x11-misc/slim/slim-1.3.2-r3.ebuild
+++ b/x11-misc/slim/slim-1.3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r3.ebuild,v 1.6 2011/05/27 11:28:39 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r3.ebuild,v 1.7 2011/08/09 17:38:39 ssuominen Exp $
 
 EAPI=2
 
@@ -40,12 +40,12 @@ src_prepare() {
 		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
 		Makefile || die "sed failed in Makefile"
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}/${PN}-1.3.2-r2-config.diff"
+	epatch "${FILESDIR}"/${PN}-1.3.2-r2-config.diff
 
 	if use elibc_FreeBSD; then
 		sed -i -e "s/CUSTOM=-DHAVE_SHADOW/CUSTOM=-DNEEDS_BASENAME/" Makefile \
 			|| die "sed failed in Makefile"
-		epatch "${FILESDIR}/${PN}-1.3.2-bsd-install.patch"
+		epatch "${FILESDIR}"/${PN}-1.3.2-bsd-install.patch
 	fi
 
 	if use branding; then
@@ -53,15 +53,17 @@ src_prepare() {
 	fi
 
 	# Gentoo bug 297655
-	epatch "${FILESDIR}/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch"
+	epatch "${FILESDIR}"/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch
 	# Upstream bug #15287
-	epatch "${FILESDIR}/15287-fix-pam-authentication-with-pam_unix2.patch"
+	epatch "${FILESDIR}"/15287-fix-pam-authentication-with-pam_unix2.patch
 	# Gentoo Bug 261713
-	epatch "${FILESDIR}/261713-restart-xserver-if-killed.patch"
+	epatch "${FILESDIR}"/261713-restart-xserver-if-killed.patch
 	# Gentoo bug 261359, upstream 15326
-	epatch "${FILESDIR}/261359-fix-SIGTERM-freeze.patch"
+	epatch "${FILESDIR}"/261359-fix-SIGTERM-freeze.patch
 	# Gentoo bug 346037
-	epatch "${FILESDIR}/346037-stop_setting_host_for_pam_ck_connector_so.patch"
+	epatch "${FILESDIR}"/346037-stop_setting_host_for_pam_ck_connector_so.patch
+	# Gentoo bug 378505
+	epatch "${FILESDIR}"/${P}-libpng15.patch
 }
 
 src_compile() {