source: proiecte/PPPP/gdm/debian/patches/02_x_server_location.patch @ 134

Last change on this file since 134 was 134, checked in by (none), 14 years ago

gdm sources with the modifications for webcam
File size: 1.4 KB
RevLine 
[134]1#
2# Description: Change the default X server location to /usr/bin/X. This avoids having to build-depend on xserver-xorg.
3# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=588848
4#
5diff -Nur -x '*.orig' -x '*~' gdm-2.27.90/configure gdm-2.27.90.new/configure
6--- gdm-2.27.90/configure       2009-08-25 07:07:12.000000000 +1000
7+++ gdm-2.27.90.new/configure   2009-08-25 14:34:49.000000000 +1000
8@@ -34484,9 +34484,9 @@
9 else
10    # what to do, what to do, this is wrong, but this just sets the
11    # defaults, perhaps this user is cross compiling or some such
12-   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
13-   X_SERVER_PATH="/usr/X11R6/bin"
14-   X_SERVER="/usr/X11R6/bin/X"
15+   X_PATH="/usr/bin"
16+   X_SERVER_PATH="/usr/bin"
17+   X_SERVER="/usr/bin/X"
18    X_CONFIG_OPTIONS="-audit 0"
19 fi
20 
21diff -Nur -x '*.orig' -x '*~' gdm-2.27.90/configure.ac gdm-2.27.90.new/configure.ac
22--- gdm-2.27.90/configure.ac    2009-08-25 14:34:48.000000000 +1000
23+++ gdm-2.27.90.new/configure.ac        2009-08-25 14:34:49.000000000 +1000
24@@ -1129,9 +1129,9 @@
25 else
26    # what to do, what to do, this is wrong, but this just sets the
27    # defaults, perhaps this user is cross compiling or some such
28-   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
29-   X_SERVER_PATH="/usr/X11R6/bin"
30-   X_SERVER="/usr/X11R6/bin/X"
31+   X_PATH="/usr/bin"
32+   X_SERVER_PATH="/usr/bin"
33+   X_SERVER="/usr/bin/X"
34    X_CONFIG_OPTIONS="-audit 0"
35 fi
36 
Note: See TracBrowser for help on using the repository browser.