[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#931386: stretch-pu: package fribidi/0.19.7-1.1



On Wed, Jul 03, 2019 at 07:36:55PM +0200, Samuel Thibault wrote:
> Package: release.debian.org
> Severity: normal
> Tags: stretch
> User: release.debian.org@packages.debian.org
> Usertags: pu
> 
> Hello,
> 
> As reported on #917909, the text-based debian installer support for
> right-to-left languages is completely broken, only due to a path
> mismatch. This was fixed in Buster in January with the attached change,
> which I have uploaded to stretch as 0.19.7-1.1, could you accept it?

Looks OK to me, d-i ack needed.

thanks,

> 
> Thanks,
> Samuel
> 
> -- System Information:
> Debian Release: 10.0
>   APT prefers testing
>   APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
> 
> Kernel: Linux 5.1.0 (SMP w/8 CPU cores)
> Kernel taint flags: TAINT_OOT_MODULE
> Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)

> commit 8469bfead9515ab3644f1769a1ff51466ba8ffee
> Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
> Date:   Mon Jul 1 02:31:02 2019 +0200
> 
>     Fix crash on XkbSetMap
>     
>     Some devices may not have keyboard information.
>     
>     Fixes #574
> 
> diff --git a/xkb/xkb.c b/xkb/xkb.c
> index 764079506..9bd45a34a 100644
> --- a/xkb/xkb.c
> +++ b/xkb/xkb.c
> @@ -2383,6 +2383,9 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req,
>      XkbSymMapPtr map;
>      int i;
>  
> +    if (!dev->key)
> +        return 0;
> +
>      xkbi = dev->key->xkbInfo;
>      xkb = xkbi->desc;
>  
> @@ -2495,6 +2498,9 @@ _XkbSetMap(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req, char *values)
>      XkbSrvInfoPtr xkbi;
>      XkbDescPtr xkb;
>  
> +    if (!dev->key)
> +        return Success;
> +
>      xkbi = dev->key->xkbInfo;
>      xkb = xkbi->desc;
>  
> commit fabc4219622f3c0b41b1cb897c46e092377059e3
> Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
> Date:   Mon Jul 1 02:33:26 2019 +0200
> 
>     Fix crash on XkbSetMap
>     
>     Since group_info and width are used for the key actions allocations,
>     when modifying them we need to take care of reallocation key actions if
>     needed.
> 
> diff --git a/xkb/xkb.c b/xkb/xkb.c
> index 9bd45a34a..3162574a4 100644
> --- a/xkb/xkb.c
> +++ b/xkb/xkb.c
> @@ -2110,6 +2110,9 @@ SetKeySyms(ClientPtr client,
>                  }
>              }
>          }
> +        if (XkbKeyHasActions(xkb, i + req->firstKeySym))
> +            XkbResizeKeyActions(xkb, i + req->firstKeySym,
> +                                XkbNumGroups(wire->groupInfo) * wire->width);
>          oldMap->kt_index[0] = wire->ktIndex[0];
>          oldMap->kt_index[1] = wire->ktIndex[1];
>          oldMap->kt_index[2] = wire->ktIndex[2];


-- 
Jonathan Wiltshire                                      jmw@debian.org
Debian Developer                         http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51


Reply to: