[xorg-x11-server/f15/master] xserver-1.9.99.1-xfree86-don-t-overwrite-option-list-32115.patch (#676827) xserver-1.9.99.1-xfree86-
Peter Hutterer
whot at fedoraproject.org
Fri Feb 25 03:00:55 UTC 2011
commit 188d999bf281bbb043ccce46697305e7b960b675
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Feb 25 13:00:44 2011 +1000
xserver-1.9.99.1-xfree86-don-t-overwrite-option-list-32115.patch (#676827)
xserver-1.9.99.1-xfree86-swap-the-order-to-be-merged-lists-in-xf86Col.patch
(#676827)
xorg-x11-server.spec | 12 +++++-
...xfree86-don-t-overwrite-option-list-32115.patch | 41 ++++++++++++++++++++
...p-the-order-to-be-merged-lists-in-xf86Col.patch | 38 ++++++++++++++++++
3 files changed, 89 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 05bf6e5..9f46282 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -30,7 +30,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.9.99.1
-Release: 5%{?gitdate:.%{gitdate}}%{dist}
+Release: 6%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -98,7 +98,10 @@ Patch7006: xserver-1.9.99.901-xkb-repeat-issues.patch
Patch7007: xserver-1.9.99.1-xkb-split-out-keymap-compilation.patch
# d3499556d8d83396fa2585bd00371a81e086be36
Patch7008: xserver-1.9.99.1-xkb-if-the-keymap-failed-to-compile-load-the-default.patch
-
+# beea2378f142556471c62290e275935af848e137
+Patch7009: xserver-1.9.99.1-xfree86-don-t-overwrite-option-list-32115.patch
+# 9db9e964f6ca553dcbd3b7b037745d9581eaa065
+Patch7010: xserver-1.9.99.1-xfree86-swap-the-order-to-be-merged-lists-in-xf86Col.patch
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@@ -559,6 +562,11 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
+* Fri Feb 25 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.1-6.20101201
+- xserver-1.9.99.1-xfree86-don-t-overwrite-option-list-32115.patch (#676827)
+- xserver-1.9.99.1-xfree86-swap-the-order-to-be-merged-lists-in-xf86Col.patch
+ (#676827)
+
* Thu Feb 24 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.1-5.20101201
- xserver-1.9.99.1-xkb-split-out-keymap-compilation.patch (#676827 prep work)
- xserver-1.9.99.1-xkb-if-the-keymap-failed-to-compile-load-the-default.patch
diff --git a/xserver-1.9.99.1-xfree86-don-t-overwrite-option-list-32115.patch b/xserver-1.9.99.1-xfree86-don-t-overwrite-option-list-32115.patch
new file mode 100644
index 0000000..8bb6a1e
--- /dev/null
+++ b/xserver-1.9.99.1-xfree86-don-t-overwrite-option-list-32115.patch
@@ -0,0 +1,41 @@
+From beea2378f142556471c62290e275935af848e137 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Mon, 6 Dec 2010 14:33:43 +1000
+Subject: [PATCH] xfree86: don't overwrite option list (#32115)
+
+Options set in the configuration file were unconditionally overwritten by
+the server. Merge the already existing options and the new options together
+instead of just overwriting ones.
+
+Introduced in commit 2199842ed50b3eb40d54146827fc58cae7e873ec
+Author: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu Sep 2 10:52:54 2010 +1000
+
+ xfree86: remove extraOptions field from IDevRec.
+
+X.Org Bug 32115 <http://bugs.freedesktop.org/show_bug.cgi?id=32115>
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
+Tested-by: David Ronis <ronis at ronispc.chem.mcgill.ca>
+---
+ hw/xfree86/common/xf86Config.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 5800700..c352f3c 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -1465,7 +1465,8 @@ configInputDevices(XF86ConfLayoutPtr layout, serverLayoutPtr servlayoutp)
+ free(indp);
+ return FALSE;
+ }
+- indp[count]->options = irp->iref_option_lst;
++ indp[count]->options = xf86OptionListMerge(indp[count]->options,
++ irp->iref_option_lst);
+ count++;
+ irp = (XF86ConfInputrefPtr)irp->list.next;
+ }
+--
+1.7.4
+
diff --git a/xserver-1.9.99.1-xfree86-swap-the-order-to-be-merged-lists-in-xf86Col.patch b/xserver-1.9.99.1-xfree86-swap-the-order-to-be-merged-lists-in-xf86Col.patch
new file mode 100644
index 0000000..8f7788a
--- /dev/null
+++ b/xserver-1.9.99.1-xfree86-swap-the-order-to-be-merged-lists-in-xf86Col.patch
@@ -0,0 +1,38 @@
+From 9db9e964f6ca553dcbd3b7b037745d9581eaa065 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Fri, 10 Dec 2010 13:23:13 +1000
+Subject: [PATCH] xfree86: swap the order to-be-merged lists in xf86CollectInputOptions.
+
+Current order causes the user-configured option list to be overwritten with
+the default list supplied by the driver. Swap around so we overwrite the
+driver's default values instead.
+
+This only affected options supplied by the driver such as XkbLayout in the
+case of evdev.
+
+Reported-by: Sebastian Glita <glseba at yahoo.com>
+Reported-by: Simon Thum <simon.thum at gmx.de>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+Reviewed-by: Simon Thum <simon.thum at gmx.de>
+Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
+Tested-by: Sebastian Glita <glseba at yahoo.com>
+---
+ hw/xfree86/common/xf86Option.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c
+index d49aa31..16c27e5 100644
+--- a/hw/xfree86/common/xf86Option.c
++++ b/hw/xfree86/common/xf86Option.c
+@@ -130,7 +130,7 @@ xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts)
+ if (defaultOpts) {
+ XF86OptionPtr tmp =xf86optionListCreate(defaultOpts, -1, 0);
+ if (pInfo->options)
+- pInfo->options = xf86optionListMerge(pInfo->options, tmp);
++ pInfo->options = xf86optionListMerge(tmp, pInfo->options);
+ else
+ pInfo->options = tmp;
+ }
+--
+1.7.4
+
More information about the scm-commits
mailing list