Re: [PATCH xserver] meson: use absolute paths in manpage substitutions
On Sat, Jun 30, 2018 at 12:53:35PM +0100, Jon Turney wrote:
> paths returned by get_option('foodir') are potentially relative to prefix
>
> Noticed when comparing manpages generated by a meson build with those
> generated by an autotools build
>
> Signed-off-by: Jon Turney
pushed, thanks
To git+ssh://git.freedesktop.org/git/xorg/xserver
38ff29ec8..49283e238 master -> master
Cheers,
Peter
> ---
> meson.build | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index f2c71fe27..706228228 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -520,9 +520,9 @@ manpage_config.set('libmansuffix', '3')
> manpage_config.set('miscmansuffix', '7')
> manpage_config.set('filemansuffix', '5')
> manpage_config.set('logdir', log_dir)
> -manpage_config.set('datadir', get_option('datadir'))
> -manpage_config.set('mandir', get_option('mandir'))
> -manpage_config.set('sysconfdir', get_option('sysconfdir'))
> +manpage_config.set('datadir', join_paths(get_option('prefix'),
> get_option('datadir')))
> +manpage_config.set('mandir', join_paths(get_option('prefix'),
> get_option('mandir')))
> +manpage_config.set('sysconfdir', join_paths(get_option('prefix'),
> get_option('sysconfdir')))
> manpage_config.set('xconfigdir', 'xorg.conf.d')
> manpage_config.set('xkbdir', xkb_dir)
> manpage_config.set('XKB_DFLT_RULES', get_option('xkb_default_rules'))
> --
> 2.17.0
>
> ___
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] meson: Add configuration of listening on tcp, unix and local
On Fri, Jun 29, 2018 at 09:44:27AM +0200, Laurent Carlier wrote: > Le jeudi 28 juin 2018, 07:16:42 CEST Peter Hutterer a écrit : > > On Tue, Jun 26, 2018 at 09:51:58PM -0700, Aaron Plattner wrote: > > > On 06/26/2018 06:12 PM, Peter Hutterer wrote: > > > > On Tue, Jun 26, 2018 at 01:07:23PM -0700, Aaron Plattner wrote: > > > > > On 06/24/2018 11:45 PM, Laurent Carlier wrote: > > > > > > Le samedi 16 juin 2018, 13:00:01 CEST Laurent Carlier a écrit : > > > > > > > bugzilla: https://bugs.kde.org/show_bug.cgi?id=395419 > > > > > > > bugzilla: https://bugs.archlinux.org/task/59025 > > > > > > > > > > > > > > Signed-off-by: Laurent Carlier > > > > > > > > > > Seems to work, so > > > > > Reviewed-by: Aaron Plattner > > > > > > > > > > This switches the defined version from > > > > > #define LISTEN_TCP 1 > > > > > to > > > > > #define LISTEN_TCP > > > > > but it's only used in an #ifndef so that's probably fine. > > > > > > > > best to change to meson's conf_data.set10() then to keep the exact > > > > functionality. > > > > > > No, that's worse. Then "meson -Dlisten_tcp=false" does this: > > > > > > #define LISTEN_TCP 0 > > > > > > which will enable TCP. Thanks, 1989 C preprocessor. > > > > rightyo. Pushed: > > > >c41d4ff48..2f39b2a07 master -> master > > > > > > Cheers, > >Peter > > > > You've forgotten the gitlab repo there is a gitlab repo for the server? where is it hiding? https://gitlab.freedesktop.org/xorg/ shows nothing and https://gitlab.freedesktop.org/freedesktop/freedesktop/issues/40 indicates that it's not done yet either. Cheers, Peter ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
