diff options
author | Tim Harder <radhermit@gentoo.org> | 2014-04-25 08:41:19 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2014-04-25 08:41:19 +0000 |
commit | d21699e79835c8c501086f8fef3809b979a812c5 (patch) | |
tree | c0633d0188bcd022a9ce8cd0981c36f4fd841dbf /media-gfx | |
parent | Version bump. (diff) | |
download | gentoo-2-d21699e79835c8c501086f8fef3809b979a812c5.tar.gz gentoo-2-d21699e79835c8c501086f8fef3809b979a812c5.tar.bz2 gentoo-2-d21699e79835c8c501086f8fef3809b979a812c5.zip |
Remove old.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/sxiv/ChangeLog | 6 | ||||
-rw-r--r-- | media-gfx/sxiv/files/sxiv-1.1-fix-segfault.patch | 27 | ||||
-rw-r--r-- | media-gfx/sxiv/sxiv-1.1-r1.ebuild | 35 |
3 files changed, 5 insertions, 63 deletions
diff --git a/media-gfx/sxiv/ChangeLog b/media-gfx/sxiv/ChangeLog index 81a8a3cebe07..d3bdc06d68a4 100644 --- a/media-gfx/sxiv/ChangeLog +++ b/media-gfx/sxiv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/sxiv # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/ChangeLog,v 1.19 2014/04/25 08:40:27 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/ChangeLog,v 1.20 2014/04/25 08:41:19 radhermit Exp $ + + 25 Apr 2014; Tim Harder <radhermit@gentoo.org> -sxiv-1.1-r1.ebuild, + -files/sxiv-1.1-fix-segfault.patch: + Remove old. *sxiv-1.2 (25 Apr 2014) diff --git a/media-gfx/sxiv/files/sxiv-1.1-fix-segfault.patch b/media-gfx/sxiv/files/sxiv-1.1-fix-segfault.patch deleted file mode 100644 index 00e238b995df..000000000000 --- a/media-gfx/sxiv/files/sxiv-1.1-fix-segfault.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 98972e98f942fa3d3cd2b8f6a831da0a1f94551f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bert=20M=C3=BCnnich?= <be.muennich@gmail.com> -Date: Tue, 2 Apr 2013 19:32:59 +0200 -Subject: [PATCH] Fixed segfault caused by FD_ISSET() on negative fd - -Reported by Kris Siwiec ---- - Makefile | 2 +- - main.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/main.c b/main.c -index cda0c4d..4962782 100644 ---- a/main.c -+++ b/main.c -@@ -536,7 +536,7 @@ void run(void) - xfd = MAX(xfd, info.fd); - } - select(xfd + 1, &fds, 0, 0, to_set ? &timeout : NULL); -- if (FD_ISSET(info.fd, &fds)) -+ if (info.fd != -1 && FD_ISSET(info.fd, &fds)) - read_info(); - } - --- -1.8.1.5 - diff --git a/media-gfx/sxiv/sxiv-1.1-r1.ebuild b/media-gfx/sxiv/sxiv-1.1-r1.ebuild deleted file mode 100644 index 179cab421668..000000000000 --- a/media-gfx/sxiv/sxiv-1.1-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/sxiv-1.1-r1.ebuild,v 1.3 2013/07/04 12:16:59 ago Exp $ - -EAPI=5 - -inherit eutils savedconfig toolchain-funcs - -DESCRIPTION="Simple (or small or suckless) X Image Viewer" -HOMEPAGE="https://github.com/muennich/sxiv/" -SRC_URI="https://github.com/muennich/sxiv/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="media-libs/giflib - media-libs/imlib2[X] - x11-libs/libX11" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch - epatch "${FILESDIR}"/${PN}-1.1-fix-segfault.patch - tc-export CC - - restore_config config.h -} - -src_install() { - emake DESTDIR="${ED}" PREFIX=/usr install - dodoc README.md - - save_config config.h -} |