diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-13 04:08:51 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-13 04:08:51 +0000 |
| commit | 308ff0999c5363721f89b322ea81af380f6656e9 (patch) | |
| tree | d9c4bcc1090ca62facdf32da930be0dda7fab006 /x11-libs/libXcomposite | |
| parent | pull in dev-util/pkgconfig #151028 (diff) | |
| download | gentoo-2-308ff0999c5363721f89b322ea81af380f6656e9.tar.gz gentoo-2-308ff0999c5363721f89b322ea81af380f6656e9.tar.bz2 gentoo-2-308ff0999c5363721f89b322ea81af380f6656e9.zip | |
Add a fix from upstream that removes an unnecessary call to UnlockDisplay.
This fixes behaviour with xcb enabled in libX11.
(Portage version: 2.1.2_pre2-r9)
Diffstat (limited to 'x11-libs/libXcomposite')
4 files changed, 40 insertions, 1 deletions
diff --git a/x11-libs/libXcomposite/ChangeLog b/x11-libs/libXcomposite/ChangeLog index 3c30b8618f38..d1782b333356 100644 --- a/x11-libs/libXcomposite/ChangeLog +++ b/x11-libs/libXcomposite/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/libXcomposite # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/ChangeLog,v 1.28 2006/10/01 16:59:29 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/ChangeLog,v 1.29 2006/10/13 04:08:51 joshuabaergen Exp $ + +*libXcomposite-0.3-r1 (13 Oct 2006) + + 13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/drop-extra-unlockdisplay.patch, +libXcomposite-0.3-r1.ebuild: + Add a fix from upstream that removes an unnecessary call to UnlockDisplay. + This fixes behaviour with xcb enabled in libX11. 01 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; libXcomposite-0.3.ebuild: diff --git a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r1 b/x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r1 new file mode 100644 index 000000000000..d4543f70cf7b --- /dev/null +++ b/x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r1 @@ -0,0 +1,3 @@ +MD5 135d4b02d63c59178922cea8765a24c1 libXcomposite-0.3.tar.bz2 218916 +RMD160 4dda230431ba4666104ea84944a61b70e7f23cf4 libXcomposite-0.3.tar.bz2 218916 +SHA256 455f042df4de2bea0f69d7b5efb9be0717fc069ce3222e922707e5a639ea116e libXcomposite-0.3.tar.bz2 218916 diff --git a/x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch b/x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch new file mode 100644 index 000000000000..73345b129dfb --- /dev/null +++ b/x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch @@ -0,0 +1,10 @@ +--- src/Xcomposite.c ++++ src/Xcomposite.c +@@ -235,8 +235,6 @@ XCompositeQueryVersion (Display *dpy, + XCompositeCheckExtension (dpy, info, 0); + *major_versionp = info->major_version; + *minor_versionp = info->minor_version; +- UnlockDisplay (dpy); +- SyncHandle (); + return 1; + } diff --git a/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild new file mode 100644 index 000000000000..cd180b7c7bac --- /dev/null +++ b/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild,v 1.1 2006/10/13 04:08:51 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="X.Org Xcomposite library" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +RDEPEND="x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXext + >=x11-proto/compositeproto-0.3 + x11-proto/xproto" +DEPEND="${RDEPEND}" + +PATCHES="${FILESDIR}/drop-extra-unlockdisplay.patch" |