From cf089877b93cfac22cff756613b93fb234c42331 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 5 Jul 2009 17:18:38 +0000 Subject: [PATCH] - drop obsolete files Changed files: gdm-libxklavier40.patch -> 1.3 gdm-logdir.patch -> 1.5 gdm-sessreg.patch -> 1.2 gdm-user.patch -> 1.2 gdm-xorg.patch -> 1.3 --- gdm-libxklavier40.patch | 11 ------ gdm-logdir.patch | 24 ------------ gdm-sessreg.patch | 24 ------------ gdm-user.patch | 82 ----------------------------------------- gdm-xorg.patch | 75 ------------------------------------- 5 files changed, 216 deletions(-) delete mode 100644 gdm-libxklavier40.patch delete mode 100644 gdm-logdir.patch delete mode 100644 gdm-sessreg.patch delete mode 100644 gdm-user.patch delete mode 100644 gdm-xorg.patch diff --git a/gdm-libxklavier40.patch b/gdm-libxklavier40.patch deleted file mode 100644 index da75c5b..0000000 --- a/gdm-libxklavier40.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gdm-2.26.1/gui/simple-greeter/gdm-layouts.c~ 2009-03-27 15:28:45.000000000 +0100 -+++ gdm-2.26.1/gui/simple-greeter/gdm-layouts.c 2009-06-29 23:01:14.014597308 +0200 -@@ -52,7 +52,7 @@ - engine = xkl_engine_get_instance (GDK_DISPLAY ()); - xkl_engine_backup_names_prop (engine); - config_registry = xkl_config_registry_get_instance (engine); -- xkl_config_registry_load (config_registry); -+ xkl_config_registry_load (config_registry, FALSE); - - initial_config = xkl_config_rec_new (); - if (!xkl_config_rec_get_from_backup (initial_config, engine)) { diff --git a/gdm-logdir.patch b/gdm-logdir.patch deleted file mode 100644 index c95c29c..0000000 --- a/gdm-logdir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aurN gdm-2.14.1.orig/config/Makefile.am gdm-2.14.1/config/Makefile.am ---- gdm-2.14.1.orig/config/Makefile.am 2006-03-29 01:43:20.000000000 +0200 -+++ gdm-2.14.1/config/Makefile.am 2006-04-12 17:38:22.703380096 +0200 -@@ -5,7 +5,7 @@ - instsessdir = $(datadir)/xsessions - initdir = $(gdmconfdir)/Init - authdir = $(localstatedir)/gdm --logdir = $(localstatedir)/log/gdm -+logdir = /var/log/gdm - gnomercdir = $(gdmconfdir) - postdir = $(gdmconfdir)/PostSession - predir = $(gdmconfdir)/PreSession -diff -aurN gdm-2.14.1.orig/configure.ac gdm-2.14.1/configure.ac ---- gdm-2.14.1.orig/configure.ac 2006-04-10 22:08:15.000000000 +0200 -+++ gdm-2.14.1/configure.ac 2006-04-12 17:39:15.822304792 +0200 -@@ -793,7 +793,7 @@ - # - AC_SUBST(authdir, ${localstatedir}/gdm) - AC_SUBST(gdmlocaledir, ${gdmconfdir}) --AC_SUBST(logdir, ${localstatedir}/log/gdm) -+AC_SUBST(logdir, /var/log/gdm) - AC_SUBST(pixmapdir, ${datadir}/pixmaps) - - withval="" diff --git a/gdm-sessreg.patch b/gdm-sessreg.patch deleted file mode 100644 index 479ff1d..0000000 --- a/gdm-sessreg.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gdm-2.14.10/config/PostSession.in~ 2005-02-03 23:57:45.000000000 +0100 -+++ gdm-2.14.10/config/PostSession.in 2006-12-18 17:14:41.000000000 +0100 -@@ -21,6 +21,6 @@ - - SESSREG=`gdmwhich sessreg` - if [ "x$SESSREG" != "x" ] ; then -- "$SESSREG" -d -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER" -+ "$SESSREG" -d -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER" - fi - exit 0 ---- gdm-2.14.10/config/PreSession.in~ 2006-05-12 07:58:21.000000000 +0200 -+++ gdm-2.14.10/config/PreSession.in 2006-12-18 17:14:20.000000000 +0100 -@@ -73,9 +73,9 @@ - if [ "x$SESSREG" != "x" ] ; then - # some output for easy debugging - echo "$0: Registering your session with wtmp and utmp" -- echo "$0: running: $SESSREG -a -w /var/log/wtmp -u /var/run/utmp -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l \"$DISPLAY\" \"$USER\"" -+ echo "$0: running: $SESSREG -a -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l \"$DISPLAY\" \"$USER\"" - -- exec "$SESSREG" -a -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER" -+ exec "$SESSREG" -a -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER" - # this is not reached - fi - diff --git a/gdm-user.patch b/gdm-user.patch deleted file mode 100644 index bab9c42..0000000 --- a/gdm-user.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- gdm-2.21.4/data/gdm.conf~ 2007-11-19 21:57:34.000000000 +0100 -+++ gdm-2.21.4/data/gdm.conf 2007-12-20 00:06:06.245930315 +0100 -@@ -31,7 +31,7 @@ - send_member="SetValue"/> - - -- -+ - - - priv->access_file == NULL, FALSE); - - error = NULL; -- access_file = _create_access_file_for_user (display, "gdm", &error); -+ access_file = _create_access_file_for_user (display, "xdm", &error); - - if (access_file == NULL) { - g_critical ("could not create display access file: %s", error->message); ---- gdm-2.21.4/daemon/gdm-simple-slave.c~ 2007-11-19 21:57:32.000000000 +0100 -+++ gdm-2.21.4/daemon/gdm-simple-slave.c 2007-12-20 00:54:11.047664460 +0100 -@@ -579,7 +579,7 @@ - } - - /* Run the init script. gdmslave suspends until script has terminated */ -- gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "gdm"); -+ gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "xdm"); - - create_new_session (slave); - ---- gdm-2.21.4/daemon/gdm-factory-slave.c~ 2007-11-19 21:57:32.000000000 +0100 -+++ gdm-2.21.4/daemon/gdm-factory-slave.c 2007-12-20 00:55:29.542269705 +0100 -@@ -460,7 +460,7 @@ - /* FIXME: send a signal back to the master */ - - /* Run the init script. gdmslave suspends until script has terminated */ -- gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "gdm"); -+ gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "xdm"); - - slave->priv->greeter_server = gdm_greeter_server_new (display_id); - g_signal_connect (slave->priv->greeter_server, ---- gdm-2.21.4/daemon/gdm-greeter-server.c~ 2007-11-19 21:57:32.000000000 +0100 -+++ gdm-2.21.4/daemon/gdm-greeter-server.c 2007-12-20 00:56:56.036325165 +0100 -@@ -934,14 +934,14 @@ - g_param_spec_string ("user-name", - "user name", - "user name", -- "gdm", -+ "xdm", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (object_class, - PROP_GROUP_NAME, - g_param_spec_string ("group-name", - "group name", - "group name", -- "gdm", -+ "xdm", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - signals [BEGIN_VERIFICATION] = - g_signal_new ("begin-verification", ---- gdm-2.21.4/daemon/gdm-greeter-session.c~ 2007-11-19 22:53:12.000000000 +0100 -+++ gdm-2.21.4/daemon/gdm-greeter-session.c 2007-12-20 00:57:34.033713691 +0100 -@@ -973,14 +973,14 @@ - g_param_spec_string ("user-name", - "user name", - "user name", -- "gdm", -+ "xdm", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (object_class, - PROP_GROUP_NAME, - g_param_spec_string ("group-name", - "group name", - "group name", -- "gdm", -+ "xdm", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (object_class, - PROP_SERVER_ADDRESS, diff --git a/gdm-xorg.patch b/gdm-xorg.patch deleted file mode 100644 index 78dc0dc..0000000 --- a/gdm-xorg.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -aurN gdm-2.15.9.orig/configure.ac gdm-2.15.9/configure.ac ---- gdm-2.15.9.orig/configure.ac 2006-08-07 21:56:22.000000000 +0200 -+++ gdm-2.15.9/configure.ac 2006-08-09 22:21:36.737065346 +0200 -@@ -965,67 +965,10 @@ - ;; - esac - --# 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 ! -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_CONFIG_OPTIONS="-audit 0" --fi -+X_PATH="/usr/bin" -+X_SERVER_PATH="/usr/bin" -+X_SERVER="/usr/bin/X" -+X_CONFIG_OPTIONS="-audit 0" - - # Don't add bindir to GDM_USER_PATH if it is already in the PATH. - # If it is /bin or /usr/bin, for example. -- 2.43.0