diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-05-07 13:39:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-03 16:38:48 +0100 |
commit | f63e9b30eaa8107b8f66e3c118bd4d24185bf662 (patch) | |
tree | a4242770122a182f599be706adc364ea1e119372 /meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch | |
parent | 0420f7f47818d96964d48fd1309cea5f341432ed (diff) | |
download | poky-f63e9b30eaa8107b8f66e3c118bd4d24185bf662.tar.gz |
xserver-xorg: Upgrade 1.16.3 -> 1.17.1 (OELAYOUT_ABI change)
* Increase OELAYOUT_ABI: this is required because the
xf86-video-modesetting package moves from its own recipe to
xserver-xorg and sanity check cannot handle that currently.
The upgrade will delete old xf86-video-modesetting files from
sysroots.
* Remove upstreamed xserver-xorg patches
* Remove xf86-video-modesetting recipe: the driver is now included in
xserver-xorg recipe, which now produces the xf86-video-modesetting
package. The package version changes from 0.9 to 1.17.1
* Update xserver-xorg license checksum: modesetting license
info (another MIT one) has been added to the file
(From OE-Core rev: 950846d019ffac21909a96d90af8cf7e5bdd5738)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch deleted file mode 100644 index 604d23a376..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From db424318d0bb29cbcdf3a07fcc2e023586f1219f Mon Sep 17 00:00:00 2001 | ||
2 | From: Olivier Fourdan <fourdan@xfce.org> | ||
3 | Date: Fri, 2 Jan 2015 18:50:17 +0100 | ||
4 | Subject: [PATCH] Fix subwindow in Xi emulated events | ||
5 | |||
6 | Bug: 70790 | ||
7 | Upstream status: Submitted | ||
8 | https://bugs.freedesktop.org/show_bug.cgi?id=70790 | ||
9 | |||
10 | Signed-off-by: Olivier Fourdan <fourdan@xfce.org> | ||
11 | --- | ||
12 | Xi/exevents.c | 5 +++-- | ||
13 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/Xi/exevents.c b/Xi/exevents.c | ||
16 | index b0bc47e..0857bce 100644 | ||
17 | --- a/Xi/exevents.c | ||
18 | +++ b/Xi/exevents.c | ||
19 | @@ -1403,7 +1403,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, | ||
20 | |||
21 | if (grab->ownerEvents) { | ||
22 | WindowPtr focus = NullWindow; | ||
23 | - WindowPtr sprite_win = dev->spriteInfo->sprite->win; | ||
24 | + WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); | ||
25 | |||
26 | deliveries = DeliverDeviceEvents(sprite_win, ptrev, grab, focus, dev); | ||
27 | } | ||
28 | @@ -1429,8 +1429,9 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, | ||
29 | } | ||
30 | else { | ||
31 | GrabPtr devgrab = dev->deviceGrab.grab; | ||
32 | + WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); | ||
33 | |||
34 | - DeliverDeviceEvents(win, ptrev, grab, win, dev); | ||
35 | + DeliverDeviceEvents(sprite_win, ptrev, grab, win, dev); | ||
36 | /* FIXME: bad hack | ||
37 | * Implicit passive grab activated in response to this event. Store | ||
38 | * the event. | ||
39 | -- | ||
40 | 2.1.0 | ||
41 | |||