Add a patch from langthang to fix crashing when xcompmgr is used. langthang sent the patch upstream as well.

5 files changed, 75 insertions, 1 deletions

diff --git a/x11-misc/xcompmgr/ChangeLog b/x11-misc/xcompmgr/ChangeLog
index ff3d8e51116d..cc5e9e0f4fb3 100644
--- a/x11-misc/xcompmgr/ChangeLog
+++ b/x11-misc/xcompmgr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xcompmgr
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcompmgr/ChangeLog,v 1.2 2004/08/21 18:29:01 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcompmgr/ChangeLog,v 1.3 2004/08/22 07:15:52 seemant Exp $
+
+*xcompmgr-0.1_pre20040821-r1 (22 Aug 2004)
+
+  22 Aug 2004; Seemant Kulleen <seemant@gentoo.org> +files/xcompmgr-fix.diff,
+  +xcompmgr-0.1_pre20040821-r1.ebuild:
+  Add a patch from langthang to fix crashing when xcompmgr is used. langthang
+  sent the patch upstream as well.
 
 *xcompmgr-0.1_pre20040821 (21 Aug 2004)
 
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index 5fd6b134690b..1832c4eaa9eb 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,4 +1,7 @@
 MD5 c90616b3ad65290d53d51d249f17305d xcompmgr-0.1_pre20040821.ebuild 745
+MD5 22cf83e8b0b9e0fe6ca148b4aa6864c6 xcompmgr-0.1_pre20040821-r1.ebuild 836
 MD5 c5d30e41eec54b52bce0a2c9308bbf85 ChangeLog 702
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
+MD5 fcac96a3388e51713ee63c0c8f861c8e files/xcompmgr-fix.diff 832
+MD5 5dac0410ae8df15ee3ce7b02ad495847 files/digest-xcompmgr-0.1_pre20040821-r1 76
 MD5 5dac0410ae8df15ee3ce7b02ad495847 files/digest-xcompmgr-0.1_pre20040821 76
diff --git a/x11-misc/xcompmgr/files/digest-xcompmgr-0.1_pre20040821-r1 b/x11-misc/xcompmgr/files/digest-xcompmgr-0.1_pre20040821-r1
new file mode 100644
index 000000000000..bc4a58c0c854
--- /dev/null
+++ b/x11-misc/xcompmgr/files/digest-xcompmgr-0.1_pre20040821-r1
@@ -0,0 +1 @@
+MD5 01776a8cee1a777a9320459834856424 xcompmgr-0.1_pre20040821.tar.bz2 13558
diff --git a/x11-misc/xcompmgr/files/xcompmgr-fix.diff b/x11-misc/xcompmgr/files/xcompmgr-fix.diff
new file mode 100644
index 000000000000..9bc78703b9c5
--- /dev/null
+++ b/x11-misc/xcompmgr/files/xcompmgr-fix.diff
@@ -0,0 +1,23 @@
+Index: xcompmgr.c
+===================================================================
+RCS file: /cvs/xapps/xcompmgr/xcompmgr.c,v
+retrieving revision 1.26
+diff -u -3 -p -r1.26 xcompmgr.c
+--- xcompmgr.c	14 Aug 2004 21:39:51 -0000	1.26
++++ xcompmgr.c	22 Aug 2004 00:58:24 -0000
+@@ -1124,11 +1124,11 @@ get_opacity_prop(Display *dpy, win *w, u
+     int format;
+     unsigned long n, left;
+ 
+-    char *data;
+-    XGetWindowProperty(dpy, w->id, opacityAtom, 0L, 1L, False, 
++    char *data = NULL;
++    if (XGetWindowProperty(dpy, w->id, opacityAtom, 0L, 1L, False, 
+ 		       XA_CARDINAL, &actual, &format, 
+-		       &n, &left, (unsigned char **) &data);
+-    if (data != None)
++		       &n, &left, (unsigned char **) &data) == Success
++            && data != NULL)
+     {
+ 	unsigned int i;
+ 	memcpy (&i, data, sizeof (unsigned int));
diff --git a/x11-misc/xcompmgr/xcompmgr-0.1_pre20040821-r1.ebuild b/x11-misc/xcompmgr/xcompmgr-0.1_pre20040821-r1.ebuild
new file mode 100644
index 000000000000..a55fab96ae49
--- /dev/null
+++ b/x11-misc/xcompmgr/xcompmgr-0.1_pre20040821-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcompmgr/xcompmgr-0.1_pre20040821-r1.ebuild,v 1.1 2004/08/22 07:15:52 seemant Exp $
+
+inherit eutils
+
+IUSE=""
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="X Compositing manager"
+HOMEPAGE="http://freedesktop.org/Software/xapps"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.7.99.902"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${PN}-fix.diff
+}
+
+src_compile() {
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.7
+	./autogen.sh || die
+	econf || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc ChangeLog
+}