Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ae29b59a05600e207f1b177ea44ac35bad0c7115
commit ae29b59a05600e207f1b177ea44ac35bad0c7115 Author: Priyank <[EMAIL PROTECTED]> Date: Mon Oct 8 01:14:31 2007 +0530 gdm-2.20.0-4-i686 * Updated the gdmconf patch to fix the blank user list bug diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index 8486374..369e251 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gdm pkgver=2.20.0 -pkgrel=3 +pkgrel=4 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/"; backup=(etc/gdm/custom.conf) @@ -15,10 +15,15 @@ groups=('gnome' 'gnome-core') archs=('i686' 'x86_64') Finclude gnome options=([EMAIL PROTECTED] 'force') -source=([EMAIL PROTECTED] $pkgname-2.15.9-gdmconf.patch \ +source=([EMAIL PROTECTED] $pkgname-$pkgver-gdmconf.patch \ $pkgname-2.18.0-gksu.patch \ fix_reboot_path.patch \ http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.7.tar.bz2) +sha1sums=('73f7840180645b6a3da0f3c3ac0518c2b4aef1d6' \ + 'bc0209e8700b01e2369a66e93b2c86766ff988fd' \ + 'a702961b7851b1e7c946fc8e3fb29bd1d807a02f' \ + 'b602b6805d1d4787e4404827abf3d6f346843317' \ + 'b13852bf7ce59df5d02f27b3603e274fba3e074d') build() { Fcd @@ -43,10 +48,4 @@ build() { mv $Fsrcdir/Frugalware $Fdestdir/usr/share/gdm/themes/Frugalware || Fdie } -sha1sums=('73f7840180645b6a3da0f3c3ac0518c2b4aef1d6' \ - '809407f910e6aefe26a34211e215e5cc996575a0' \ - 'a702961b7851b1e7c946fc8e3fb29bd1d807a02f' \ - 'b602b6805d1d4787e4404827abf3d6f346843317' \ - 'b13852bf7ce59df5d02f27b3603e274fba3e074d') - # optimization OK diff --git a/source/gnome/gdm/gdm-2.15.9-gdmconf.patch b/source/gnome/gdm/gdm-2.15.9-gdmconf.patch deleted file mode 100644 index 612ac9d..0000000 --- a/source/gnome/gdm/gdm-2.15.9-gdmconf.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -Naur gdm-2.20.0.orig/config/gdm.conf.in gdm-2.20.0/config/gdm.conf.in ---- gdm-2.20.0.orig/config/gdm.conf.in 2007-09-24 14:25:20.000000000 +0200 -+++ gdm-2.20.0/config/gdm.conf.in 2007-09-24 14:28:49.000000000 +0200 -@@ -68,7 +68,7 @@ - - # The greeter for attached (non-xdmcp) logins. Change gdmlogin to gdmgreeter - # to get the new graphical greeter. [EMAIL PROTECTED]@/gdmlogin [EMAIL PROTECTED]@/gdmgreeter - - # The greeter for xdmcp logins, usually you want a less graphically intensive - # greeter here so it's better to leave this with gdmlogin -@@ -99,7 +99,7 @@ - # User and group used for running GDM GUI applications. By default this is set - # to user "gdm" and group "gdm". This user/group should have very limited - # permissions and access to only the gdm directories and files. --User=gdm -+User=nobody - Group=gdm - - # To try to kill all clients started at greeter time or in the Init script. -@@ -163,7 +163,7 @@ - # really a PATH style variable since 2.4.4.2 to allow actual interoperability - # with KDM. Note that <dmconfdir>/Sessions is there for backwards - # compatibility reasons with 2.4.4.x. --#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/ -+SessionDesktopDir=/etc/X11/sessions/:@datadir@/gdm/BuiltInSessions/ - # This is the default .desktop session. One of the ones in SessionDesktopDir - #DefaultSession=gnome.desktop - # Better leave this blank and HOME will be used. You can use syntax ~/ below -@@ -202,8 +202,8 @@ - # Automatic VT allocation. Right now only works on Linux. This way we force - # X to use specific vts. Turn VTAllocation to false if this is causing - # problems. --#FirstVT=7 --#VTAllocation=true -+FirstVT=12 -+VTAllocation=true - # Should double login be treated with a warning (and possibility to change VT's - # on Linux and FreeBSD systems for console logins) - #DoubleLoginWarning=true -@@ -242,7 +242,7 @@ - [security] - # Allow root to login. It makes sense to turn this off for kiosk use, when - # you want to minimize the possibility of break in. --AllowRoot=true -+AllowRoot=false - # Allow login as root via XDMCP. This value will be overridden and set to - # false if the /etc/default/login file exists and contains - # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists -@@ -352,7 +352,7 @@ - [EMAIL PROTECTED]@/themes/Default/gtk-2.0/gtkrc - - # The GTK+ theme to use for the GUI. --#GtkTheme=Default -+GtkTheme=Clearlooks - # If to allow changing the GTK+ (widget) theme from the greeter. Currently - # this only affects the standard greeter as the graphical greeter does not yet - # have this ability. -@@ -499,10 +499,10 @@ - # where the session saving stuff is disabled in GDM - #ShowLastSession=true - # Always use 24 hour clock no matter what the locale. --#Use24Clock=auto -+Use24Clock=auto - # Use circles in the password field. Looks kind of cool actually, but only - # works with certain fonts. --#UseCirclesInEntry=false -+UseCirclesInEntry=true - # Do not show any visible feedback in the password field. This is standard for - # instance in console, xdm and ssh. - #UseInvisibleInEntry=false -@@ -512,7 +512,7 @@ - # list then provide a list that is delimited by /: to the GraphicalThemes - # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme - # and specify just one theme. --#GraphicalTheme=circles -+GraphicalTheme=Frugalware - #GraphicalThemes=circles/:happygnome - [EMAIL PROTECTED]@/gdm/themes/ - GraphicalThemeRand=false -@@ -528,7 +528,7 @@ - # user input. If SoundOnLogin is a file and the greeter finds the 'play' - # executable (see daemon/SoundProgram) it will play that file instead of just - # beeping. --#SoundOnLogin=true -+SoundOnLogin=false - #SoundOnLoginFile= - # If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a - # user successfully logs in. -@@ -629,7 +629,7 @@ - - [server-Standard] - name=Standard server [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ -dpi 72 - flexible=true - # Indicates that the X server should be started at a different process - # priority. Values can be any integer value accepted by the setpriority C -@@ -644,7 +644,7 @@ - [server-Terminal] - name=Terminal server - # Add -terminate to make things behave more nicely [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ -terminate [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ -terminate -dpi 72 - # Make this not appear in the flexible servers (we need extra params anyway, - # and terminate would be bad for xdmcp choosing). You can make a terminal - # server flexible, but not with an indirect query. If you need flexible -@@ -658,7 +658,7 @@ - # command line. - [server-Chooser] - name=Chooser server [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ -dpi 72 - # Make this not appear in the flexible servers for now, but if you wish to - # allow a chooser server then make this true. This is the only way to make a - # flexible chooser server that behaves nicely. diff --git a/source/gnome/gdm/gdm-2.20.0-gdmconf.patch b/source/gnome/gdm/gdm-2.20.0-gdmconf.patch new file mode 100644 index 0000000..7f2420f --- /dev/null +++ b/source/gnome/gdm/gdm-2.20.0-gdmconf.patch @@ -0,0 +1,138 @@ +diff -Naur gdm-2.20.0.orig/config/gdm.conf.in gdm-2.20.0/config/gdm.conf.in +--- gdm-2.20.0.orig/config/gdm.conf.in 2007-10-08 01:01:39.000000000 +0530 ++++ gdm-2.20.0/config/gdm.conf.in 2007-10-08 01:02:34.000000000 +0530 +@@ -68,7 +68,7 @@ + + # The greeter for attached (non-xdmcp) logins. Change gdmlogin to gdmgreeter + # to get the new graphical greeter. [EMAIL PROTECTED]@/gdmlogin [EMAIL PROTECTED]@/gdmgreeter + + # The greeter for xdmcp logins, usually you want a less graphically intensive + # greeter here so it's better to leave this with gdmlogin +@@ -99,7 +99,7 @@ + # User and group used for running GDM GUI applications. By default this is set + # to user "gdm" and group "gdm". This user/group should have very limited + # permissions and access to only the gdm directories and files. +-User=gdm ++User=nobody + Group=gdm + + # To try to kill all clients started at greeter time or in the Init script. +@@ -163,7 +163,7 @@ + # really a PATH style variable since 2.4.4.2 to allow actual interoperability + # with KDM. Note that <dmconfdir>/Sessions is there for backwards + # compatibility reasons with 2.4.4.x. +-#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/ ++SessionDesktopDir=/etc/X11/sessions/:@datadir@/gdm/BuiltInSessions/ + # This is the default .desktop session. One of the ones in SessionDesktopDir + #DefaultSession=gnome.desktop + # Better leave this blank and HOME will be used. You can use syntax ~/ below +@@ -202,8 +202,8 @@ + # Automatic VT allocation. Right now only works on Linux. This way we force + # X to use specific vts. Turn VTAllocation to false if this is causing + # problems. +-#FirstVT=7 +-#VTAllocation=true ++FirstVT=12 ++VTAllocation=true + # Should double login be treated with a warning (and possibility to change VT's + # on Linux and FreeBSD systems for console logins) + #DoubleLoginWarning=true +@@ -242,7 +242,7 @@ + [security] + # Allow root to login. It makes sense to turn this off for kiosk use, when + # you want to minimize the possibility of break in. +-AllowRoot=true ++AllowRoot=false + # Allow login as root via XDMCP. This value will be overridden and set to + # false if the /etc/default/login file exists and contains + # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists +@@ -352,7 +352,7 @@ + [EMAIL PROTECTED]@/themes/Default/gtk-2.0/gtkrc + + # The GTK+ theme to use for the GUI. +-#GtkTheme=Default ++GtkTheme=Clearlooks + # If to allow changing the GTK+ (widget) theme from the greeter. Currently + # this only affects the standard greeter as the graphical greeter does not yet + # have this ability. +@@ -391,9 +391,9 @@ + # affect the Face Browser (MinimalUID, DefaultFace, Include, Exclude, + # IncludeAll, GlobalFaceDir) are used by both the Standard and Themed + # greeter. +-Browser=false ++Browser=true + # The default picture in the browser. [EMAIL PROTECTED]@/nobody.png [EMAIL PROTECTED]@/nobody.png + # User ID's less than the MinimalUID value will not be included in the face + # browser or in the gdmselection list for Automatic/Timed login. They will not + # be displayed regardless of the settings for Include and Exclude. +@@ -414,7 +414,7 @@ + # large numbers of users and this feature should not be used in such + # environments. The setting of IncludeAll does nothing if Include is set to a + # non-empty value. +-#IncludeAll=false ++IncludeAll=true + # If user or user.png exists in this dir it will be used as his picture. + [EMAIL PROTECTED]@/pixmaps/faces/ + +@@ -499,10 +499,10 @@ + # where the session saving stuff is disabled in GDM + #ShowLastSession=true + # Always use 24 hour clock no matter what the locale. +-#Use24Clock=auto ++Use24Clock=auto + # Use circles in the password field. Looks kind of cool actually, but only + # works with certain fonts. +-#UseCirclesInEntry=false ++UseCirclesInEntry=true + # Do not show any visible feedback in the password field. This is standard for + # instance in console, xdm and ssh. + #UseInvisibleInEntry=false +@@ -512,7 +512,7 @@ + # list then provide a list that is delimited by /: to the GraphicalThemes + # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme + # and specify just one theme. +-#GraphicalTheme=circles ++GraphicalTheme=Frugalware + #GraphicalThemes=circles/:happygnome + [EMAIL PROTECTED]@/gdm/themes/ + GraphicalThemeRand=false +@@ -528,7 +528,7 @@ + # user input. If SoundOnLogin is a file and the greeter finds the 'play' + # executable (see daemon/SoundProgram) it will play that file instead of just + # beeping. +-#SoundOnLogin=true ++SoundOnLogin=false + #SoundOnLoginFile= + # If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a + # user successfully logs in. +@@ -629,7 +629,7 @@ + + [server-Standard] + name=Standard server [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ -dpi 72 + flexible=true + # Indicates that the X server should be started at a different process + # priority. Values can be any integer value accepted by the setpriority C +@@ -644,7 +644,7 @@ + [server-Terminal] + name=Terminal server + # Add -terminate to make things behave more nicely [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ -terminate [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ -terminate -dpi 72 + # Make this not appear in the flexible servers (we need extra params anyway, + # and terminate would be bad for xdmcp choosing). You can make a terminal + # server flexible, but not with an indirect query. If you need flexible +@@ -658,7 +658,7 @@ + # command line. + [server-Chooser] + name=Chooser server [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ -dpi 72 + # Make this not appear in the flexible servers for now, but if you wish to + # allow a chooser server then make this true. This is the only way to make a + # flexible chooser server that behaves nicely. _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
