[arch-commits] Commit in gdm (5 files)
Jan de Groot
jgc at archlinux.org
Tue Sep 29 08:02:50 UTC 2009
Date: Tuesday, September 29, 2009 @ 04:02:50
Author: jgc
Revision: 53338
Update to 2.28.0 -
Completely rebuild dependency list
Add gnome-panel and gnome-session to the dependency list
Fix install scriptlet: no longer show output for getent calls, register gconf schemas correctly
Add patch from ubuntu in modified shape to fix hardcoded paths
Added:
gdm/gnome-unstable/
gdm/gnome-unstable/04_fix_external_program_directories.patch
Modified:
gdm/gnome-unstable/PKGBUILD
gdm/gnome-unstable/gdm
gdm/gnome-unstable/gdm.install
----------------------------------------------------------+
PKGBUILD | 57 ++++++-------
gdm | 17 ++-
gdm.install | 12 ++
gnome-unstable/04_fix_external_program_directories.patch | 39 ++++++++
4 files changed, 86 insertions(+), 39 deletions(-)
Added: gnome-unstable/04_fix_external_program_directories.patch
===================================================================
--- gnome-unstable/04_fix_external_program_directories.patch (rev 0)
+++ gnome-unstable/04_fix_external_program_directories.patch 2009-09-29 08:02:50 UTC (rev 53338)
@@ -0,0 +1,39 @@
+# Description: Fix location of external programs.
+diff -Nur -x '*.orig' -x '*~' gdm-2.27.90/daemon/gdm-server.c gdm-2.27.90.new/daemon/gdm-server.c
+--- gdm-2.27.90/daemon/gdm-server.c 2009-08-25 05:31:18.000000000 +1000
++++ gdm-2.27.90.new/daemon/gdm-server.c 2009-08-25 14:35:12.000000000 +1000
+@@ -127,7 +127,7 @@
+ g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
+
+ error = NULL;
+- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
++ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
+ server->priv->display_name);
+
+ g_debug ("GdmServer: Running helper %s", command);
+diff -Nur -x '*.orig' -x '*~' gdm-2.27.90/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.27.90.new/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+--- gdm-2.27.90/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2009-08-25 05:31:18.000000000 +1000
++++ gdm-2.27.90.new/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2009-08-25 14:35:12.000000000 +1000
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Type=Application
+ _Name=GNOME Settings Daemon
+-TryExec=@LIBEXECDIR@/gnome-settings-daemon
+-Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
++TryExec=/usr/bin/gnome-settings-daemon
++Exec=/usr/bin/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
+ OnlyShowIn=GNOME;
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-Autostart-Notify=true
+diff -Nur -x '*.orig' -x '*~' gdm-2.27.90/gui/simple-chooser/gdm-chooser-session.c gdm-2.27.90.new/gui/simple-chooser/gdm-chooser-session.c
+--- gdm-2.27.90/gui/simple-chooser/gdm-chooser-session.c 2009-08-25 05:31:18.000000000 +1000
++++ gdm-2.27.90.new/gui/simple-chooser/gdm-chooser-session.c 2009-08-25 14:35:12.000000000 +1000
+@@ -131,7 +131,7 @@
+ ret = FALSE;
+
+ error = NULL;
+- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
++ g_spawn_command_line_async ("/usr/bin/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
+ if (error != NULL) {
+ g_warning ("Error starting settings daemon: %s", error->message);
+ g_error_free (error);
Modified: gnome-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2009-09-28 20:33:08 UTC (rev 53321)
+++ gnome-unstable/PKGBUILD 2009-09-29 08:02:50 UTC (rev 53338)
@@ -1,49 +1,48 @@
# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gdm
-pkgver=2.20.10
-pkgrel=2
+pkgver=2.28.0
+pkgrel=1
pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
arch=(i686 x86_64)
license=('GPL')
-depends=('pam>=1.0.2' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.26.0' 'librsvg>=2.26.0' 'gksu>=2.0.0' 'dbus-glib>=0.80' 'consolekit' 'zenity>=2.26.0')
-makedepends=('intltool' 'gnome-doc-utils>=0.16.0' 'pkgconfig' 'xorg-server')
-install=gdm.install
url="http://www.gnome.org"
+backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
groups=('gnome-extra')
-backup=('etc/gdm/custom.conf' 'etc/pam.d/gdm' 'etc/pam.d/gdm-autologin')
options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2
- gdm
- defaults.conf
+depends=('libcanberra>=0.14' 'gnome-panel>=2.28.0' 'libxklavier>=4.0' 'tcp_wrappers' 'gnome-session>=2.28.0')
+makedepends=('intltool' 'gnome-doc-utils>=0.18.0' 'xorg-server')
+conflicts=('fast-user-switch-applet')
+replaces=('fast-user-switch-applet')
+install=gdm.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2
+ 04_fix_external_program_directories.patch
gdm.pam
- gdm-autologin.pam)
-md5sums=('981c7ee7fbe453061e095ab52a3513f8'
- '2fdb6d6fd7fd8124b1e00621b3d238f9'
- 'fa61d885f0368756a7d8e7f7abdb11d9'
- '2e52f326dccc833e9c135f8df8297b12'
- '157f32e089a7aab50732dc122e592b35')
+ gdm-autologin.pam
+ gdm)
+sha256sums=('b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4'
+ 'd5b71bbe1990fb754dee87760021032657ae25039167821a099bffbc12880b7d'
+ 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
+ '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
+ '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/04_fix_external_program_directories.patch" || return 1
./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gdm \
- --localstatedir=/var/lib --disable-static \
- --with-xevie=yes --disable-scrollkeeper \
- --enable-secureremote || return 1
- sed -i -e 's|${prefix}|/usr|' config.h || return 1
+ --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \
+ --disable-scrollkeeper || return 1
make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
- #PAM, we use our own, not Redhat stuff
- install -m644 "${srcdir}/gdm-autologin.pam" "${pkgdir}/etc/pam.d/gdm-autologin" || return 1
install -m644 "${srcdir}/gdm.pam" "${pkgdir}/etc/pam.d/gdm" || return 1
-
- #init script and configuration
+ install -m644 "${srcdir}/gdm-autologin.pam" "${pkgdir}/etc/pam.d/gdm-autologin" || return 1
+
install -m755 -d "${pkgdir}/etc/rc.d"
install -m755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/" || return 1
- install -m444 "${srcdir}/defaults.conf" "${pkgdir}/usr/share/gdm/" || return 1
- rm -f ${pkgdir}/usr/share/xsessions/gnome.desktop
- # fix gdmsetup
- sed -i -e 's|^Exec=|Exec=gksu |' "${pkgdir}/usr/share/gdm/applications/gdmsetup.desktop" || return 1
+
}
Modified: gnome-unstable/gdm
===================================================================
--- trunk/gdm 2009-09-28 20:33:08 UTC (rev 53321)
+++ gnome-unstable/gdm 2009-09-29 08:02:50 UTC (rev 53338)
@@ -6,23 +6,24 @@
case "$1" in
start)
stat_busy "Starting GDM"
- /usr/sbin/gdm
+ /usr/sbin/gdm &
if [ $? -gt 0 ]; then
stat_fail
else
+
add_daemon gdm
stat_done
fi
;;
- stop)
- stat_busy "Stopping GDM"
- /usr/sbin/gdm-stop > /dev/null 2>&1
+ stop)
+ stat_busy "Stopping GDM"
+ [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
if [ $? -gt 0 ]; then
- stat_fail
+ stat_fail
else
- rm_daemon gdm
- stat_done
- fi
+ rm_daemon gdm
+ stat_done
+ fi
;;
restart)
$0 stop
Modified: gnome-unstable/gdm.install
===================================================================
--- trunk/gdm.install 2009-09-28 20:33:08 UTC (rev 53321)
+++ gnome-unstable/gdm.install 2009-09-29 08:02:50 UTC (rev 53338)
@@ -8,6 +8,7 @@
chmod 1770 /var/lib/gdm > /dev/null
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ gconfpkg --install ${pkgname}
}
pre_upgrade() {
@@ -19,14 +20,21 @@
opt/gnome/etc/gdm/custom.conf > etc/gdm/custom.conf
mv opt/gnome/etc/gdm/custom.conf opt/gnome/etc/gdm/custom.conf.pacsave
fi
+ pre_remove
}
+pre_remove() {
+ if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+ gconfpkg --uninstall ${pkgname}
+ fi
+}
+
post_upgrade() {
post_install
}
post_remove() {
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- getent passwd gdm || userdel gdm
- getent group gdm || groupdel gdm
+ getent passwd gdm >/dev/null 2>&1 || userdel gdm
+ getent group gdm >/dev/null 2>&1 || groupdel gdm
}
More information about the arch-commits
mailing list