cherry-pick candidate for a future 1.20.9 release

Michel Dänzer michel at daenzer.net
Wed Apr 15 09:46:03 UTC 2020


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2020-04-14 7:46 p.m., Matthieu Herrb wrote:
> On Tue, Apr 14, 2020 at 11:12:37AM +0200, Michel Dänzer wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>>
>> On 2020-04-13 7:52 p.m., Matthieu Herrb wrote:
>>> Hi,
>>>
>>> I'd like to nominate 364d64981549544213e2bca8de6ff8a5b2b5a69e
>>> as a commit to cherry-pick into a future release of the 1.20
>>> branch.
>>>
>>> Without this commit, SDL 1.2 games in full screen get FocusOut
>>> events every couple of seconds, and this is causing in some of
>>> them (burgerspace is an example that was used to show me the
>>> issue) it will pause the game, rendering it un-playable.
>>>
>>> |commit 364d64981549544213e2bca8de6ff8a5b2b5a69e |Author:
>>> Samuel Thibault <samuel.thibault at ens-lyon.org> |Date:   Tue Oct
>>> 30 18:43:51 2018 +0100 | |    dix: do not send focus event when
>>> grab actually does not change
>>>
>>> Thanks in advance.
>>
>> Can you create a GitLab merge request for server-1.20-branch?
>
> Hi,
>
> Done. Hope it's right as I've not used gitlab much yet...
>
> https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/422

Thanks!

Just two nits:

Use "git cherry-pick -x" for backports in general, so the commit log
contains a reference to the original commit on master. (You can fix up
the commit log and force-push to your personal branch)

Check the "allow [...] with access to the target branch" box in the MR
settings. (This isn't currently needed for this MR, but it often is in
other cases, so it's better to always check it when creating an MR)


- -- 
Earthling Michel Dänzer               |               https://redhat.com
Libre software enthusiast             |             Mesa and X developer
-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQSwn681vpFFIZgJURRaga+OatuyAAUCXpbX1gAKCRBaga+Oatuy
AJXLAJ9VtX8MwKA77b++mG93BgVlopovNQCcDvgicaK9bgFctwI0LFVzeZODJ+k=
=wpx9
-----END PGP SIGNATURE-----


More information about the xorg-devel mailing list