xorg-server: Changes to 'debian-experimental'
debian/changelog | 7 +++
debian/patches/17-fix-DRI2-segfault-when-clientGone.diff | 33 ---------------
debian/patches/series | 1
3 files changed, 7 insertions(+), 34 deletions(-)
New commits:
commit be9a61fd2ab1b9ac0c0b8cea1719bf0d929c733c
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jul 15 15:37:44 2010 +1000
Drop DRI2 segfault fix patch.
This is fixed upstream in commit 660f6ab5
diff --git a/debian/changelog b/debian/changelog
index 2b67be9..fdca61d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.8.99.905-2) UNRELEASED; urgency=low
+
+ * Drop 17-fix-DRI2-segfault-when-clientGone.diff: fixed upstream in more
+ generality.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 19 Jul 2010 12:48:10 +0200
+
xorg-server (2:1.8.99.905-1) experimental; urgency=low
* Drop recommends on xbase-clients.
diff --git a/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff b/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
deleted file mode 100644
index 2e75ca2..0000000
--- a/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From c1c59e7d5f0c6f0eea88657f892175166679da4f Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sat, 15 May 2010 19:24:30 +0100
-Subject: [PATCH] dri2: Only send the swap event if the client hasn't gone fishing
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-
- Bug 27497 - xorg crashes after update to 1.8.0
- https://bugs.freedesktop.org/show_bug.cgi?id=27497
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Kristian Høgsberg <krh@bitplanet.net>
----
- hw/xfree86/dri2/dri2ext.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-Index: xorg-server/hw/xfree86/dri2/dri2ext.c
-===================================================================
---- xorg-server.orig/hw/xfree86/dri2/dri2ext.c
-+++ xorg-server/hw/xfree86/dri2/dri2ext.c
-@@ -362,6 +362,9 @@
- xDRI2BufferSwapComplete event;
- DrawablePtr pDrawable = data;
-
-+ if (client->clientGone)
-+ return;
-+
- event.type = DRI2EventBase + DRI2_BufferSwapComplete;
- event.event_type = type;
- event.drawable = pDrawable->id;
diff --git a/debian/patches/series b/debian/patches/series
index f850a70..adf3c9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
#13_debian_add_xkbpath_env_variable.diff
15-nouveau.diff
16-xaa-fbcomposite-fix-negative-size.diff
-17-fix-DRI2-segfault-when-clientGone.diff
Reply to: