fix x11-terms/rxvt-unicode segfault by Martin von Gagern in bug #252651; don't use internal copy of libungif wrt bug #252917

(Portage version: 2.2_rc22/cvs/Linux 2.6.28 i686)

3 files changed, 113 insertions, 2 deletions

diff --git a/media-libs/libafterimage/ChangeLog b/media-libs/libafterimage/ChangeLog
index 987f582d6fbc..7a76b811be96 100644
--- a/media-libs/libafterimage/ChangeLog
+++ b/media-libs/libafterimage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libafterimage
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.18 2008/12/13 13:57:00 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.19 2009/01/17 11:25:09 maekke Exp $
+
+*libafterimage-1.18-r1 (17 Jan 2009)
+
+  17 Jan 2009; Markus Meier <maekke@gentoo.org>
+  +files/libafterimage-1.18-glx.patch, +libafterimage-1.18-r1.ebuild:
+  fix x11-terms/rxvt-unicode segfault by Martin von Gagern in bug #252651;
+  don't use internal copy of libungif wrt bug #252917
 
   13 Dec 2008; Alexis Ballier <aballier@gentoo.org>
   +files/libafterimage-1.18-recmake_bsd.patch, libafterimage-1.18.ebuild:
diff --git a/media-libs/libafterimage/files/libafterimage-1.18-glx.patch b/media-libs/libafterimage/files/libafterimage-1.18-glx.patch
new file mode 100644
index 000000000000..28d72d158635
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-1.18-glx.patch
@@ -0,0 +1,20 @@
+===================================================================
+RCS file: /home/cvsroot/afterstep-stable/libAfterImage/asvisual.c,v
+rcsdiff: /home/cvsroot/afterstep-stable/libAfterImage/asvisual.c,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.111
+retrieving revision 1.112
+diff -u -r1.111 -r1.112
+--- afterstep-stable/libAfterImage/asvisual.c	2008/05/29 22:23:25	1.111
++++ afterstep-stable/libAfterImage/asvisual.c	2008/11/12 22:38:31	1.112
+@@ -404,9 +404,9 @@
+ 		}
+ #ifdef HAVE_GLX
+ 		if( asv->glx_scratch_gc_direct )
+-			glXDestroyContext(dpy, asv->glx_scratch_gc_direct );
++			glXDestroyContext(asv->dpy, asv->glx_scratch_gc_direct );
+ 		if( asv->glx_scratch_gc_indirect )
+-			glXDestroyContext(dpy, asv->glx_scratch_gc_indirect );
++			glXDestroyContext(asv->dpy, asv->glx_scratch_gc_indirect );
+ #endif
+ 		if( asv->scratch_window ) 
+ 			XDestroyWindow( asv->dpy, asv->scratch_window );
diff --git a/media-libs/libafterimage/libafterimage-1.18-r1.ebuild b/media-libs/libafterimage/libafterimage-1.18-r1.ebuild
new file mode 100644
index 000000000000..3d86d8ef7011
--- /dev/null
+++ b/media-libs/libafterimage/libafterimage-1.18-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.18-r1.ebuild,v 1.1 2009/01/17 11:25:09 maekke Exp $
+
+inherit eutils
+
+MY_PN="libAfterImage"
+
+DESCRIPTION="Afterstep's standalone generic image manipulation library"
+HOMEPAGE="http://www.afterstep.org/afterimage/index.php"
+SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gif jpeg mmx nls png tiff examples"
+
+RDEPEND="media-libs/freetype
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXrender
+	png?  ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	gif?  ( media-libs/giflib )
+	tiff? ( media-libs/tiff )"
+
+DEPEND="${RDEPEND}
+	!x11-wm/afterstep"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# fix some ldconfig problem in makefile.in
+	epatch "${FILESDIR}"/${PN}-makefile.in.patch
+	# fix lib paths in afterimage-config
+	epatch "${FILESDIR}"/${PN}-config.patch
+	# Fix recursive make calls, bug #210965
+	epatch "${FILESDIR}"/${P}-recmake_bsd.patch
+	# fix x11-terms/rxvt-unicode segfault, bug #252651
+	epatch "${FILESDIR}"/${P}-glx.patch
+	# remove forced flags
+	sed -i \
+		-e 's/CFLAGS="-O3"//' \
+		-e 's/ -rdynamic//' \
+		configure || die "sed failed"
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls i18n) \
+		$(use_enable mmx mmx-optimization) \
+		$(use_with png) \
+		$(use_with jpeg) \
+		$(use_with gif) \
+		$(use_with tiff) \
+		--enable-glx \
+		--enable-sharedlibs \
+		--with-x \
+		--with-xpm \
+		--without-builtin-gif \
+		--without-builtin-ungif \
+		--without-builtin-zlib \
+		--without-afterbase \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		AFTER_DOC_DIR="${D}/usr/share/doc/${PF}" \
+		install || die "emake install failed"
+	dodoc ChangeLog README || die
+	if use examples; then
+		cd apps || die
+		emake clean
+		rm -f Makefile*
+		insinto /usr/share/doc/${PF}/examples
+		doins * || die "install examples failed"
+	fi
+}