From 0d26c4c33e0561d2171c3ac403c32b496e474cd5 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 9 Aug 2011 17:38:39 +0000 Subject: Fix building with libpng15 wrt #378505 by Ian Stakenvicius and Diego Elio Pettenò MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Portage version: 2.2.0_alpha50/cvs/Linux x86_64) --- x11-misc/slim/ChangeLog | 7 ++++++- x11-misc/slim/files/slim-1.3.2-libpng15.patch | 11 +++++++++++ x11-misc/slim/slim-1.3.2-r3.ebuild | 18 ++++++++++-------- 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 x11-misc/slim/files/slim-1.3.2-libpng15.patch (limited to 'x11-misc/slim') 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 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 slim-1.3.2-r3.ebuild, +files/slim-1.3.2-bsd-install.patch: 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() { -- cgit v1.2.3-65-gdbad