From 608136c02644aa6f18d5910f6913f34fcd91500a328c36bb614aa0d9ab7597dc Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 8 Aug 2008 09:49:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=91 --- commit-50e80c3.diff | 31 ------------------------------- commit-f6401f9.diff | 27 --------------------------- xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 9 ++++----- 4 files changed, 10 insertions(+), 63 deletions(-) delete mode 100644 commit-50e80c3.diff delete mode 100644 commit-f6401f9.diff diff --git a/commit-50e80c3.diff b/commit-50e80c3.diff deleted file mode 100644 index 9371b68..0000000 --- a/commit-50e80c3.diff +++ /dev/null @@ -1,31 +0,0 @@ -commit 50e80c39870adfdc84fdbc00dddf1362117ad443 -Author: Peter Hutterer -Date: Wed Dec 19 16:20:36 2007 +1030 - - include: never overwrite realInputProc with enqueueInputProc. Bug #13511 - - In some cases (triggered by a key repeat during a sync grab) XKB unwrapping - can overwrite the device's realInputProc with the enqueueInputProc. When the - grab is released and the events are replayed, we end up in an infinite loop. - Each event is replayed and in replaying pushed to the end of the queue again. - - This fix is a hack only. It ensures that the realInputProc is never - overwritten with the enqueueInputProc. - - This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511) - (cherry picked from commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335) - -diff --git a/include/xkbsrv.h b/include/xkbsrv.h -index 6425e37..bf386e7 100644 ---- a/include/xkbsrv.h -+++ b/include/xkbsrv.h -@@ -258,7 +258,8 @@ typedef struct - device->public.processInputProc = proc; \ - oldprocs->processInputProc = \ - oldprocs->realInputProc = device->public.realInputProc; \ -- device->public.realInputProc = proc; \ -+ if (proc != device->public.enqueueInputProc) \ -+ device->public.realInputProc = proc; \ - oldprocs->unwrapProc = device->unwrapProc; \ - device->unwrapProc = unwrapproc; - diff --git a/commit-f6401f9.diff b/commit-f6401f9.diff deleted file mode 100644 index 6f25ce3..0000000 --- a/commit-f6401f9.diff +++ /dev/null @@ -1,27 +0,0 @@ -commit f6401f944d327cc5d9a7ee0bbdf4f7fc8eaa31e8 -Author: Matthias Hopf -Date: Fri Nov 23 16:12:49 2007 +0100 - - Don't segfault if referring to a relative output where no modes survived. - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 5a1ed8c..8595d96 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1079,6 +1079,16 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes) - any_set = TRUE; - continue; - } -+ if (!modes[or]) -+ { -+ xf86DrvMsg (scrn->scrnIndex, X_ERROR, -+ "Cannot position output %s relative to output %s without modes\n", -+ output->name, relative_name); -+ output->initial_x = 0; -+ output->initial_y = 0; -+ any_set = TRUE; -+ continue; -+ } - if (relative->initial_x == POSITION_UNSET) - { - keep_going = TRUE; diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index cec98eb..3de5e50 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 8 10:50:48 CEST 2008 - sndirsch@suse.de + +- commit-50e80c3.diff obsolete now (bnc #415680) +- commit-f6401f9.diff obsolete + ------------------------------------------------------------------- Wed Aug 6 17:24:40 CEST 2008 - schwab@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index d87e4cb..f5201af 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 139 +Release: 141 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -86,9 +86,7 @@ Patch72: randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff Patch77: fbdevhw.diff Patch79: edit_data_sanity_check.diff Patch83: ia64linuxPciInit.diff -Patch88: commit-f6401f9.diff Patch93: pixman.diff -Patch99: commit-50e80c3.diff Patch101: zap_warning_xserver.diff Patch103: confine_to_shape.diff Patch104: bitmap_always_unscaled.diff @@ -204,9 +202,7 @@ popd %patch79 -p1 ### FIXME #%patch83 -%patch88 -p1 %patch93 -%patch99 -p1 %patch101 -p1 %patch103 %patch104 -p1 @@ -534,6 +530,9 @@ exit 0 %endif %changelog +* Fri Aug 08 2008 sndirsch@suse.de +- commit-50e80c3.diff obsolete now (bnc #415680) +- commit-f6401f9.diff obsolete * Wed Aug 06 2008 schwab@suse.de - Fix crash in Xvnc when handling selections. * Tue Aug 05 2008 sndirsch@suse.de