X Strike Force X.Org X11 SVN commit: r1168 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2006-02-05 21:49:02 -0500 (Sun, 05 Feb 2006)
New Revision: 1168
Removed:
trunk/debian/patches/general/020_acpi_event_loop_fix.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
* Remove general/020_acpi_event_loop_fix.diff. This patch is the incorrect
fix, since the server should not be usurping the acpi file interface from
acpid when acpid is transiently restarted. We need a better fix.
(reopens: #345537) (closes: #347680)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-02-01 02:39:09 UTC (rev 1167)
+++ trunk/debian/changelog 2006-02-06 02:49:02 UTC (rev 1168)
@@ -4,11 +4,15 @@
* hurd/800_gnu_config.diff: Fix for local socket creation in the Hurd:
sockets are BSD4.4-like (closes: #348011).
- [ David Nusinow ]
+ [ David Nusinow ]
* Remove resize from xutils description. This program has been moved to the
xterm package as of Xorg 6.9 and xterm 208-3.
+ * Remove general/020_acpi_event_loop_fix.diff. This patch is the incorrect
+ fix, since the server should not be usurping the acpi file interface from
+ acpid when acpid is transiently restarted. We need a better fix.
+ (reopens: #345537) (closes: #347680)
- -- David Nusinow <dnusinow@debian.org> Tue, 17 Jan 2006 21:29:14 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 5 Feb 2006 21:44:59 -0500
xorg-x11 (6.9.0.dfsg.1-4) unstable; urgency=low
Deleted: trunk/debian/patches/general/020_acpi_event_loop_fix.diff
===================================================================
--- trunk/debian/patches/general/020_acpi_event_loop_fix.diff 2006-02-01 02:39:09 UTC (rev 1167)
+++ trunk/debian/patches/general/020_acpi_event_loop_fix.diff 2006-02-06 02:49:02 UTC (rev 1168)
@@ -1,39 +0,0 @@
-$Id$
-
-This fixes issues with the server choking when it's listening to acpid and
-acpid is shut down. See https://bugs.freedesktop.org/show_bug.cgi?id=5140
-and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345537.
-
-This patch by Mattia Dongili.
-
-Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c,v
-retrieving revision 1.2
-diff -u -r1.2 lnx_acpi.c
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c 31 Oct 2005 05:45:40 -0000 1.2
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c 2 Jan 2006 17:17:29 -0000
-@@ -45,6 +45,13 @@
- memset(ev, 0, LINE_LENGTH);
-
- n = read( fd, ev, LINE_LENGTH );
-+ if (n <= 0) {
-+ /* can only happen when reading from acpid socket */
-+ xf86MsgVerb(X_WARNING,3,"ACPI Event handler disappeared, reopening.\n");
-+ lnxCloseACPI();
-+ lnxACPIOpen();
-+ return 0;
-+ }
-
- /* Check that we have a video event */
- if (strstr(ev, "video") == ev) {
-@@ -160,6 +167,9 @@
- #ifdef DEBUG
- ErrorF("ACPI: Closing device\n");
- #endif
-+ xf86PMGetEventFromOs = NULL;
-+ xf86PMConfirmEventToOs = NULL;
-+
- if (ACPIihPtr) {
- fd = xf86RemoveInputHandler(ACPIihPtr);
- shutdown(fd, 2);
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-02-01 02:39:09 UTC (rev 1167)
+++ trunk/debian/patches/series 2006-02-06 02:49:02 UTC (rev 1168)
@@ -20,7 +20,6 @@
general/017_fix_Xlib_depend_target.diff -p0
general/018_mesa_debug_fglrx.diff -p0
general/019_iso8859-15_Compose_fix.diff -p0
-general/020_acpi_event_loop_fix.diff -p0
general/021_evdev_manpage.diff
general/022_disable_xmh.diff
general/023_specs_doc_fixes.diff -p0
Reply to: