]>
Commit | Line | Data |
---|---|---|
82848b6f JB |
1 | --- gdm-3.38.0/meson.build.orig 2020-09-11 22:34:27.208127000 +0200 |
2 | +++ gdm-3.38.0/meson.build 2020-09-17 20:33:51.861967317 +0200 | |
3 | @@ -70,23 +70,8 @@ | |
4 | dependency('xau'), | |
5 | ], | |
6 | ) | |
7 | -find_x_server_script = find_program('build-aux/find-x-server.sh', native: true) | |
8 | -find_x_server_out = run_command(find_x_server_script).stdout().strip() | |
9 | -if find_x_server_out != '' | |
10 | - x_bin = find_x_server_out | |
11 | - x_bin_path_split = x_bin.split('/') | |
12 | - i = 0 | |
13 | - x_path = '/' | |
14 | - foreach dir : x_bin_path_split | |
15 | - if i < x_bin_path_split.length() - 1 | |
16 | - x_path = x_path / dir | |
17 | - endif | |
18 | - i = i + 1 | |
19 | - endforeach | |
20 | -else | |
21 | - # what to do, what to do, this is wrong, but this just sets the | |
22 | - # defaults, perhaps this user is cross compiling or some such | |
23 | - x_path = '/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin' | |
24 | +if true | |
25 | + x_path = '/usr/bin' | |
26 | x_bin = '/usr/bin/X' | |
27 | endif | |
28 | xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp')) |