From f0ffa514eede3802457669d1f2b23ecc0d9e007292bf811287612e26d2ed432a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 26 Jul 2007 23:39:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=22 --- gdm-xdm-sessions.patch | 72 +++++++++++++++++++++++++++++------------- gdm.changes | 5 +++ gdm.spec | 6 ++-- 3 files changed, 59 insertions(+), 24 deletions(-) diff --git a/gdm-xdm-sessions.patch b/gdm-xdm-sessions.patch index 90d35c0..d745c7c 100644 --- a/gdm-xdm-sessions.patch +++ b/gdm-xdm-sessions.patch @@ -1,14 +1,13 @@ Index: gdm-2.17.7/config/Xsession.in -=================================================================== ---- gdm-2.17.7.orig/config/Xsession.in -+++ gdm-2.17.7/config/Xsession.in -@@ -1,251 +1,3 @@ - #!@XSESSION_SHELL@ +================================================================================ +--- gdm-2.19.3/config/Xsession.in ++++ gdm-2.19.3/config/Xsession.in +@@ -1,278 +1,2 @@ +-#!@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: --# failsafe - Run an xterm only -# default - Run the appropriate Xclients startup (see the code below) -# custom - Run ~/.xsession and if that's not available run 'default' -# @@ -28,12 +27,8 @@ Index: gdm-2.17.7/config/Xsession.in -# -# based on: -# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ - --command="$@" - --if [ -z "$command" ] ; then -- command=failsafe --fi +-command="$@" - -# this will go into the .xsession-errors along with all other echo's -# good for debugging where things went wrong @@ -82,16 +77,6 @@ Index: gdm-2.17.7/config/Xsession.in - -zenity=`gdmwhich zenity` - --if [ x"$command" = xfailsafe ] ; then -- if [ -n "$zenity" ] ; then -- disptext=`gettextfunc "This is the failsafe xterm session. Windows now have focus only if you have your cursor above them. To get out of this mode type 'exit' in the window."` -- "$zenity" --info --text "$disptext" -- else -- echo "$0: Starting the failsafe xterm session." -- fi -- exec xterm -geometry 80x24+0+0 --fi -- -# Note: ~/.xsession-errors is now done in the daemon so that it -# works for ALL sessions (except ones named 'Failsafe') - @@ -112,7 +97,6 @@ Index: gdm-2.17.7/config/Xsession.in -rh6sysresources=/etc/X11/xinit/Xresources -rh6sysmodmap=/etc/X11/xinit/Xmodmap - -- -# merge in defaults -if [ -f "$rh6sysresources" ]; then - xrdb -merge "$rh6sysresources" @@ -198,6 +182,14 @@ Index: gdm-2.17.7/config/Xsession.in - fi -fi - +-# Normalize all LC_* settings to $LANG +-for var in "LC_ALL" "LC_CTYPE" "LC_NUMERIC" "LC_TIME" "LC_COLLATE" "LC_MONETARY" "LC_MESSAGES" \ +- "LC_PAPER" "LC_NAME" "LC_ADDRESS" "LC_TELEPHONE" "LC_MEASUREMENT" "LC_IDENTIFICATION" ; do +- if eval "[ -n \"\$$var\" -a \"\$$var\" != \"\$LANG\" ]" ; then +- unset $var +- fi +-done +- -# run all system xinitrc shell scripts. -if [ -d /etc/X11/xinit/xinitrc.d ]; then - for i in /etc/X11/xinit/xinitrc.d/* ; do @@ -207,6 +199,41 @@ Index: gdm-2.17.7/config/Xsession.in - done -fi - +-# +-# To determine the character set used for filenames with +-# glib's g_filename_to/from_utf8() functions, we set the +-# environment variables G_FILENAME_ENCODING and G_BROKEN_FILENAMES. +-# +-# G_BROKEN_FILENAMES, when set, lets the functions take the +-# character set for the current locale for filename's encoding. +-# +-# G_FILENAME_ENCODING, which is introduced to glib 2.3.x and later, may be +-# set to a comma-separated list of character set names. +-# The special token "@locale" is taken to mean the character set +-# for the current locale. The first character set from the list is taken +-# as the filename encoding. +-# +-# If G_FILENAME_ENCODING is not set, but G_BROKEN_FILENAMES is, the +-# character set of the current locale is taken as the filename encoding. +- +-G_BROKEN_FILENAMES=yes +-export G_BROKEN_FILENAMES +-# G_FILENAME_ENCODING=@locale +-# export G_FILENAME_ENCODING +- +-#Startup Input methods (IIIM->XIM) +-if [ -f /etc/iiim/xsession ]; then +- . /etc/iiim/xsession +-fi +-#Startup XIM stuff +-if [ "x$XMODIFIERS" = "x" ]; then +- if [ -f "$HOME/.xim" ]; then +- . $HOME/.xim +- elif [ -f "/etc/skel/.xim" ]; then +- . /etc/skel/.xim +- fi +-fi +- -if [ "x$command" = "xcustom" ] ; then - if [ -x "$HOME/.xsession" ]; then - command="$HOME/.xsession" @@ -254,5 +281,6 @@ Index: gdm-2.17.7/config/Xsession.in -fi - -exec xterm -geometry 80x24+0+0 ++#!/bin/sh +exec /etc/X11/xdm/Xsession $1 $GDM_LANG \ No newline at end of file diff --git a/gdm.changes b/gdm.changes index f9188e3..3f0e4ca 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 25 18:11:38 CEST 2007 - jpr@suse.de + +- Re-enable gdm-xdm-sessions.patch (#294498) + ------------------------------------------------------------------- Tue Jul 24 20:43:56 CEST 2007 - jpr@suse.de diff --git a/gdm.spec b/gdm.spec index a0bea12..85baf8c 100644 --- a/gdm.spec +++ b/gdm.spec @@ -22,7 +22,7 @@ PreReq: %insserv_prereq License: GPL v2 or later Group: System/GUI/GNOME Version: 2.19.3 -Release: 6 +Release: 9 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -86,7 +86,7 @@ gnome-patch-translation-prepare #%patch2 -p1 #%patch3 -p1 #%patch4 -#%patch5 -p1 +%patch5 -p1 %patch9 -p1 %patch12 #%patch13 -p1 @@ -227,6 +227,8 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %endif %changelog +* Wed Jul 25 2007 - jpr@suse.de +- Re-enable gdm-xdm-sessions.patch (#294498) * Tue Jul 24 2007 - jpr@suse.de - Add xorg-x11-server-extras for Xnest/Xephyr so that the defaults are set correctly (not an installation dep)