summaryrefslogtreecommitdiffstats
path: root/debian/patches/16_xserver_path.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 17:43:08 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 17:43:08 +0000
commitf450ba4056f3af0d17aeb1e5534619ce2231b63d (patch)
tree22ac78ea73d361fe6af5cafc06a338dc03c1745a /debian/patches/16_xserver_path.patch
parentAdding upstream version 43.0. (diff)
downloadgdm3-debian/43.0-3.tar.xz
gdm3-debian/43.0-3.zip
Adding debian version 43.0-3.debian/43.0-3debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/16_xserver_path.patch')
-rw-r--r--debian/patches/16_xserver_path.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/16_xserver_path.patch b/debian/patches/16_xserver_path.patch
new file mode 100644
index 0000000..317ed83
--- /dev/null
+++ b/debian/patches/16_xserver_path.patch
@@ -0,0 +1,29 @@
+From: Josselin Mouette <joss@debian.org>
+Date: Fri, 7 May 2010 21:42:02 +0200
+Subject: Use X_PATH and related environment variables when they exist
+
+Based on a patch by Julien Cristau.
+
+Origin: vendor, Debian
+Forwarded: no
+---
+ build-aux/find-x-server.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/build-aux/find-x-server.sh b/build-aux/find-x-server.sh
+index b5a8075..f48557e 100755
+--- a/build-aux/find-x-server.sh
++++ b/build-aux/find-x-server.sh
+@@ -11,7 +11,11 @@
+ # and /usr/X11 since they often symlink to each other, and configure
+ # should use the more stable location (the real directory) if possible.
+ #
+-if test -x /usr/bin/X; then
++
++if test -n "$X_BIN"; then
++ # assume the user set these variables and don't second-guess them.
++ echo "$X_BIN"
++elif test -x /usr/bin/X; then
+ echo "/usr/bin/X"
+ elif test -x /usr/X11/bin/Xserver; then
+ echo "/usr/X11/bin/Xserver"