diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2007-08-02 00:45:38 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2007-08-02 00:45:38 +0000 |
| commit | 1c85c33f7bf1d5813df25e8026528a1057ec7603 (patch) | |
| tree | 6309231374f31d29f7c2dadbd8e2c1ae4a88fc29 /x11-base | |
| parent | (#63732) Revbump for keyboard LED fixes. (diff) | |
| download | gentoo-2-1c85c33f7bf1d5813df25e8026528a1057ec7603.tar.gz gentoo-2-1c85c33f7bf1d5813df25e8026528a1057ec7603.tar.bz2 gentoo-2-1c85c33f7bf1d5813df25e8026528a1057ec7603.zip | |
(#185705) Stop Xephyr from crashing when applications quit.
(Portage version: 2.1.3_rc9)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch | 30 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.3.0.0.ebuild | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index e8bcde7112c9..2c8782ad8601 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.250 2007/08/01 22:19:57 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.251 2007/08/02 00:45:38 dberkholz Exp $ + + 02 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.3.0.0-xephyr_crash_at_exit.patch, xorg-server-1.3.0.0.ebuild: + (#185705) Stop Xephyr from crashing when applications quit. 01 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; +files/1.2.0-fix-amd-cpu-detection.patch, diff --git a/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch b/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch new file mode 100644 index 000000000000..4e5b1304c2d2 --- /dev/null +++ b/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch @@ -0,0 +1,30 @@ +* Tue Mar 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-2 +- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual + mess. (#231425) + +https://bugs.freedesktop.org/show_bug.cgi?id=10713 +http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xserver-1.2.99.901-xephyr-crash-at-exit.patch?rev=1.1&view=log +Debian bug #420421 (and maybe #424517) + +--- xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c.jx 2007-03-07 14:15:25.000000000 -0500 ++++ xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c 2007-03-13 14:27:38.000000000 -0400 +@@ -281,12 +281,14 @@ + __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen; + int i; + +- for (i = 0; i < mesaScreen->num_vis; i++) { +- if (mesaScreen->xm_vis[i]) +- XMesaDestroyVisual(mesaScreen->xm_vis[i]); +- } ++ if (mesaScreen->xm_vis) { ++ for (i = 0; i < mesaScreen->num_vis; i++) { ++ if (mesaScreen->xm_vis[i]) ++ XMesaDestroyVisual(mesaScreen->xm_vis[i]); ++ } + +- xfree(mesaScreen->xm_vis); ++ xfree(mesaScreen->xm_vis); ++ } + + __glXScreenDestroy(screen); + diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild index 76794a3ce7a7..7509e1a54296 100644 --- a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild +++ b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.12 2007/08/01 22:19:57 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.13 2007/08/02 00:45:38 dberkholz Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -271,6 +271,7 @@ PATCHES=" ${FILESDIR}/avoid-crash-on-minimized-xv-window.patch ${FILESDIR}/xorg-server-sam225bw-quirks.patch ${FILESDIR}/1.3-alpha-build-fix.patch + ${FILESDIR}/1.3.0.0-xephyr_crash_at_exit.patch " pkg_setup() { |