xorg-server: Changes to 'ubuntu+1'
debian/changelog | 1 +
debian/control | 1 +
2 files changed, 2 insertions(+)
New commits:
commit d50475a92c11d8ab92bc5ba72754d0c7807fe4d4
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Wed Feb 6 15:01:54 2013 -0500
Bump libxi-dev requirement and ABI_XINPUT_VERSION.
diff --git a/debian/changelog b/debian/changelog
index 296f6c8..fe9af99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,11 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
* Add patch to fix build failure of xserver-xorg-core-udeb.
- 02_hide_panoramix_symbol.diff
+ [ Robert Hooker ]
+ * Update to a newer git snapshot, 7fe5e6dfa5c1e71
+ * Bump input ABI version in serverminver
+ * Bump libxi-dev build requirement to 2:1.6.99.1
+
-- Robert Hooker <sarvatt@ubuntu.com> Wed, 22 Aug 2012 11:12:17 -0400
xorg-server (2:1.12.4-4) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 2e39428..046959d 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Build-Depends:
libxext-dev (>= 1:0.99.1),
libx11-dev (>= 1:0.99.2),
libxrender-dev (>= 1:0.9.0),
- libxi-dev (>= 2:1.2.99.1),
+ libxi-dev (>= 2:1.6.99.1),
x11proto-dmx-dev (>= 1:2.2.99.1),
libdmx-dev (>= 1:1.0.1),
libxpm-dev (>= 1:3.5.3),
diff --git a/debian/serverminver b/debian/serverminver
index b3cde97..2c9fb36 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
2:1.13.99.901
ABI_VIDEODRV_VERSION:14.1
-ABI_XINPUT_VERSION:18.0
+ABI_XINPUT_VERSION:19.0
commit e8a18664634557b52f2e32557826d9472e31c26e
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Wed Feb 6 14:56:34 2013 -0500
Bump ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 3a69859..f010b72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,372 @@
+commit 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
+Author: Jasper St. Pierre <jstpierre@mecheye.net>
+Date: Wed Jan 23 13:11:55 2013 -0500
+
+ protocol-versions: Bump minor version of XI
+
+ This was accidentally excluded when we added barriers.
+
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 70b127c9f1c53bdb42f078265e67f76b464deae2
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Jan 10 17:01:17 2013 -0800
+
+ config/udev: fix "removing GPU device" format string mistake
+
+ udev.c: In function 'device_removed':
+ udev.c:270:9: warning: format '%d' expects argument of type 'int', but argument 3 has type 'const char *' [-Wformat]
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 605dfc6804a05ff2bda5692fec26c37344fd95cb
+Author: Dave Airlie <airlied@gmail.com>
+Date: Tue Jan 22 07:39:53 2013 +1000
+
+ xserver: fix build regression since 91ab237358c6e33da854914d3de493a9cbea7637
+
+ inputstr, double defines TouchListener typedef, maybe some gcc handles it,
+ but not all.
+
+ fixes tinderbox
+
+ Reported-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 069d8ed3eb659c48dd2b0f8b7b8c11f092fdb362
+Merge: 591c062 d6dcde7
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Jan 20 15:58:38 2013 -0800
+
+ Merge remote-tracking branch 'jturney/xserver-next'
+
+commit 591c06277bb120ab9615633f2d28addbd3a2aa5f
+Merge: 6703a7c fa6ab7d
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Jan 20 15:52:26 2013 -0800
+
+ Merge remote-tracking branch 'whot/for-keith'
+
+commit d6dcde7a03bb38c17ffc4ec5f0ca1c161e54569f
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sat Feb 11 12:22:17 2012 +0000
+
+ hw/xwin: Stop assuming WS_EX_APPWINDOW style in WM_SHOWWINDOW
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 56e94403f8f9182e05428d895a983371c7737d2a
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Wed Jan 9 20:15:01 2013 +0000
+
+ hw/xwin: Use ITaskBarList interface to ensure show-on-taskbar state is updated correctly
+
+ Use ITaskBarList interface to ensure that the taskbar notices if the window has
+ changed it's style in a way which affects if the taskbar shows it or not.
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit c94d1cb0a49106f44714f4511720a197cc549164
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jan 10 14:35:56 2013 +0000
+
+ hw/xwin: Ensure full styling is applied when the window is mapped
+
+ Move styling update code from WM_WM_HINTS_EVENT to a function UpdateStyle(),
+ which is also invoked from WM_WM_MAP3, so everything which needs to be done
+ to style the window happens when it is mapped
+
+ (Otherwise, the appearance of the window is sensitive to the timing of the
+ notification of the windows appearance hint properties being set relative to
+ window creation. e.g. see [1])
+
+ [1] http://sourceware.org/ml/cygwin-xfree/2012-06/msg00004.html
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit ef61f8cacc84080c9156675f9ce26a27e8a90ac1
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sat Mar 31 18:45:28 2012 +0100
+
+ hw/xwin: Make sure that WM_WM_HINTS_EVENT does nothing for override-redirect windows
+
+ Future work: It looks like this code could be rationalized quite a lot: It might
+ make sense to pull the checking for override-redirect up out of UpdateIcon() and
+ UpdateName() and consolidate WM_WM_MAP2 and WM_WM_MAP3
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 3628559e594fcbdfcc14b1e8fa60aa841f184e19
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sun Feb 5 11:25:39 2012 +0000
+
+ hw/xwin: Add a new WM_WM_HINTS_EVENT event to update window style
+
+ Add a new WM_WM_HINTS_EVENT event to update window style if any of the
+ properties which affect window style change
+
+ Check PropertyNotify events for any of the window properties which we consider
+ to decide on the window style, and update the window style by sending a
+ WM_WM_HINTS_EVENT message to the WM.
+
+ This allows the styling of the window to change during it's lifetime.
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 066ecbd11d516ea68d7ebc7470232d01c5717546
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jan 10 14:37:45 2013 +0000
+
+ hw/xwin: Move reshape code from winUpdateWindowPosition() to the map event handler
+
+ Move reshape code, which was only used when handling a map event, from
+ winUpdateWindowPosition(), to put it explicitly in the map event handler.
+
+ Remove 'reshape' parameter from winUpdatePosition().
+
+ (Note that there's no handling of the ShapeNotify event to notice when the
+ window shape changes, instead we hook the screen SetShape procedure and reshape
+ the native window then)
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 852d1fb042f4160fe023a015f1c9a34126bf911a
+Author: Ryan Pavlik <rpavlik@iastate.edu>
+Date: Sat Dec 1 16:58:40 2012 +0000
+
+ hw/xwin: Add missing include xwin-config.h to winglobals.h
+
+ winglobals.h checks if RELOCATE_PROJECTROOT is defined to see if a declaration
+ of g_fLogFileChanged is needed, so must include xwin-config.h
+
+ Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit ab686ce029208abf970a4bcd1435bf8411a44de9
+Author: Ryan Pavlik <rpavlik@iastate.edu>
+Date: Wed Oct 26 17:03:25 2011 -0500
+
+ include: Add RELOCATE_PROJECTROOT to xwin-config.h header
+
+ RELOCATE_PROJECTROOT is AC_DEFINED in configure.ac, but currently has no effect
+ as it doesn't appear in any AC_CONFIG_HEADER header.
+
+ When packaged for Windows, we do not have a unix-style filesystem tree, where
+ file needed by the X server can be found in fixed, absolute paths under the
+ prefix (PROJECTROOT).
+
+ Instead, the filesystem tree containing files needed by the X server and clients
+ will be installed with the directory containing the X server executable as the
+ root directory of that tree.
+
+ (Typically, this will be in the Program Files directory, which does not have a
+ fixed name, as it can be moved, localized, or added to to indicate x86 or x64
+ binaries)
+
+ So, RELOCATE_PROJECTROOT is used to make a native Windows build of the X server
+ look for various files (fonts, xkb data) in locations relative to the X server
+ rather than at absolute paths, by translating those paths at run-time.
+
+ Additionally the XKEYSYMDB, XERRORDB, XLOCALEDIR env vars checked by libX11 are
+ set appropriately for clients started by the X server.
+
+ Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit fa6ab7d9b2d7fd8184f1e068360607845f5c33ab
+Merge: adde4e6 0e1ab43
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jan 11 14:58:17 2013 +1000
+
+ Merge branch 'pointer-emulation-fixes-56558-v2' into for-keith
+
+commit adde4e64480315dc5b47a727ee37d86f5cd8584f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jan 10 10:33:05 2013 +1000
+
+ dix: typo fix in comment
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 05ed095dd8d6cf939b4ebd9a59d70ce32705df7c
+Author: Benjamin Tissoires <benjamin.tissoires@gmail.com>
+Date: Wed Jan 9 19:32:19 2013 +0100
+
+ dix: fix error logging occuring in signal context of GetTouchEvents
+
+ GetTouchEvents is usually called in a signal context.
+ Calling ErrorF for the error messages leads to X complaining about log:
+
+ (EE) BUG: triggered 'if (inSignalContext)'
+ (EE) BUG: log.c:484 in LogVMessageVerb()
+ (EE) Warning: attempting to log data in a signal unsafe manner while in signal context.
+ Please update to check inSignalContext and/or use LogMessageVerbSigSafe() or ErrorFSigSafe().
+ The offending log format message is:
+ %s: Attempted to start touch without x/y (driver bug)
+
+ Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f4a58469a298c226668fd8dce375bf22331c902d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jan 9 13:58:56 2013 +1000
+
+ xfree86: don't access the old input handler after freeing it
+
+ Introduced in 323869f3298cbbfe864af9404a8aed1bf7995d79
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit 205cfbd6d9824fb9a67c21b19bc8f1e66c9df4d2
+Author: Dave Airlie <airlied@gmail.com>
+Date: Sat Jan 5 18:35:42 2013 +1000
+
+ xf86: bump input ABI version to 19
+
+ The changes to miPointerSetPosition interface from int->double breaks
+ the SIS driver build, so time to bump this.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ad3bc571348a7007a2960bf87ae739397c5511ee
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jan 8 11:19:09 2013 +1000
+
+ xfree86: update the device state for all DGA events (#59100)
+
+ DGA only handles master devices but it does intercept slave device events as
+ well (since the event handlers are per event type, not per device).
+
+ The DGA code must thus call into UpdateDeviceState to reset the button/key
+ state on the slave device before it discards the remainder of the event.
+
+ Test case:
+ - Passive GrabModeSync on VCP
+ - Press button
+ - Enable DGA after ButtonPress
+ - AllowEvents(SyncPointer)
+ - Release button
+
+ The button release is handled by DGAProcessPointerEvent but the device state
+ is never updated, so the slave ends up with the button permanently down.
+ And since the master's button state is the union of the slave states, the
+ master has the button permanently down.
+
+ X.Org Bug 59100 <http://bugs.freedesktop.org/show_bug.cgi?id=59100>
+
+ Reported-by: Steven Elliott <selliott4@austin.rr.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit c5f2818edbec2f87383baa6c6be5c389b73ca6f9
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jan 8 10:13:53 2013 +1000
+
+ xfree86: set event->detail for DGA pointer events
+
+ Reported-by: Steven Elliott <selliott4@austin.rr.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit 519d183d78e0b0eaf47a473e94f5d8611baf8463
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Jan 7 10:44:33 2013 +1000
+
+ Fix two typos "requires an string value"
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4e13dd90144dde47550aceea4db4b4329e531279
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Aug 22 10:34:07 2012 +1000
+
+ dix: don't filter RawEvents if the grab window is not the root window (#53897)
+
+ If a XI2.1+ client has a grab on a non-root window, it must still receive
+ raw events on the root window.
+
+ Test case: register for XI_ButtonPress on window and XI_RawMotion on root.
+ No raw events are received once the press activates an implicit grab on the
+ window.
+
+ X.Org Bug 53897 <http://bugs.freedesktop.org/show_bug.cgi?id=53897>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit a2037d7080ae64ea55f7d76971716346aa3ec6d3
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Wed Nov 28 22:25:35 2012 +0000
+
+ hw/xwin: Fix MinGW build of winSetAppModelID.c
+
+ Add missing #include <pthread.h>
+
+ In file included from /jhbuild/checkout/xorg/xserver/hw/xwin/winSetAppUserModelID.c:31:0:
+ /jhbuild/checkout/xorg/xserver/hw/xwin/winwindow.h:140:11: error: expected declaration specifiers or ‘...’ before ‘pthread_t’
+ /jhbuild/checkout/xorg/xserver/hw/xwin/winwindow.h:141:11: error: expected declaration specifiers or ‘...’ before ‘pthread_t’
+ /jhbuild/checkout/xorg/xserver/hw/xwin/winwindow.h:142:11: error: expected declaration specifiers or ‘...’ before ‘pthread_mutex_t’
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit f57100bb36eae3b4d75f3c315973405f705b8de6
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Tue Feb 23 13:38:48 2010 +0000
+
+ hw/xwin: Process one Windows message per wakeup, rather than all of them.
+
+ De-queuing Windows messages and X events happens in the same thread of
+ execution. Draining the windows message queue can lead to the X event queue
+ overflowing if lots of those windows messages cause X events (e.g. if a keyboard
+ macro program has just dumped thousands of keypresses into the Windows message
+ queue). See the mailing list thread [1] for more details.
+
+ Processing one Windows message per wakeup, rather than all of them gives the X
+ server a chance to do stuff as well after each message.
+
+ [1] http://cygwin.com/ml/cygwin-xfree/2010-01/msg00056.html
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit e30e1ea98720acc583f34c830a1c1b7e3e88f694
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Mon Dec 17 22:38:25 2012 +0000
+
+ hw/xwin: Fix some comments in winkeybd.c
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 6f4a48f8a55bc54b6d3e9d80734be05750c024de
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Apr 1 15:08:26 2010 +0100
+
+ hw/xwin: Bring the X screen window to the front on a single left-click on the tray icon
+
+ Bring the X screen window to the front on a single left click on the tray icon,
+ like the comment says we do
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
commit 6703a7c7cf1a349c137e247a0c8eb462ff7b07be
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 8 20:24:32 2013 -0800
@@ -11,6 +380,148 @@ Date: Tue Jan 8 20:24:32 2013 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
+commit 0e1ab433f4048b3367bb2f01d16cd00502538e4d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jan 4 12:26:58 2013 +1000
+
+ dix: remove already-moved hunk
+
+ Should've been removed in bc1f90a615018c05994fae3e678dd2341256cd82a, but got
+ left here due to a botched rebase.
+
+ Fixes stray button events sent to clients after deactivating an async
+ pointer grab on a pointer-emulating-touch.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 32a6d8a6b59c42f8d65002d7ca1cafb1957b656f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Dec 20 16:25:43 2012 +1000
+
+ dix: check for the right device's xi2 mask
+
+ events.c: In function 'DeactivatePointerGrab':
+ events.c:1524:51: warning: 'dev' may be used uninitialized in this function
+ [-Wuninitialized
+
+ dev is unset when we get here, the device to check is "mouse".
+ Introduced in ece8157a59751b3ed492fb2e1eb8d5f20221e195.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit f59499b5d05fde83813709e9848152951592120d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 30 12:44:08 2012 +1000
+
+ dix: add resource type to touch listeners
+
+ Instead of guessing what resource type the listener is and what property to
+ retrieve, store the resource type in the listener directly.
+
+ Breaks XIT test cases:
+ TouchGrabTestMultipleTaps.PassiveGrabPointerEmulationMultipleTouchesFastSuccession
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=56557
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
+
+commit 9ad0fdb135a1c336771aee1f6eab75a6ad874aff
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Nov 27 11:21:17 2012 -0800
+
+ input: Record grab pointer in TouchListener
+
+ This places a pointer to the grab related to a TouchListener directly
+ in the TouchListener structure rather than hoping to find the grab
+ later on using the resource ID.
+
+ Passive grabs have resource ID in the resource DB so they can be
+ removed when a client exits, and those resource IDs get copied when
+ activated, but implicit grabs are constructed on-the-fly and have no
+ resource DB entry.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 91ab237358c6e33da854914d3de493a9cbea7637
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Nov 27 11:21:16 2012 -0800
+
+ input: Pull TouchListener declaration to top-level
+
+ No reason to have a struct declared inside another struct
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3578cc3c2e1b5cb8eb191e2d12ad88e1bc9e6e1e
+Author: Andreas Wettstein <wettstein509@solnet.ch>
+Date: Wed Dec 19 18:13:21 2012 +0100
+
+ xkb: Do not use base group as an array index.
+
+ The base group is not brought into range and, therefore, using it as an array
+ index crashed the X server. Also, at this place, we should ignore locked
+ groups, but not latched groups. Therefore, use sum of base and latched groups,
+ brought into range.
+
+ Reproducible with:
+ key <FK07> {
+ type= "ONE_LEVEL",
+ symbols[Group1]= [ NoSymbol ],
+ actions[Group1]= [ LatchGroup(group=-1, clearLocks) ]
+ };
+
+ And hitting F7 will exceed the group level and access arbitrary memory.
+
+ Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit df746a73410b892a4d41a2934cf9cd2e8ad7ba51
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date: Wed Dec 19 18:42:39 2012 +0100
+
+ render: Unwrap early on the animated cursor BlockHandler
+
+ The loop above the previous call may end up triggering other
+ handlers attaching to the same function slot, so unwrapping
+ the handler after that could leave the just attached handler
+ in a dangling but not unset state.
+
+ This issue was most visible on the XO, where destroying a
+ window with an animated cursor set and running would trigger
+ this inconsistent state, never calling the miSpriteBlockHandler
+ again after the animated cursor is unset.
+
+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0fbd779a82919d5dbf8776be9b57a76c0eae6b14
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date: Wed Dec 19 18:42:38 2012 +0100
+
+ mi: Ensure pointer emulating touch events update the sprite
+
+ Different miPointerSpriteFuncRec implementations do a varying
+ business at ultimately calling miPointerUpdateSprite(), this
+ particularly fails when using the plain mi sprite on touch events,
+ where the sprite is just moved/updated on cursor changes.
+
+ So, ensure miPointerUpdateSprite() is called generically for
+ pointer emulating touch events as with regular motion events.
+
+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 8b328d4ee3873bc0a7a34f2cb9d301827244b98c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Dec 21 07:37:33 2012 -0800
@@ -52,6 +563,18 @@ Date: Fri Dec 21 07:37:33 2012 -0800
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
+commit 8f4820be7a2e0f6e286ddc85c4b75bccdbe8a730
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Dec 20 12:44:16 2012 +1000
+
+ test/xi2: fix compiler warning
+
+ protocol-xiwarppointer.c: In function ‘ScreenSetCursorPosition’:
+ protocol-xiwarppointer.c:71:53: warning: declaration of ‘screen’ shadows a
+ global declaration [-Wshadow]
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:47:35 2012 -0800
commit 9e6bfe25d0f35e83953ec38df1f802577e02edb5
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 29 13:52:16 2013 +0200
control: Mark xvfb as M-A: foreign.
diff --git a/debian/changelog b/debian/changelog
index 510c85d..296f6c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
* Remove 03_fix-panning.diff, upstream
* Refresh 04_int10-fix-pci_device_read_rom-usage.diff.
* Drop 09_EXA-Track...diff, upstream.
+ * control: Mark xvfb as M-A: foreign.
[ Maarten Lankhorst ]
* Remove upstreamed patches.
diff --git a/debian/control b/debian/control
index f3544da..2e39428 100644
--- a/debian/control
+++ b/debian/control
@@ -259,6 +259,7 @@ Depends:
${misc:Depends},
Recommends: xauth
Provides: xserver
+Multi-Arch: foreign
Description: Virtual Framebuffer 'fake' X server
Xvfb provides an X server that can run on machines with no display hardware
and no physical input devices. It emulates a dumb framebuffer using virtual
Reply to: