[arch-commits] Commit in gdm/trunk (PKGBUILD)

[Jan Steffens]

    Date: Monday, April 1, 2013 @ 19:00:05
  Author: heftig
Revision: 181153

FS#34532 split libgdm; dep shuffle

Modified:
  gdm/trunk/PKGBUILD

----------+
 PKGBUILD |   49 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-01 15:47:28 UTC (rev 181152)
+++ PKGBUILD	2013-04-01 17:00:05 UTC (rev 181153)
@@ -2,31 +2,24 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
-pkgname=gdm
+pkgbase=gdm
+pkgname=(gdm libgdm)
 pkgver=3.8.0
-pkgrel=1
+pkgrel=2
 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
-        etc/gdm/Xsession)
-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 polkit-gnome 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
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         fix_external_program_directories.patch)
 sha256sums=('4a0894ae50d1f090c6ccc450b74142243fff9ee17e2924c0f363ea51b3ba6bd5'
             'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgbase-$pkgver
   patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
 
   ./configure \
@@ -46,14 +39,38 @@
 
   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
 }
 
-package() {
-  cd "$pkgname-$pkgver"
+check() {
+  cd $pkgbase-$pkgver
+  make check
+}
+
+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)
+  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
+}