Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=304a1e4d10c96f221a1b4c0a7929bfc209164c7e

commit 304a1e4d10c96f221a1b4c0a7929bfc209164c7e
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sat Feb 27 00:57:54 2010 +0100

gdm-2.29.6-1-x86_64
*version bump

diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild
index ab78271..2a3b0a9 100644
--- a/source/gnome/gdm/FrugalBuild
+++ b/source/gnome/gdm/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=gdm
-pkgver=2.28.2
-pkgrel=2
+pkgver=2.29.6
+pkgrel=1
pkgdesc="GNOME Display Manager"
url="http://www.gnome.org/";
backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin)
@@ -16,11 +16,9 @@ makedepends=('intltool' 'gnome-doc-utils')
groups=('gnome' 'gnome-minimal')
archs=('i686' 'x86_64' 'ppc')
Finclude gnome
-source=(${sour...@]}
-       libxklavier.diff \
+source=(${sour...@]} \
polkit-gnome-authentication-agent-1.desktop)
-sha1sums=('c5b3fb7908aeb341a1bf8fc28b4afb601626e601' \
-          '010cef9dccd94a68e8b41c2c7fa910af20e8b496' \
+sha1sums=('4805731e52422b4a52552b75b9b912281316f8e4' \
'93d1f9a7d068dd8e70c930abea9acf5b770a3485')

conflicts=('fast-user-switch-applet')
@@ -29,7 +27,6 @@ replaces=('fast-user-switch-applet' 'gdm-themes' 
'somatic-gdm-themes' 'arc-color

build() {
Fpatchall
-       Fautoreconf
Fmake --enable-authentication-scheme=pam \
--enable-profiling \
--enable-console-helper \
@@ -43,7 +40,7 @@ build() {
chown root:root $Fdestdir/var/gdm || Fdie

Fcp polkit-gnome-authentication-agent-1.desktop 
usr/share/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
-
+

#delete PAM default rules
Frm etc/pam.d/*
diff --git a/source/gnome/gdm/fix_reboot_path.patch 
b/source/gnome/gdm/fix_reboot_path.patch
deleted file mode 100644
index b1bbd3a..0000000
--- a/source/gnome/gdm/fix_reboot_path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur gdm-2.20.0.orig/configure.ac gdm-2.20.0/configure.ac
---- gdm-2.20.0.orig/configure.ac       2007-09-25 18:06:41.000000000 +0200
-+++ gdm-2.20.0/configure.ac    2007-09-25 18:09:30.000000000 +0200
-@@ -1100,8 +1100,8 @@
-       ;;
- *)
-       HOST_GDM_USER_PATH="/bin:/usr/bin"
--      HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h 
now;/usr/sbin/shutdown -h now"
--      HOST_REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r 
now;/usr/sbin/shutdown -r now"
-+      HOST_HALT_COMMAND="/sbin/poweroff;/sbin/shutdown -h 
now;/usr/sbin/shutdown -h now"
-+      HOST_REBOOT_COMMAND="/sbin/reboot;/sbin/shutdown -r 
now;/usr/sbin/shutdown -r now"
-       HOST_SUSPEND_COMMAND=""
-       HOST_XSESSION_SHELL=/bin/sh
-       HOST_SOUND_PROGRAM=/usr/bin/play
diff --git a/source/gnome/gdm/gdm-2.20.1-gdmconf.patch 
b/source/gnome/gdm/gdm-2.20.1-gdmconf.patch
deleted file mode 100644
index dbb4a5f..0000000
--- a/source/gnome/gdm/gdm-2.20.1-gdmconf.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -Naur gdm-2.20.5.orig/config/gdm.conf.in gdm-2.20.5/config/gdm.conf.in
---- gdm-2.20.5.orig/config/gdm.conf.in 2008-04-11 21:34:16.000000000 +0200
-+++ gdm-2.20.5/config/gdm.conf.in      2008-04-11 21:38:12.000000000 +0200
-@@ -68,7 +68,7 @@
-
- # The greeter for attached (non-xdmcp) logins.  Change gdmlogin to gdmgreeter
- # to get the new graphical greeter.
--#greet...@libexecdir@/gdmlogin
-+greet...@libexecdir@/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 @@
- #gtk...@datadir@/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.
--#defaultfa...@pixmapdir@/nobody.png
-+defaultfa...@pixmapdir@/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.
- #globalfaced...@datadir@/pixmaps/faces/
-
-@@ -499,7 +499,7 @@
- # 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
- # Do not show any visible feedback in the password field. This is standard for
- # instance in console, xdm and ssh.
- #UseInvisibleInEntry=false
-@@ -509,7 +509,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
- graphicalthemed...@datadir@/gdm/themes/
- GraphicalThemeRand=false
-@@ -525,7 +525,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.
-@@ -626,7 +626,7 @@
-
- [server-Standard]
- name=Standard server
--comma...@x_server@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
-+comma...@x_server@ @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
-@@ -641,7 +641,7 @@
- [server-Terminal]
- name=Terminal server
- # Add -terminate to make things behave more nicely
--comma...@x_server@ @X_CONFIG_OPTIONS@ -terminate
-+comma...@x_server@ @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
-@@ -655,7 +655,7 @@
- # command line.
- [server-Chooser]
- name=Chooser server
--comma...@x_server@ @X_CONFIG_OPTIONS@
-+comma...@x_server@ @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-fix-the-build.patch 
b/source/gnome/gdm/gdm-fix-the-build.patch
deleted file mode 100644
index b1f5d87..0000000
--- a/source/gnome/gdm/gdm-fix-the-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gdm-2.20.3/daemon/verify-crypt.c.orig      2008-01-07 19:39:37.000000000 
+0000
-+++ gdm-2.20.3/daemon/verify-crypt.c   2008-01-09 13:39:50.000000000 +0000
-@@ -43,6 +43,7 @@
- #include "gdm-common.h"
- #include "gdm-daemon-config.h"
- #include "gdm-socket-protocol.h"
-+#include "gdm-log.h"
-
- static char *selected_user = NULL;
-
---- gdm-2.20.3/daemon/verify-shadow.c.orig     2008-01-07 19:39:37.000000000 
+0000
-+++ gdm-2.20.3/daemon/verify-shadow.c  2008-01-09 13:39:43.000000000 +0000
-@@ -44,6 +44,7 @@
- #include "gdm-common.h"
- #include "gdm-daemon-config.h"
- #include "gdm-socket-protocol.h"
-+#include "gdm-log.h"
-
- static char *selected_user = NULL;
-
diff --git a/source/gnome/gdm/gdm-gksu_categories.patch 
b/source/gnome/gdm/gdm-gksu_categories.patch
deleted file mode 100644
index c0b2938..0000000
--- a/source/gnome/gdm/gdm-gksu_categories.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur gdm-2.20.3/gui/gdmsetup.desktop.in.in 
gdm-2.20.3.new/gui/gdmsetup.desktop.in.in
---- gdm-2.20.3/gui/gdmsetup.desktop.in.in      2008-01-08 01:09:05.000000000 
+0530
-+++ gdm-2.20.3.new/gui/gdmsetup.desktop.in.in  2008-03-01 19:32:38.000000000 
+0530
-@@ -2,13 +2,12 @@
- Encoding=UTF-8
- _Name=Login Window
- _Comment=Configure GDM login window appearance and behavior
--tryex...@sbindir@/gdmsetup
--ex...@sbindir@/gdmsetup
-+Exec=gksu @sbindir@/gdmsetup
- Icon=gdmsetup
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=GNOME;GTK;Settings;System;
-+Categories=Application;GTK;Settings;X-GNOME-SystemSettings;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gdm
- X-GNOME-Bugzilla-Component=general
diff --git a/source/gnome/gdm/libxklavier.diff 
b/source/gnome/gdm/libxklavier.diff
deleted file mode 100644
index 8278ede..0000000
--- a/source/gnome/gdm/libxklavier.diff
+++ /dev/null
@@ -1,52 +0,0 @@
- configure.ac |   30 ++++++++++++++++++++----------
- 1 files changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index be6580d..04d58cc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -106,17 +106,26 @@ PKG_CHECK_MODULES(SIMPLE_GREETER,
- AC_SUBST(SIMPLE_GREETER_CFLAGS)
- AC_SUBST(SIMPLE_GREETER_LIBS)
-
--PKG_CHECK_MODULES(LIBXKLAVIER,
--        libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
--        have_libxklavier=yes,
--        have_libxklavier=no)
--if test "x$have_libxklavier" = "xyes" ; then
--  AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
-+AC_ARG_ENABLE([libxklavier],
-+      AS_HELP_STRING([--enable-libxklavier],
-+                     [Enable libxklavier support @<:@default=yes@:>@]),
-+      enable_libxklavier=$enableval,
-+      enable_libxklavier=yes)
-+have_libxklavier=no
-+if test "x$enable_libxklavier" = "xyes"; then
-+   PKG_CHECK_MODULES(LIBXKLAVIER,
-+        libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
-+          have_libxklavier=yes,
-+          have_libxklavier=no)
-+   if test "x$have_libxklavier" = "xyes" ; then
-+      AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
-+   fi
-+   AC_SUBST(HAVE_LIBXKLAVIER)
-+   AC_SUBST(LIBXKLAVIER_CFLAGS)
-+   AC_SUBST(LIBXKLAVIER_LIBS)
- fi
-+
- AM_CONDITIONAL(HAVE_LIBXKLAVIER, test x$have_libxklavier = xyes)
--AC_SUBST(HAVE_LIBXKLAVIER)
--AC_SUBST(LIBXKLAVIER_CFLAGS)
--AC_SUBST(LIBXKLAVIER_LIBS)
-
- PKG_CHECK_MODULES(POLKIT_GNOME,
-         polkit-gnome >= $POLICYKIT_REQUIRED_VERSION,
-@@ -1420,6 +1429,7 @@ echo \
- "        Xinerama support:         ${XINERAMA_SUPPORT}
-         XDMCP support:            ${XDMCP_SUPPORT}
-         SELinux support:          ${with_selinux}
--        ConsoleKit support:       ${use_console_kit}
-+        ConsoleKit  support:      ${use_console_kit}
-+      Libxklavier support:      ${have_libxklavier}
-         Build with RBAC:          ${msg_rbac_shutdown}
- "
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to