- merged from DEVEL

Changed files:
    gdm-conf.patch -> 1.4
    gdm-locale-names.patch -> 1.2
    gdm-xdmcp.patch -> 1.8

diff --git a/gdm-conf.patch b/gdm-conf.patch
index f68a85a1e70b6825fa31e76ceb87df4f4ede5202..c533886bb428c81f7b9b0328342722a838eea698 100644 (file)
--- a/gdm-conf.patch
+++ b/gdm-conf.patch
@@ -13,11 +13,11 @@ diff -urN gdm-2.4.1.1.orig/config/gdm.conf.in gdm-2.4.1.1/config/gdm.conf.in
  # doesn't always work, only if those clients have a window of their own
  KillInitClients=true
 @@ -157,7 +157,7 @@
- # The 'theme'.  By default we're using the default gtk theme
- # Of course assuming that gtk got installed in the same prefix,
- # if not change this.
+ # The specific gtkrc file we use.  It should be the full path to the gtkrc
+ # that we need.  Unless you need a specific gtkrc that doesn't correspond to
+ # a specific theme, then just use the GtkTheme key
 -#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
 +GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
- # Maximum size of an icon, larger icons are scaled down
- MaxIconWidth=128
- MaxIconHeight=128
+ 
+ # The GTK+ theme to use for the gui
+ #GtkTheme=Default

diff --git a/gdm-locale-names.patch b/gdm-locale-names.patch
new file mode 100644 (file)
index 0000000..5df402d
--- /dev/null
+++ b/gdm-locale-names.patch
@@ -0,0 +1,12 @@
+diff -urN aa/gdm-2.5.90.1/configure.in gdm-2.5.90.1/configure.in
+--- aa/gdm-2.5.90.1/configure.in       2004-02-08 22:08:34.000000000 +0100
++++ gdm-2.5.90.1/configure.in  2004-02-26 17:07:24.587286976 +0100
+@@ -144,7 +144,7 @@
+ AC_SUBST(GETTEXT_PACKAGE)
+ 
+ dnl ## internationalization support
+-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA es et eu fa fi fr ga gl hi he hr hu id is it ja ko lt lv mk ml mn ms nl nn no pl pt_BR pt ro ru sk sl sq sr sr@Latn sv ta th tr uk vi wa zh_CN zh_TW"
++ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA es et eu fa fi fr ga gl hi he hr hu id is it ja ko lt lv mk ml mn ms nb nl nn pl pt_BR pt ro ru sk sl sq sr sr@Latn sv ta th tr uk vi wa zh_CN zh_TW"
+ AM_GLIB_GNU_GETTEXT
+ 
+ EXTRA_DAEMON_LIBS=""

diff --git a/gdm-xdmcp.patch b/gdm-xdmcp.patch
index 55b2b90d9669dff3e820a6c42ee3f428608ec535..fc4381c4808c308be43e0c6a1f5b349cdd55e505 100644 (file)
--- a/gdm-xdmcp.patch
+++ b/gdm-xdmcp.patch
@@ -1,12 +1,12 @@
 diff -urN gdm-2.4.2.99.orig/daemon/server.c gdm-2.4.2.99/daemon/server.c
 --- gdm-2.4.2.99.orig/daemon/server.c  Fri Aug  1 01:39:23 2003
 +++ gdm-2.4.2.99/daemon/server.c       Fri Aug  1 01:40:23 2003
-@@ -1013,7 +1013,7 @@
+@@ -1061,7 +1061,7 @@
          /* Log all output from spawned programs to a file */
-       logfile = g_strconcat (GdmLogDir, "/", d->name, ".log", NULL);
-       IGNORE_EINTR (unlink (logfile));
--      logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644);
-+      logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0640);
+       logfile = gdm_make_filename (GdmLogDir, d->name, ".log");
+       VE_IGNORE_EINTR (unlink (logfile));
+-      VE_IGNORE_EINTR (logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
++      VE_IGNORE_EINTR (logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0640));
  
        if (logfd != -1) {
-               IGNORE_EINTR (dup2 (logfd, 1));
+               VE_IGNORE_EINTR (dup2 (logfd, 1));