[Mesa-stable] [Mesa-dev] [PATCH 1/5] meson: Actually load translation files

[Dylan Baker]

Quoting Andres Gomez (2018-08-29 07:37:57)
> Dylan, due to a previously backport requested by Emil, this patch has
> bumped into some trivial conflict I have resolved.
> 
> Please, check that everything looks in order.
> 
> You can find the commit here (staging/18.2):
> https://gitlab.freedesktop.org/mesa/mesa/commit/f958837964784315c1dc633f41f1ef5d2a17aea9
> 
> 
> On Fri, 2018-08-24 at 07:13 -0700, Dylan Baker wrote:
> > Currently we run the script but don't actually load any files, even in a
> > tarball where they exist.
> > 
> > Fixes: 3218056e0eb375eeda470058d06add1532acd6d4
> >        ("meson: Build i965 and dri stack")
> > ---
> >  src/util/xmlpool/meson.build | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/src/util/xmlpool/meson.build b/src/util/xmlpool/meson.build
> > index 346b1956a55..3d2de0cdc3a 100644
> > --- a/src/util/xmlpool/meson.build
> > +++ b/src/util/xmlpool/meson.build
> > @@ -22,7 +22,10 @@ xmlpool_options_h = custom_target(
> >    'xmlpool_options.h',
> >    input : ['gen_xmlpool.py', 't_options.h'],
> >    output : 'options.h',
> > -  command : [prog_python, '@INPUT@', meson.current_source_dir()],
> > +  command : [
> > +    prog_python, '@INPUT@', meson.current_source_dir(),
> > +    'ca', 'es', 'de', 'nl', 'sv', 'fr',
> > +  ],
> >    capture : true,
> >    depend_files : files('ca.po', 'es.po', 'de.po', 'nl.po', 'sv.po', 'fr.po'),
> >  )
> -- 
> Br,
> 
> Andres

Looks good, Thanks Andres.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-stable/attachments/20180829/5a7cdcc4/attachment.sig>