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

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28 i686

4 files changed, 119 insertions, 6 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/Manifest b/media-libs/libafterimage/Manifest
index a4eab941d31c..9d150bfa01a2 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX libafterimage-1.15-examples.patch 765 RMD160 d72f8bce79346c8d0789332076e6e6e537b0884b SHA1 ad5628080698d8fa66a4fb173c67062c6c16cd8c SHA256 dc72323e502c02db820ed0e5d53aaf5604d140414343d8d69683b39db66fa64d
+AUX libafterimage-1.18-glx.patch 932 RMD160 61f6ddd4f659ffdeff2c4a7abd57ad9d5a97354e SHA1 09183f34a1f4b7737efcc40b36563e2bf84d8964 SHA256 e6fc40d8a0384781d04b82229a7d1a61066cedcf6dbf01427251230a59703b82
 AUX libafterimage-1.18-recmake_bsd.patch 1934 RMD160 cdd484974683aaea096c893d842b3693362e4a39 SHA1 030a4173e798e764dfbca64a60f2640af489236e SHA256 3628b28d09a119133b1235215454a8e7f664bdf9969445c267fa8648497e75a3
 AUX libafterimage-config.patch 369 RMD160 e209d20413373694cd4b4cf16cc1927fbb8437f6 SHA1 030143afcdece5802511b51899c221d48e421ebf SHA256 75a7683211f8d65a6cb1a6ed99b013d7bcc5b3cb3a241e36748a2c0b5ff960c6
 AUX libafterimage-examples.patch 15911 RMD160 8c616ede78d2bea70587ba1790da7e158196f684 SHA1 04b27bcb2dd782fe0a20b9963f3992dbb9bd1ea6 SHA256 d3f9256627f33c2174f5dfc7ff57adfc1c03b1985bb90242fcefd9dbebbaecff
@@ -11,13 +12,14 @@ DIST libAfterImage-1.15.tar.bz2 1091821 RMD160 8111c5f809e5806face37677ffc65cf4e
 DIST libAfterImage-1.18.tar.bz2 1050328 RMD160 dcf921660e15bb31908c90fcfe00b58d58754fc3 SHA1 d177c63067f5d0053e02f92879fe59764e421f25 SHA256 f1562240f1dd3a180e07436ee28a993a707654a339d997ad0512692d3fc32312
 EBUILD libafterimage-1.07.ebuild 1869 RMD160 424f8fc147122e73d66d247ded59b5b5437af5ac SHA1 67cb5a2e0b72ecbb0a181da4d8de0ad0f2a26868 SHA256 3812a8eeae69055419bfebaaa14d91b7f2df9404982aeaa5db4f1be551815646
 EBUILD libafterimage-1.15.ebuild 1949 RMD160 9897dd4811f63bcbef314ea27f5835d22f71454b SHA1 df6fa346843d56be41e8fbdc585a08be35c5f8f2 SHA256 a5600cd2d119194504bd580c3d8ee2cf62502a888e8ecddbc4bae887e9f54000
+EBUILD libafterimage-1.18-r1.ebuild 2113 RMD160 35d095e531c77cb22cf561f34835024e0ae96d4b SHA1 01fba1655a099273d755bd3c9b8819c8d99089c8 SHA256 acd4cfd80ee58c07a71e56e76c7a407dac03b48ff6def2c8c99d7625c52f305a
 EBUILD libafterimage-1.18.ebuild 1970 RMD160 c9987749cf947b14980669617bafa22f48d2439d SHA1 c7ff46580b8e234373deb87bff2003b74ddd21a4 SHA256 73f493b9a79c0b77bd4b50a151fe1caafbd99f546d9c059a244141b645bbc270
-MISC ChangeLog 2595 RMD160 c4fd7a2a153c47f19a93383bbc076af0555778ce SHA1 8f929e52dee7578535af06cb55bbfb472770b3ea SHA256 73d38c3d7ce20e38bd27ff48df8986d70828cbf7502933b9bbef914b3c86e83d
+MISC ChangeLog 2879 RMD160 dee5035ae4775b14de0234d6fb5330a09e7e4fc0 SHA1 03355e4491ff519a74f72a4df8ec725d83a50455 SHA256 d9a1e6fcd9aed16ccb39cadc133128995b60c6e4f5cb8bf852cb57087cb52d25
 MISC metadata.xml 895 RMD160 3a9671c21f649729ea596def4c2ecd7c313bf5b3 SHA1 434cfd341defa95b295978f8de809be03a762443 SHA256 95d257cc2a6f6846269d1c64750669c837712f2d341c886581a8a89422e591cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklDvzMACgkQvFcC4BYPU0pyvQCgtPNQnu40jORPrsfxKyJ2FLmC
-4TgAn2O8527v+/gIKxuK4CHskFyvM09+
-=CMYb
+iEYEARECAAYFAklxwGMACgkQkKaRLQcq0GLZvQCeJsL3OgynQMXeIFiFfcYOsLdC
+TOYAnihDJeFwhkTY0WuAk9vEQ8XYX7Xo
+=v2sr
 -----END PGP SIGNATURE-----
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
+}