Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f73f3b25cf48bd0e5ba030f287f9c0ae99d0230a

commit f73f3b25cf48bd0e5ba030f287f9c0ae99d0230a
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sat Jul 11 13:42:31 2009 +0200

xorg-server-1.6.1-8-i686

* Remove bug13511.patch, the bug is fixed since the 1.4.x release fix
cycle. (And I wonder if it did not reintroduce the bug in some way, as
I saw on my desktop).

diff --git a/source/x11/xorg-server/FrugalBuild 
b/source/x11/xorg-server/FrugalBuild
index 195d5ce..5238670 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -33,7 +33,6 @@ replaces=('xorg-compat' 'xorg-server-ati' 'xorg-server-chips' 
\
backup=('etc/sysconfig/desktop')
Finclude sourceforge xorg
source=(${sour...@]} \
-       bug13511.patch \
01-kernel-headers-fix.patch \
02-access_c_skip_null_addresses.patch \
03-black-background.patch \
@@ -44,7 +43,6 @@ source=(${sour...@]} \
xfree86-Makefile.patch)

sha1sums=('aef6d1cd1cbb97fa3214fde6fbefb03a45578132' \
-          'cc156003c1e8787b04f6949d4e12f859e939c5e6' \
'f31702e0029b2d68018598e73ed55c4d6c58367b' \
'859b98a4049400be152032fc09ceff2afe9e6dcf' \
'863ad92892785c3785b122bf54d0def4d4d2732c' \
@@ -83,8 +81,6 @@ build() {
Fpatch F-xorg-x11-server-0.99.3-init-origins-fix.patch0
# Hack for init scripts and wrong install stuff for xprint
#Fpatch xprint-rc-files-fix.patch
-       ## fixes from 1.4-branch
-       Fpatch bug13511.patch

# Fix dbus config path
#Fsed "$(sysconfdir)" "/etc/" config/Makefile.*
diff --git a/source/x11/xorg-server/bug13511.patch 
b/source/x11/xorg-server/bug13511.patch
deleted file mode 100644
index 2b709b8..0000000
--- a/source/x11/xorg-server/bug13511.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 60144ac814ee26e151186f7c93cb1a273468d497 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <pe...@cs.unisa.edu.au>
-Date: Wed, 19 Dec 2007 16:20:36 +1030
-Subject: [PATCH] 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)
-(cherry picked from commit 50e80c39870adfdc84fdbc00dddf1362117ad443)
----
- include/xkbsrv.h |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/include/xkbsrv.h b/include/xkbsrv.h
-index 167dbec..9174eb6 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;
-
---
-1.5.3.8
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to