Tue Apr 23 01:16:16 PDT 2013

1 files changed, 40 insertions, 27 deletions

diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index dcf685850..79c74ba78 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,40 +1,28 @@
-# $Id: PKGBUILD 178235 2013-02-18 16:38:26Z jgc $
+# $Id: PKGBUILD 183315 2013-04-21 22:06:33Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gdm
-pkgver=3.6.2
-pkgrel=2
+pkgbase=gdm
+pkgname=(gdm libgdm)
+pkgver=3.8.1.1
+pkgrel=1
 pkgdesc="Gnome Display Manager"
 arch=(i686 x86_64)
 license=(GPL)
 url="http://www.gnome.org"
-backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
-        etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf)
-groups=(gnome)
 options=('!libtool')
-depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd
-         xorg-xrdb nss polkit-gnome xorg-server gnome-icon-theme)
+depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server)
 makedepends=(itstool intltool gnome-doc-utils gobject-introspection)
-optdepends=('gnome-shell: new login interface'
-            'fprintd: fingerprint authentication')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fix_external_program_directories.patch
-        git-fixes.patch
-        maintain-FamilyLocal-cookie.patch)
-sha256sums=('fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9'
-            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2'
-            '1f21838553e4b0eec12465019f11ae3166b502566b3dbefbf0cb6573d77f8031'
-            '59e9c1fb86e39672b61a30dd75b16f6bea6293d23356422624f445966ddeb1ed')
+checkdepends=('check')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz
+        fix_external_program_directories.patch)
+sha256sums=('16f8141040798ba00be0d718ba24cce927d6412b767d091f9ee5bf93f5800ba8'
+            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgbase-$pkgver
   patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
 
-  patch -Np1 -i "$srcdir/git-fixes.patch"
-  patch -Np1 -i "$srcdir/maintain-FamilyLocal-cookie.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -52,14 +40,39 @@ build() {
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
-  make -j1 # race condition building gdm-client.c, does not wait for gdm-client-glue.h
+  make
+}
+
+check() {
+  cd $pkgbase-$pkgver
+  make check
 }
 
-package() {
-  cd "$pkgname-$pkgver"
+package_gdm() {
+  depends+=(libgdm)
+  optdepends=('fprintd: fingerprint authentication')
+  backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
+          etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf
+          etc/gdm/Xsession
+          etc/gdm/PostSession/Default etc/gdm/PreSession/Default)
+  groups=(gnome)
+  install=gdm.install
+
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 
   chmod 1770 "$pkgdir/var/log/gdm"
   chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
   rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
+
+### Split libgdm
+  make -C gui/libgdm DESTDIR="$pkgdir" uninstall
+}
+
+package_libgdm() {
+  pkgdesc="GDM support library"
+  depends=(systemd)
+
+  cd $pkgbase-$pkgver
+  make -C gui/libgdm DESTDIR="$pkgdir" install
 }