Sun May 1 22:33:26 UTC 2011

1 files changed, 22 insertions, 20 deletions

diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index b5a06693f..2248f184d 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117177 2011-03-29 06:49:52Z ibiru $
+# $Id: PKGBUILD 119944 2011-04-17 09:10:01Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=gdm
-pkgver=2.32.1
-pkgrel=1
+pkgver=3.0.0
+pkgrel=3
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -10,42 +10,43 @@ url="http://www.gnome.org"
 backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
 groups=('gnome-extra')
 options=('!libtool')
-depends=('libcanberra>=0.26' 'libxklavier>=5.0' 'tcp_wrappers' 'gnome-session>=2.32.1' 'upower>=0.9.7' 'consolekit>=0.4.1-4')
-makedepends=('intltool' 'gnome-doc-utils>=0.20.1' 'xorg-server' 'gnome-panel>=2.32.0')
-optdepends=('gnome-panel: needed for user switch applet')
+depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit')
+makedepends=('intltool' 'gnome-doc-utils' '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.32/${pkgname}-${pkgver}.tar.bz2
-        04_fix_external_program_directories.patch
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        2.91_fix_external_program_directories.patch
         gdm-vt-allocation-hack.patch
-        0001-port-to-libpanel-applet-3.0.patch
-        correctly-give-focus-to-user-chooser.patch
         gdm.pam
         gdm-autologin.pam
-        gdm)
-sha256sums=('7ba9cb2a8efb9856994467b14e4837a281fcf6d9dc9a267ea38a9aae1ec55abc'
-            'cb585c39c6671387b5a25f21a99c97e3a20eaf4188fea1b62871681a1ebf8bff'
+        gdm
+        fix_crasher_with_gtk307.patch)
+sha256sums=('2d6443912272c0aa339a06b58d797cc11ce6b0854dadfcc027408f546da7aeff'
+            '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1'
             '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
-            '41ca4b2408d61776ab42c50834374a90664d43d33ad7034c7c52862d9bf3234a'
-            'ab6d9739c0cc3631d077a897291d6a38fea1c713a3647d008e2635f48c503cb4'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
-            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
+            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
+            '6d08951919dcb1f928dd67c0b5a5c209b32464c2374ee7d2369ed8e914d541c9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/04_fix_external_program_directories.patch"
+  patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch"
   patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
-  patch -Np1 -i "${srcdir}/0001-port-to-libpanel-applet-3.0.patch"
-  patch -Np1 -i "${srcdir}/correctly-give-focus-to-user-chooser.patch"
-  autoreconf -fi
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=646498
+  patch -Np1 -i "${srcdir}/fix_crasher_with_gtk307.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \
       --with-at-spi-registryd-directory=/usr/lib/at-spi \
       --disable-scrollkeeper
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
   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
@@ -59,4 +60,5 @@ build() {
 
   rmdir "${pkgdir}/var/gdm"
   chmod 1770 "${pkgdir}/var/log/gdm"
+  rm -rf "${pkgdir}/var/run"
 }