diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gnome/gdm/cross-xdetection.diff | 84 | ||||
| -rw-r--r-- | packages/gnome/gdm_2.24.1.bb | 11 |
2 files changed, 92 insertions, 3 deletions
diff --git a/packages/gnome/gdm/cross-xdetection.diff b/packages/gnome/gdm/cross-xdetection.diff new file mode 100644 index 0000000000..9cb6ac98dd --- /dev/null +++ b/packages/gnome/gdm/cross-xdetection.diff @@ -0,0 +1,84 @@ +--- /tmp/configure.ac 2008-12-10 08:38:16.000000000 +0100 ++++ gdm-2.24.1/configure.ac 2008-12-10 08:39:17.000000000 +0100 +@@ -1133,80 +1133,10 @@ + dnl - Check for X Server location + dnl --------------------------------------------------------------------------- + +-# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often +-# symlink to each other, and configure should use the more stable +-# location (the real directory) if possible. +-# +-# On Solaris, the /usr/bin/Xserver script is used to decide whether to +-# use Xsun or Xorg, so this is used on Solaris. +-# +-# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6 +-# 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/X11/bin/Xserver; then +- X_PATH="/usr/X11/bin" +- X_SERVER_PATH="/usr/X11/bin" +- X_SERVER="/usr/X11/bin/Xserver" +- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin" +- X_CONFIG_OPTIONS="-audit 0" +-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then +- X_PATH="/usr/X11R6/bin" +- X_SERVER_PATH="/usr/X11R6/bin" +- X_SERVER="/usr/X11R6/bin/X" +- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin" +- X_CONFIG_OPTIONS="-audit 0" +-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then +- X_PATH="/usr/X11/bin" +- X_SERVER_PATH="/usr/X11/bin" +- X_SERVER="/usr/X11/bin/X" +- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/X11R6/bin/X; then +- X_PATH="/usr/X11R6/bin" +- X_SERVER_PATH="/usr/X11R6/bin" +- X_SERVER="/usr/X11R6/bin/X" +- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/bin/Xorg; then + X_PATH="/usr/bin" + X_SERVER_PATH="/usr/bin" +- X_SERVER="/usr/bin/Xorg" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/X11/bin/X; then +- X_PATH="/usr/X11/bin" +- X_SERVER_PATH="/usr/X11/bin" +- X_SERVER="/usr/X11/bin/X" +- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/openwin/bin/Xsun; then +- # Do not add /usr/openwin/bin here because on Solaris you need +- # /usr/openwin/bin in your PATH even if you are using the Xorg +- # Xserver. We add this to the path below. +- X_PATH="/usr/openwin/bin" +- X_SERVER_PATH="/usr/openwin/bin" +- X_SERVER="/usr/openwin/bin/Xsun" +- X_CONFIG_OPTIONS="-audit 0 -nobanner" +-elif test -x /opt/X11R6/bin/X; then +- X_PATH="/opt/X11R6/bin" +- X_SERVER_PATH="/opt/X11R6/bin" +- X_SERVER="/opt/X11R6/bin/X" +- GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/bin/X; then +- X_PATH="/usr/bin" +- X_SERVER_PATH="/usr/bin" +- X_SERVER="/usr/bin/X" +- X_CONFIG_OPTIONS="-audit 0" +-else +- # 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_SERVER_PATH="/usr/X11R6/bin" +- X_SERVER="/usr/X11R6/bin/X" +- GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin" ++ X_SERVER="/etc/X11/Xserver" + X_CONFIG_OPTIONS="-audit 0" +-fi + + # Don't add bindir to GDM_USER_PATH if it is already in the PATH. + # If it is /bin or /usr/bin, for example. diff --git a/packages/gnome/gdm_2.24.1.bb b/packages/gnome/gdm_2.24.1.bb index cdca2f87ae..408bcfe793 100644 --- a/packages/gnome/gdm_2.24.1.bb +++ b/packages/gnome/gdm_2.24.1.bb @@ -1,17 +1,22 @@ DESCRIPTION = "Graphical login manager" LICENSE = "GPL" -DEPENDS = "libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl" +DEPENDS = "consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl" -PR = "r1" +PR = "r2" inherit gnome update-rc.d -SRC_URI += "file://%gconf-tree.xml \ +SRC_URI += "file://cross-xdetection.diff;patch=1 \ + file://%gconf-tree.xml \ file://gdm.conf \ file://gdm \ " +EXTRA_OECONF = " --enable-authentication-scheme=shadow \ + --with-console-kit \ + --disable-scrollkeeper " + do_install_prepend() { mkdir -p ${D}/var/lib/gdm/.gconf.mandatory cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ |