- adjusted defaults patch for fuzz 0

[packages/gdm.git] / gdm-defaults.patch

diff --git a/gdm-defaults.patch b/gdm-defaults.patch
index e8353845eb00ca6f1e08637559198724e64003e3..cc0101b1c04c8f54c0bda1566e0482435068aca6 100644 (file)
--- a/gdm-defaults.patch
+++ b/gdm-defaults.patch
@@ -1,14 +1,28 @@
-diff -urN gdm-2.20.0/configure.ac gdm-2.20.0.new/configure.ac
---- gdm-2.20.0/configure.ac    2007-09-17 16:46:22.000000000 +0200
-+++ gdm-2.20.0.new/configure.ac        2007-09-21 17:29:32.000000000 +0200
-@@ -1206,6 +1201,10 @@
-    X_SERVER="/usr/X11R6/bin/X"
-    X_CONFIG_OPTIONS="-audit 0"
- fi
-+X_PATH="/usr/bin"
-+X_SERVER_PATH="/usr/bin"
-+X_SERVER="/usr/bin/Xorg vt9"
-+X_CONFIG_OPTIONS="-audit 0"
- 
- dnl ---------------------------------------------------------------------------
- dnl - Check for Xnest / Xephyr support
+--- gdm-41.3/meson.build.orig  2022-01-12 21:07:22.248332481 +0100
++++ gdm-41.3/meson.build       2022-01-12 21:14:05.232427434 +0100
+@@ -72,23 +72,10 @@ x_deps = declare_dependency(
+ # Xserver 1.17 & later default to -nolisten and require -listen for remote access
+ xserver_deps = dependency('xorg-server', version : '>=1.17', required : false)
+ xserver_has_listen = xserver_deps.found()
+-find_x_server_script = find_program('build-aux/find-x-server.sh', native: true)
+-find_x_server_out = run_command(find_x_server_script).stdout().strip()
+-if find_x_server_out != ''
+-  x_bin = find_x_server_out
+-  x_bin_path_split = x_bin.split('/')
+-  i = 0
+-  x_path = '/'
+-  foreach dir : x_bin_path_split
+-    if i < x_bin_path_split.length() - 1
+-      x_path = x_path / dir
+-    endif
+-    i = i + 1
+-  endforeach
+-else
++if true
+   # what to do, what to do, this is wrong, but this just sets the
+   # defaults, perhaps this user is cross compiling or some such
+-  x_path = '/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin'
++  x_path = '/usr/bin'
+   x_bin = '/usr/bin/X'
+ endif
+ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))