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

[Jan de Groot]

    Date: Tuesday, September 20, 2016 @ 11:38:41
  Author: jgc
Revision: 276740

upgpkg: gdm 3.22.0-1

Modified:
  gdm/trunk/PKGBUILD

----------+
 PKGBUILD |   33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-20 11:34:30 UTC (rev 276739)
+++ PKGBUILD	2016-09-20 11:38:41 UTC (rev 276740)
@@ -4,30 +4,34 @@
 
 pkgbase=gdm
 pkgname=(gdm libgdm)
-pkgver=3.20.1
-pkgrel=2
+pkgver=3.22.0
+pkgrel=1
 pkgdesc="Display manager and login screen"
 arch=(i686 x86_64)
 license=(GPL)
 url="https://wiki.gnome.org/Projects/GDM"
 depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-server-xwayland xorg-xhost)
-makedepends=(itstool intltool yelp-tools gobject-introspection)
+makedepends=(yelp-tools intltool gobject-introspection git)
 checkdepends=('check')
-source=(https://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz
+_commit=2bfe227e1f0eb14f42d9137ddeb4337e278121d4
+source=("git://git.gnome.org/gdm#commit=$_commit"
         0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
-sha256sums=('10a2512fc8455a3e60e61907a8419ae7dfba9e7ea80cfb7e2ffa746eb165789f'
+sha256sums=('SKIP'
             '9449da0b6ee58aa3fde65e6d8d1f30513e4176a7dc6d176f17f320ce82cb1d82')
 
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd $pkgbase-$pkgver
-
+  cd $pkgbase
   patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
-
-  AUTOPOINT='intltoolize --automake -c' autoreconf -fi
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
@@ -46,13 +50,12 @@
     --without-plymouth \
     --without-tcp-wrappers
 
-  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
-
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   make check
 }
 
@@ -65,7 +68,7 @@
   groups=(gnome)
   install=gdm.install
 
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   make DESTDIR="$pkgdir" install
 
   chown -R 120:120 "$pkgdir/var/lib/gdm"
@@ -82,7 +85,7 @@
   pkgdesc="GDM support library"
   depends=(systemd glib2)
 
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   make -C libgdm DESTDIR="$pkgdir" install
   install -Dm644 "$srcdir/org.gnome.login-screen.gschema.xml" \
     "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml"