Add giflib-4.2 patch by Tomasz Wasiak (bug #494402).

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 162 insertions, 5 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index efda4b842449..def9704b1625 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.105 2013/03/01 16:41:25 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.106 2013/12/31 17:23:48 jer Exp $
+
+*fbida-2.09-r1 (31 Dec 2013)
+
+  31 Dec 2013; Jeroen Roovers <jer@gentoo.org> fbida-2.09.ebuild,
+  +fbida-2.09-r1.ebuild, +files/fbida-2.09-giflib-4.2.patch,
+  files/ida-desktop.patch:
+  Add giflib-4.2 patch by Tomasz Wasiak (bug #494402).
 
   01 Mar 2013; Michael Palimaka <kensington@gentoo.org> -fbida-2.08.ebuild:
   Remove old.
diff --git a/media-gfx/fbida/fbida-2.09-r1.ebuild b/media-gfx/fbida/fbida-2.09-r1.ebuild
new file mode 100644
index 000000000000..fa5cc1b99beb
--- /dev/null
+++ b/media-gfx/fbida/fbida-2.09-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r1.ebuild,v 1.1 2013/12/31 17:23:48 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)."
+HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+SRC_URI="http://www.kraxel.org/releases/${PN}/${P}.tar.gz
+	mirror://gentoo/ida.png.bz2" #370901
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="curl fbcon gif imagemagick lirc pdf png scanner tiff X"
+
+RDEPEND="
+	curl? ( net-misc/curl )
+	gif? ( >media-libs/giflib-4.2 )
+	lirc? ( app-misc/lirc )
+	pdf? ( app-text/ghostscript-gpl media-libs/tiff )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	imagemagick? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+	)
+	scanner? ( media-gfx/sane-backends )
+	X? (
+		>=x11-libs/motif-2.3:0
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt
+	)
+	!media-gfx/fbi
+	>=media-libs/fontconfig-2.2
+	>=media-libs/freetype-2.0
+	media-libs/libexif
+	virtual/jpeg
+	virtual/ttf-fonts
+"
+
+DEPEND="
+	${RDEPEND}
+	X? ( x11-proto/xextproto x11-proto/xproto )
+"
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	sed -e 's:DGifOpenFileName,ungif:DGifOpenFileName,gif:' \
+		-e 's:-lungif:-lgif:' -i "${S}/GNUmakefile"
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		sed	-e 's:-Wno-pointer-sign::' -i "${S}/GNUmakefile" || die
+	fi
+
+	epatch "${FILESDIR}"/ida-desktop.patch
+	epatch "${FILESDIR}"/${PN}-2.08-posix-make.patch
+	epatch "${FILESDIR}"/${P}-giflib-4.2.patch
+}
+
+src_configure() {
+	# Let autoconf do its job and then fix things to build fbida
+	# according to our specifications
+	emake Make.config
+
+	set_feat() {
+		local useflag=${1}
+		local config=${2}
+
+		local option="yes"
+		if ! use ${useflag}; then
+			option="no"
+		fi
+
+		sed -i \
+			-e "s|${config}.*|${config} := ${option}|" \
+			"${S}/Make.config" || die
+	}
+
+	set_feat fbcon 	HAVE_LINUX_FB_H
+	set_feat X 		HAVE_MOTIF
+	set_feat tiff 	HAVE_LIBTIFF
+
+	# The 'pdf' flag forces the use of libtiff.
+	set_feat pdf	HAVE_LIBTIFF
+	set_feat png 	HAVE_LIBPNG
+	set_feat gif 	HAVE_LIBUNGIF
+	set_feat lirc 	HAVE_LIBLIRC
+	set_feat curl 	HAVE_LIBCURL
+	set_feat scanner HAVE_LIBSANE
+	set_feat imagemagick HAVE_LIBMAGICK
+}
+
+src_compile() {
+	emake verbose=yes
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		STRIP="" \
+		prefix=/usr \
+		install
+
+	dodoc README
+
+	if ! use pdf; then
+		rm -f "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1
+	fi
+
+	if use X ; then
+		doicon "${WORKDIR}"/ida.png
+		domenu desktop/ida.desktop
+	fi
+}
diff --git a/media-gfx/fbida/fbida-2.09.ebuild b/media-gfx/fbida/fbida-2.09.ebuild
index 73a097a3aa2e..4e2236e1f112 100644
--- a/media-gfx/fbida/fbida-2.09.ebuild
+++ b/media-gfx/fbida/fbida-2.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09.ebuild,v 1.12 2013/03/01 16:37:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09.ebuild,v 1.13 2013/12/31 17:23:48 jer Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -60,7 +60,7 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}"/ida-desktop.patch
-	epatch "${FILESDIR}"/fbida-2.08-posix-make.patch
+	epatch "${FILESDIR}"/${PN}-2.08-posix-make.patch
 }
 
 src_configure() {
diff --git a/media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch b/media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch
new file mode 100644
index 000000000000..c3685c31e97b
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch
@@ -0,0 +1,29 @@
+--- a/rd/read-gif.c
++++ b/rd/read-gif.c
+@@ -25,7 +25,7 @@
+ 	if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) {
+ 	    if (debug)
+ 		fprintf(stderr,"gif: DGifGetRecordType failed\n");
+-	    PrintGifError();
++	    GifErrorString();
+ 	    return -1;
+ 	}
+ 	switch (RecordType) {
+@@ -42,7 +42,7 @@
+ 		if (rc == GIF_ERROR) {
+ 		    if (debug)
+ 			fprintf(stderr,"gif: DGifGetExtension failed\n");
+-		    PrintGifError();
++		    GifErrorString();
+ 		    return -1;
+ 		}
+ 		if (debug) {
+@@ -108,7 +108,7 @@
+ 	    if (GIF_ERROR == DGifGetImageDesc(h->gif)) {
+ 		if (debug)
+ 		    fprintf(stderr,"gif: DGifGetImageDesc failed\n");
+-		PrintGifError();
++		GifErrorString();
+ 	    }
+ 	    if (NULL == h->gif->SColorMap &&
+ 		NULL == h->gif->Image.ColorMap) {
diff --git a/media-gfx/fbida/files/ida-desktop.patch b/media-gfx/fbida/files/ida-desktop.patch
index 8440e4cb3c9d..eaac0ed69558 100644
--- a/media-gfx/fbida/files/ida-desktop.patch
+++ b/media-gfx/fbida/files/ida-desktop.patch
@@ -1,5 +1,5 @@
---- desktop/ida.desktop~	2008-08-28 00:33:58.000000000 +0200
-+++ desktop/ida.desktop	2008-08-28 00:33:58.000000000 +0200
+--- a/desktop/ida.desktop
++++ b/desktop/ida.desktop
 @@ -1,9 +1,10 @@
  [Desktop Entry]
  Type=Application