diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-06-08 17:56:00 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-08 17:56:00 +0200 |
| commit | f5b2fa5ea2d80e971fa5ca25b33771a503a0a54a (patch) | |
| tree | a0f7927d3adcfd4d78c877e84ae554757a177c84 /meta-gnome | |
| parent | 9f2c190edefe923afe664e5fc86de5f9ed9486c6 (diff) | |
| download | meta-openembedded-f5b2fa5ea2d80e971fa5ca25b33771a503a0a54a.tar.gz | |
gdm 2.30.0: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm-2.30.0/%gconf-tree.xml | 492 | ||||
| -rwxr-xr-x | meta-gnome/recipes-gnome/gdm/gdm-2.30.0/Default | 96 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff | 66 | ||||
| -rwxr-xr-x | meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm | 89 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-nodocs.patch | 12 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-pam | 11 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm.conf | 80 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml | 492 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff | 84 | ||||
| -rwxr-xr-x | meta-gnome/recipes-gnome/gdm/gdm/gdm | 73 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm/gdm-nodocs.patch | 12 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm/gdm.conf | 80 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm_2.30.0.bb | 85 |
13 files changed, 1672 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/%gconf-tree.xml b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/%gconf-tree.xml new file mode 100644 index 0000000000..f8c2e9cc20 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/%gconf-tree.xml @@ -0,0 +1,492 @@ +<?xml version="1.0"?> +<gconf> + <dir name="desktop"> + <dir name="gnome"> + <dir name="url-handlers"> + <dir name="ymsgr"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="xmpp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="webcal"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="uvox"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="trash"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="sip"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="rtsp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="rtp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="pnm"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="note"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="net"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="msnim"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="mmsh"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="mms"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="man"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="mailto"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="lastfm"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="itpc"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="itms"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="irc"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="info"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="icyx"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="icy"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="icq"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="https"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="http"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="h323"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="ghelp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="gg"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="ftp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="file"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="feed"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="cdda"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="callto"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="aim"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="about"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + </dir> + <dir name="lockdown"> + <entry name="disable_url_handlers" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_save_to_disk" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_print_setup" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_printing" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_lock_screen" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_command_line" mtime="1227173197" type="bool" value="true"> + </entry> + </dir> + <dir name="applications"> + <dir name="terminal"> + <entry name="exec" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + </dir> + <dir name="accessibility"> + <dir name="keyboard"> + <entry name="enable" mtime="1227173197" type="bool" value="true"> + </entry> + </dir> + </dir> + </dir> + </dir> + <dir name="apps"> + <dir name="gnome_settings_daemon"> + <dir name="keybindings"> + <entry name="www" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="stop" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="sleep" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="search" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="screensaver" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="previous" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="power" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="play" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="pause" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="next" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="media" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="home" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="help" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="email" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="calculator" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="eject" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + </dir> + </dir> + <dir name="metacity"> + <dir name="keybinding_commands"> + <entry name="command_window_screenshot" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + <entry name="command_screenshot" mtime="1227173197" type="string"> + <stringvalue>gdm-screenshot</stringvalue> + </entry> + </dir> + <dir name="global_keybindings"> + <entry name="switch_to_workspace_up" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="switch_to_workspace_right" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="switch_to_workspace_left" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="switch_to_workspace_down" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="switch_group" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="show_desktop" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="run_command_window_screenshot" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="run_command_screenshot" mtime="1227173197" type="string"> + <stringvalue>Print</stringvalue> + </entry> + <entry name="panel_run_dialog" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="panel_main_menu" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + </dir> + <dir name="general"> + <entry name="num_workspaces" mtime="1227173197" type="int" value="1"> + </entry> + </dir> + </dir> + <dir name="compiz"> + <dir name="general"> + <dir name="allscreens"> + <dir name="options"> + <entry name="run_command11_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command11_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command10_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command10_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command8_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command8_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command7_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command7_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command6_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command6_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command5_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command5_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command4_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command4_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command3_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command3_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command2_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command2_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command1_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command1_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command0_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command0_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="main_menu_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="main_menu_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="command_window_screenshot" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command11" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command10" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command9" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command8" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command7" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command6" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command5" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command4" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command3" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command2" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command1" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command0" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command_terminal" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command_screenshot" mtime="1227173197" type="string"> + <stringvalue>gdm-screenshot</stringvalue> + </entry> + <entry name="active_plugins" mtime="1227173197" type="list" ltype="string"> + <li type="string"> + <stringvalue>cube</stringvalue> + </li> + <li type="string"> + <stringvalue>decoration</stringvalue> + </li> + <li type="string"> + <stringvalue>gconf</stringvalue> + </li> + <li type="string"> + <stringvalue>glib</stringvalue> + </li> + <li type="string"> + <stringvalue>move</stringvalue> + </li> + <li type="string"> + <stringvalue>place</stringvalue> + </li> + <li type="string"> + <stringvalue>resize</stringvalue> + </li> + <li type="string"> + <stringvalue>screenshot</stringvalue> + </li> + <li type="string"> + <stringvalue>wobbly</stringvalue> + </li> + </entry> + </dir> + </dir> + </dir> + </dir> + <dir name="gnome-power-manager"> + <dir name="ui"> + <entry name="show_context_menu" mtime="1227173197" type="bool" value="false"> + </entry> + </dir> + </dir> + <dir name="gnome-screensaver"> + <entry name="power_management_delay" mtime="1227173197" type="int" value="30"> + </entry> + </dir> + <dir name="nautilus"> + <dir name="preferences"> + <entry name="show_desktop" mtime="1227173197" type="bool" value="false"> + </entry> + </dir> + </dir> + </dir> +</gconf> diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/Default b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/Default new file mode 100755 index 0000000000..a7a7fcf7fd --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/Default @@ -0,0 +1,96 @@ +#!/bin/sh +# Stolen from the debian kdm setup, aren't I sneaky +# Plus a lot of fun stuff added +# -George + +PATH="/usr/bin:$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 + +# FIXME: the housekeeping below really should be moved to the postinst of packages that require it +# brute force approach for now +update-desktop-database +glib-compile-schemas /usr/share/glib-2.0/schemas/ + +#x11vnc -q -bg -display :0 -forever -avahi -xkb + +exit 0 diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff new file mode 100644 index 0000000000..150f79763a --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff @@ -0,0 +1,66 @@ +--- gdm-2.26.1/configure.ac-orig 2009-03-16 12:50:10.000000000 -0700 ++++ gdm-2.26.1/configure.ac 2009-06-12 16:40:40.000000000 -0700 +@@ -1085,62 +1085,10 @@ dnl ------------------------------------ + # 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" +- 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" +- 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" +- 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" +- 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" +- 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" +- 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_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" +- X_CONFIG_OPTIONS="-audit 0" +-fi + + dnl --------------------------------------------------------------------------- + dnl - Check for Xnest / Xephyr support diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm new file mode 100755 index 0000000000..43eae95177 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm @@ -0,0 +1,89 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: gdm +# Should-Start: console-screen acpid dbus hal network-manager +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: GNOME Display Manager +# Description: Debian init script for the GNOME Display Manager +### END INIT INFO +# +# Author: Ryan Murray <rmurray@debian.org> +# +set -e + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/gdm + +test -x $DAEMON || exit 0 + +if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG LANGUAGE +fi + +# To start gdm even if it is not the default display manager, change +# HEED_DEFAULT_DISPLAY_MANAGER to "false." +HEED_DEFAULT_DISPLAY_MANAGER=true +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + +case "$1" in + start) + # make needed directories in volatile + + if [ -e /var/log/gdm ] ; then + rm -rf /var/log/gdm + fi + + mkdir -m 01770 /var/log/gdm + chown gdm:gdm /var/log/gdm + + if [ -e /tmp/.ICE-unix ] ; then + rm -rf /tmp/.ICE-unix + fi + + mkdir -m 01777 /tmp/.ICE-unix + chown root:root /tmp/.ICE-unix + + CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)") + if grep -wqs text /proc/cmdline; then + echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline." + elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \ + [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \ + [ "$CONFIGURED_DAEMON" != gdm ] ; then + echo "Not starting GNOME Display Manager; it is not the default display manager" + else + echo "Starting GNOME Display Manager" "gdm" + start-stop-daemon --start -b --exec $DAEMON + fi + ;; + stop) + echo "Stopping GNOME Display Manager" "gdm" + set +e + start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \ + --name gdm --retry 5 + set -e + ;; + reload) + echo "Scheduling reload of GNOME Display Manager configuration" "gdm" + set +e + start-stop-daemon --stop --signal USR1 --quiet --pidfile \ + /var/run/gdm.pid --name gdm + set -e + ;; + status) + status_of_proc -p "$PIDFILE" "$DAEMON" gdm && exit 0 || exit $? + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-nodocs.patch b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-nodocs.patch new file mode 100644 index 0000000000..395fa627eb --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-nodocs.patch @@ -0,0 +1,12 @@ +--- /tmp/Makefile.am 2006-07-26 11:37:52.000000000 +0200 ++++ gdm-2.14.9/Makefile.am 2006-07-26 11:38:01.734411000 +0200 +@@ -5,8 +5,7 @@ + vicious-extensions \ + daemon \ + gui \ +- utils \ +- docs ++ utils + + # add these when help gets added back + # docs omf-install diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-pam b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-pam new file mode 100644 index 0000000000..f9fafed9d6 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-pam @@ -0,0 +1,11 @@ +# +# default; standard UN*X access +# +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so + +auth optional pam_gnome_keyring.so +session optional pam_gnome_keyring.so auto_start + diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm.conf b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm.conf new file mode 100644 index 0000000000..559823b863 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm.conf @@ -0,0 +1,80 @@ +# GDM Custom Configuration file. +# +# This file is the appropriate place for specifying your customizations to the +# GDM configuration. If you run gdmsetup, it will automatically edit this +# file for you and will cause the daemon and any running GDM GUI programs to +# automatically update with the new configuration. Not all configuration +# options are supported by gdmsetup, so to modify some values it may be +# necessary to modify this file directly by hand. +# +# This file overrides the default configuration settings. These settings +# are stored in the GDM System Defaults configuration file, which is found +# at the following location. +# +# /usr/share/gdm/defaults.conf. +# +# This file contains comments about the meaning of each configuration option, +# so is also a useful reference. Also refer to the documentation links at +# the end of this comment for further information. In short, to hand-edit +# this file, simply add or modify the key=value combination in the +# appropriate section in the template below this comment section. +# +# For example, if you want to specify a different value for the Enable key +# in the "[debug]" section of your GDM System Defaults configuration file, +# then add "Enable=true" in the "[debug]" section of this file. If the +# key already exists in this file, then simply modify it. +# +# Older versions of GDM used the "gdm.conf" file for configuration. If your +# system has an old gdm.conf file on the system, it will be used instead of +# this file - so changes made to this file will not take effect. Consider +# migrating your configuration to this file and removing the gdm.conf file. +# +# If you hand edit a GDM configuration file, you can run the following +# command and the GDM daemon will immediately reflect the change. Any +# running GDM GUI programs will also be notified to update with the new +# configuration. +# +# gdmflexiserver --command="UPDATE_CONFIG <configuration key>" +# +# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable". +# +# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and +# re-read the new configuration settings. You can also restart GDM by sending +# a HUP or USR1 signal to the daemon. HUP behaves like gdm-restart and causes +# any user session started by GDM to exit immediately while USR1 behaves like +# gdm-safe-restart and will wait until all users log out before restarting GDM. +# +# For full reference documentation see the gnome help browser under +# GNOME|System category. You can also find the docs in HTML form on +# http://www.gnome.org/projects/gdm/ +# +# NOTE: Lines that begin with "#" are considered comments. +# +# Have fun! + +[daemon] + +[security] + +[xdmcp] + +[gui] + +[greeter] + +[chooser] + +[debug] + +# Note that to disable servers defined in the GDM System Defaults +# configuration file (such as 0=Standard, you must put a line in this file +# that says 0=inactive, as described in the Configuration section of the GDM +# documentation. +# +[servers] + +# Also note, that if you redefine a [server-foo] section, then GDM will +# use the definition in this file, not the GDM System Defaults configuration +# file. It is currently not possible to disable a [server-foo] section +# defined in the GDM System Defaults configuration file. +# diff --git a/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml b/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml new file mode 100644 index 0000000000..f8c2e9cc20 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml @@ -0,0 +1,492 @@ +<?xml version="1.0"?> +<gconf> + <dir name="desktop"> + <dir name="gnome"> + <dir name="url-handlers"> + <dir name="ymsgr"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="xmpp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="webcal"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="uvox"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="trash"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="sip"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="rtsp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="rtp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="pnm"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="note"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="net"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="msnim"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="mmsh"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="mms"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="man"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="mailto"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="lastfm"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="itpc"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="itms"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="irc"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="info"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="icyx"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="icy"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="icq"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="https"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="http"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="h323"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="ghelp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="gg"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="ftp"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="file"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="feed"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="cdda"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="callto"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="aim"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + <dir name="about"> + <entry name="command" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + </dir> + <dir name="lockdown"> + <entry name="disable_url_handlers" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_save_to_disk" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_print_setup" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_printing" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_lock_screen" mtime="1227173197" type="bool" value="true"> + </entry> + <entry name="disable_command_line" mtime="1227173197" type="bool" value="true"> + </entry> + </dir> + <dir name="applications"> + <dir name="terminal"> + <entry name="exec" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + </dir> + </dir> + <dir name="accessibility"> + <dir name="keyboard"> + <entry name="enable" mtime="1227173197" type="bool" value="true"> + </entry> + </dir> + </dir> + </dir> + </dir> + <dir name="apps"> + <dir name="gnome_settings_daemon"> + <dir name="keybindings"> + <entry name="www" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="stop" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="sleep" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="search" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="screensaver" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="previous" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="power" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="play" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="pause" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="next" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="media" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="home" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="help" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="email" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="calculator" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="eject" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + </dir> + </dir> + <dir name="metacity"> + <dir name="keybinding_commands"> + <entry name="command_window_screenshot" mtime="1227173197" type="string"> + <stringvalue>/bin/true</stringvalue> + </entry> + <entry name="command_screenshot" mtime="1227173197" type="string"> + <stringvalue>gdm-screenshot</stringvalue> + </entry> + </dir> + <dir name="global_keybindings"> + <entry name="switch_to_workspace_up" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="switch_to_workspace_right" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="switch_to_workspace_left" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="switch_to_workspace_down" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="switch_group" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="show_desktop" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="run_command_window_screenshot" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="run_command_screenshot" mtime="1227173197" type="string"> + <stringvalue>Print</stringvalue> + </entry> + <entry name="panel_run_dialog" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + <entry name="panel_main_menu" mtime="1227173197" type="string"> + <stringvalue>disabled</stringvalue> + </entry> + </dir> + <dir name="general"> + <entry name="num_workspaces" mtime="1227173197" type="int" value="1"> + </entry> + </dir> + </dir> + <dir name="compiz"> + <dir name="general"> + <dir name="allscreens"> + <dir name="options"> + <entry name="run_command11_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command11_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command10_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command10_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command8_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command8_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command7_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command7_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command6_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command6_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command5_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command5_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command4_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command4_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command3_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command3_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command2_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command2_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command1_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command1_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command0_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_command0_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="run_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="main_menu_key" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="main_menu_button" mtime="1227173197" type="string"> + <stringvalue>Disabled</stringvalue> + </entry> + <entry name="command_window_screenshot" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command11" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command10" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command9" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command8" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command7" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command6" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command5" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command4" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command3" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command2" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command1" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command0" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command_terminal" mtime="1227173197" type="string"> + <stringvalue></stringvalue> + </entry> + <entry name="command_screenshot" mtime="1227173197" type="string"> + <stringvalue>gdm-screenshot</stringvalue> + </entry> + <entry name="active_plugins" mtime="1227173197" type="list" ltype="string"> + <li type="string"> + <stringvalue>cube</stringvalue> + </li> + <li type="string"> + <stringvalue>decoration</stringvalue> + </li> + <li type="string"> + <stringvalue>gconf</stringvalue> + </li> + <li type="string"> + <stringvalue>glib</stringvalue> + </li> + <li type="string"> + <stringvalue>move</stringvalue> + </li> + <li type="string"> + <stringvalue>place</stringvalue> + </li> + <li type="string"> + <stringvalue>resize</stringvalue> + </li> + <li type="string"> + <stringvalue>screenshot</stringvalue> + </li> + <li type="string"> + <stringvalue>wobbly</stringvalue> + </li> + </entry> + </dir> + </dir> + </dir> + </dir> + <dir name="gnome-power-manager"> + <dir name="ui"> + <entry name="show_context_menu" mtime="1227173197" type="bool" value="false"> + </entry> + </dir> + </dir> + <dir name="gnome-screensaver"> + <entry name="power_management_delay" mtime="1227173197" type="int" value="30"> + </entry> + </dir> + <dir name="nautilus"> + <dir name="preferences"> + <entry name="show_desktop" mtime="1227173197" type="bool" value="false"> + </entry> + </dir> + </dir> + </dir> +</gconf> diff --git a/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff b/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff new file mode 100644 index 0000000000..9cb6ac98dd --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/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/meta-gnome/recipes-gnome/gdm/gdm/gdm b/meta-gnome/recipes-gnome/gdm/gdm/gdm new file mode 100755 index 0000000000..0d43a6f91a --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm/gdm @@ -0,0 +1,73 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: gdm +# Should-Start: console-screen acpid dbus hal network-manager +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: GNOME Display Manager +# Description: Debian init script for the GNOME Display Manager +### END INIT INFO +# +# Author: Ryan Murray <rmurray@debian.org> +# +set -e + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/gdm + +test -x $DAEMON || exit 0 + +if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG LANGUAGE +fi + +# To start gdm even if it is not the default display manager, change +# HEED_DEFAULT_DISPLAY_MANAGER to "false." +HEED_DEFAULT_DISPLAY_MANAGER=true +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + +case "$1" in + start) + CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)") + if grep -wqs text /proc/cmdline; then + echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline." + elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \ + [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \ + [ "$CONFIGURED_DAEMON" != gdm ] ; then + echo "Not starting GNOME Display Manager; it is not the default display manager" + else + echo "Starting GNOME Display Manager" "gdm" + start-stop-daemon --start --quiet --exec $DAEMON + fi + ;; + stop) + echo "Stopping GNOME Display Manager" "gdm" + set +e + start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \ + --name gdm --retry 5 + set -e + ;; + reload) + echo "Scheduling reload of GNOME Display Manager configuration" "gdm" + set +e + start-stop-daemon --stop --signal USR1 --quiet --pidfile \ + /var/run/gdm.pid --name gdm + set -e + ;; + status) + status_of_proc -p "$PIDFILE" "$DAEMON" gdm && exit 0 || exit $? + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm-nodocs.patch b/meta-gnome/recipes-gnome/gdm/gdm/gdm-nodocs.patch new file mode 100644 index 0000000000..395fa627eb --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm/gdm-nodocs.patch @@ -0,0 +1,12 @@ +--- /tmp/Makefile.am 2006-07-26 11:37:52.000000000 +0200 ++++ gdm-2.14.9/Makefile.am 2006-07-26 11:38:01.734411000 +0200 +@@ -5,8 +5,7 @@ + vicious-extensions \ + daemon \ + gui \ +- utils \ +- docs ++ utils + + # add these when help gets added back + # docs omf-install diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf b/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf new file mode 100644 index 0000000000..559823b863 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf @@ -0,0 +1,80 @@ +# GDM Custom Configuration file. +# +# This file is the appropriate place for specifying your customizations to the +# GDM configuration. If you run gdmsetup, it will automatically edit this +# file for you and will cause the daemon and any running GDM GUI programs to +# automatically update with the new configuration. Not all configuration +# options are supported by gdmsetup, so to modify some values it may be +# necessary to modify this file directly by hand. +# +# This file overrides the default configuration settings. These settings +# are stored in the GDM System Defaults configuration file, which is found +# at the following location. +# +# /usr/share/gdm/defaults.conf. +# +# This file contains comments about the meaning of each configuration option, +# so is also a useful reference. Also refer to the documentation links at +# the end of this comment for further information. In short, to hand-edit +# this file, simply add or modify the key=value combination in the +# appropriate section in the template below this comment section. +# +# For example, if you want to specify a different value for the Enable key +# in the "[debug]" section of your GDM System Defaults configuration file, +# then add "Enable=true" in the "[debug]" section of this file. If the +# key already exists in this file, then simply modify it. +# +# Older versions of GDM used the "gdm.conf" file for configuration. If your +# system has an old gdm.conf file on the system, it will be used instead of +# this file - so changes made to this file will not take effect. Consider +# migrating your configuration to this file and removing the gdm.conf file. +# +# If you hand edit a GDM configuration file, you can run the following +# command and the GDM daemon will immediately reflect the change. Any +# running GDM GUI programs will also be notified to update with the new +# configuration. +# +# gdmflexiserver --command="UPDATE_CONFIG <configuration key>" +# +# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable". +# +# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and +# re-read the new configuration settings. You can also restart GDM by sending +# a HUP or USR1 signal to the daemon. HUP behaves like gdm-restart and causes +# any user session started by GDM to exit immediately while USR1 behaves like +# gdm-safe-restart and will wait until all users log out before restarting GDM. +# +# For full reference documentation see the gnome help browser under +# GNOME|System category. You can also find the docs in HTML form on +# http://www.gnome.org/projects/gdm/ +# +# NOTE: Lines that begin with "#" are considered comments. +# +# Have fun! + +[daemon] + +[security] + +[xdmcp] + +[gui] + +[greeter] + +[chooser] + +[debug] + +# Note that to disable servers defined in the GDM System Defaults +# configuration file (such as 0=Standard, you must put a line in this file +# that says 0=inactive, as described in the Configuration section of the GDM +# documentation. +# +[servers] + +# Also note, that if you redefine a [server-foo] section, then GDM will +# use the definition in this file, not the GDM System Defaults configuration +# file. It is currently not possible to disable a [server-foo] section +# defined in the GDM System Defaults configuration file. +# diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.30.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.30.0.bb new file mode 100644 index 0000000000..2e9d934177 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm_2.30.0.bb @@ -0,0 +1,85 @@ +DESCRIPTION = "Graphical login manager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb" + +inherit gnome update-rc.d + +RDEPENDS_${PN} += "grep dbus-x11 shadow" + +# "libpam-base-files" + +SRC_URI += " \ + file://cross-xdetection.diff \ + file://%gconf-tree.xml \ + file://gdm \ + file://gdm.conf \ + file://gdm-pam \ + file://Default \ + " + +SRC_URI[archive.md5sum] = "0da84637abbcbf1666529d6192a81e6b" +SRC_URI[archive.sha256sum] = "ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15" + +EXTRA_OECONF = " --enable-authentication-scheme=shadow \ + --enable-debug=yes \ + --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/ +} + +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/ + + install -d ${D}/${sysconfdir}/gdm + install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/ + + install -d ${D}/${sysconfdir}/pam.d + install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm + + install -d ${D}/${sysconfdir}/gdm/Init + install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init +} + +FILES_${PN} += "${datadir}/icon* \ + ${datadir}/xsession* \ + " + +CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm" + +INITSCRIPT_NAME = "gdm" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." + +pkg_postinst_${PN} () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + grep "^gdm:" /etc/group > /dev/null || addgroup gdm + grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm + +if [ -d /var/lib/gdm ]; then + chown -R gdm:gdm /var/lib/gdm + chmod 0750 /var/lib/gdm +fi + +# Register up as default dm +mkdir -p ${sysconfdir}/X11/ +echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager + +} + +pkg_postrm_${PN} () { + deluser gdm || true + delgroup gdm || true + sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true +} + + + + |