Attachment 182807 Details for Bug 304399

[patch] GDM patch to be approved by Hans Petter

gdm-xdm.patch (text/plain), 4.34 KB, created by Rodrigo Moya on 2007-11-09 14:58:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rodrigo Moya

Created: 2007-11-09 14:58:28 UTC

Size: 4.34 KB

patch

obsolete

>--- gdm-xdm-sessions.patch.orig	2007-11-09 15:52:14.000000000 +0100
>+++ gdm-xdm-sessions.patch	2007-11-07 00:06:21.000000000 +0100
>@@ -1,10 +1,127 @@
>-Index: gdm-2.17.7/config/Xsession.in
>-================================================================================
>---- gdm-2.19.3/config/Xsession.in
>-+++ gdm-2.19.3/config/Xsession.in
>-@@ -1,278 +1,2 @@
>--#!@XSESSION_SHELL@
>--#
>+--- gdm-2.20.0-orig/config/Init.in	2007-09-17 16:45:50.000000000 +0200
>++++ gdm-2.20.0/config/Init.in	2007-11-07 00:03:29.000000000 +0100
>+@@ -1,89 +1,2 @@
>+ #!/bin/sh
>+-# Stolen from the debian kdm setup, aren't I sneaky
>+-# Plus a lot of fun stuff added
>+-#  -George
>+-
>+-PATH=@X_PATH@:$PATH
>+-OLD_IFS=$IFS
>+-
>+-gdmwhich () {
>+-  COMMAND="$1"
>+-  OUTPUT=
>+-  IFS=:
>+-  for dir in $PATH
>+-  do
>+-    if test -x "$dir/$COMMAND" ; then
>+-      if test "x$OUTPUT" = "x" ; then
>+-        OUTPUT="$dir/$COMMAND"
>+-      fi
>+-    fi
>+-  done
>+-  IFS=$OLD_IFS 
>+-  echo "$OUTPUT"
>+-}
>+-
>+-sysresources=/etc/X11/Xresources
>+-
>+-# merge in defaults
>+-if [ -f "$sysresources" ]; then
>+-    xrdb -merge "$sysresources"
>+-fi
>+-
>+-sysmodmap=/etc/X11/Xmodmap
>+-
>+-XMODMAP=`gdmwhich xmodmap`
>+-if [ x$XMODMAP != x ] ; then
>+-  if [ x$GDM_PARENT_DISPLAY = x ]; then
>+-    if [ -f $sysmodmap ]; then
>+-      $XMODMAP $sysmodmap
>+-    fi
>+-  else
>+-    ( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $XMODMAP -pke ) | $XMODMAP -
>+-  fi
>+-
>+-  #
>+-  # Switch Sun's Alt and Meta mod mappings
>+-  #
>+-
>+-  UNAME=`gdmwhich uname`
>+-  PROCESSOR=`$UNAME -p`
>+-  if [ x$PROCESSOR = xsparc ]; then
>+-    if $XMODMAP | /usr/bin/grep mod4 | /usr/bin/grep Alt > /dev/null 2>/dev/null
>+-    then
>+-      $XMODMAP -e "clear Mod1" \
>+-               -e "clear Mod4" \
>+-               -e "add Mod1 = Alt_L" \
>+-               -e "add Mod1 = Alt_R" \
>+-               -e "add Mod4 = Meta_L" \
>+-               -e "add Mod4 = Meta_R"
>+-    fi
>+-  fi
>+-fi
>+-
>+-SETXKBMAP=`gdmwhich setxkbmap`
>+-if [ x$SETXKBMAP != x ] ; then
>+-  # FIXME: is this all right?  Is this completely on crack?
>+-  # What this does is move the xkb configuration from the GDM_PARENT_DISPLAY
>+-  # FIXME: This should be done in code.  Or there must be an easier way ...
>+-  if [ -n "$GDM_PARENT_DISPLAY" ]; then
>+-    XKBSETUP=`( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $SETXKBMAP -v )`
>+-    if [ -n "$XKBSETUP" ]; then
>+-      XKBKEYMAP=`echo "$XKBSETUP" | grep '^keymap' | awk '{ print $2 }'`
>+-      XKBTYPES=`echo "$XKBSETUP" | grep '^types' | awk '{ print $2 }'`
>+-      XKBCOMPAT=`echo "$XKBSETUP" | grep '^compat' | awk '{ print $2 }'`
>+-      XKBSYMBOLS=`echo "$XKBSETUP" | grep '^symbols' | awk '{ print $2 }'`
>+-      XKBGEOMETRY=`echo "$XKBSETUP" | grep '^geometry' | awk '{ print $2 }'`
>+-      if [ -n "$XKBKEYMAP" ]; then
>+-        $SETXKBMAP -keymap "$XKBKEYMAP"
>+-      elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" -a -n "$XKBGEOMETRY" ]; then
>+-        $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS" -geometry "$XKBGEOMETRY"
>+-      elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" ]; then
>+-        $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS"
>+-      elif [ -n "$XKBSYMBOLS" ]; then
>+-        $SETXKBMAP -symbols "$XKBSYMBOLS"
>+-      fi
>+-    fi
>+-  fi
>+-fi
>+-
>+-exit 0
>++exec /etc/X11/xdm/Xsetup
>+--- gdm-2.20.0-orig/config/PostSession.in	2007-09-17 16:45:50.000000000 +0200
>++++ gdm-2.20.0/config/PostSession.in	2007-11-07 00:03:57.000000000 +0100
>+@@ -1,22 +1,3 @@
>+ #!/bin/sh
>+ 
>+-PATH="@X_PATH@:$PATH:/bin:/usr/bin"
>+-OLD_IFS=$IFS
>+-
>+-gdmwhich () {
>+-  COMMAND="$1"
>+-  OUTPUT=
>+-  IFS=:
>+-  for dir in $PATH
>+-  do
>+-    if test -x "$dir/$COMMAND" ; then
>+-      if test "x$OUTPUT" = "x" ; then
>+-        OUTPUT="$dir/$COMMAND"
>+-      fi
>+-    fi
>+-  done
>+-  IFS=$OLD_IFS 
>+-  echo "$OUTPUT"
>+-}
>+-
>+-exit 0
>++exec /etc/X11/xdm/Xreset
>+--- gdm-2.20.0-orig/config/Xsession.in	2007-09-17 16:45:50.000000000 +0200
>++++ gdm-2.20.0/config/Xsession.in	2007-11-07 00:04:54.000000000 +0100
>+@@ -1,278 +1,3 @@
>+ #!@XSESSION_SHELL@
>+ #
> -# This is SORT OF LIKE an X session, but not quite.  You get a command as the
> -# first argument (it could be multiple words, so run it with "eval").  As a
> -# special case, the command can be:
>@@ -281,6 +398,4 @@
> -fi
> -
> -exec xterm -geometry 80x24+0+0
>-+#!/bin/sh
> +exec /etc/X11/xdm/Xsession $1 $GDM_LANG
>-\ No newline at end of file

Actions: View | Diff

Attachments on bug 304399: 175991 | 176123 | 176214 | 176294 | 176295 | 176296 | 176628 | 182807 | 183888 | 183897