projects / packages / gdm.git / blame
| Commit | Line | Data |
|---|---|---|
| 527fb459 JB |
1 | --- gdm-41.3/meson.build.orig 2022-01-12 21:07:22.248332481 +0100 |
| 2 | +++ gdm-41.3/meson.build 2022-01-12 21:14:05.232427434 +0100 | |
| 3 | @@ -72,23 +72,10 @@ x_deps = declare_dependency( | |
| fbba9a31 JB |
4 | # Xserver 1.17 & later default to -nolisten and require -listen for remote access |
| 5 | xserver_deps = dependency('xorg-server', version : '>=1.17', required : false) | |
| 6 | xserver_has_listen = xserver_deps.found() | |
| 82848b6f JB |
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 | |
| 527fb459 JB |
21 | +if true |
| 22 | # what to do, what to do, this is wrong, but this just sets the | |
| 23 | # defaults, perhaps this user is cross compiling or some such | |
| 82848b6f | 24 | - x_path = '/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin' |
| 82848b6f JB |
25 | + x_path = '/usr/bin' |
| 26 | x_bin = '/usr/bin/X' | |
| 527fb459 | 27 | endif |
| 82848b6f | 28 | xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp')) |