[arch-commits] Commit in gnome-control-center/trunk (PKGBUILD)

[Jan Steffens]

    Date: Tuesday, September 27, 2016 @ 19:59:13
  Author: heftig
Revision: 277144

3.22.0+7+gd377562-1

Modified:
  gnome-control-center/trunk/PKGBUILD

----------+
 PKGBUILD |   34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-27 19:59:03 UTC (rev 277143)
+++ PKGBUILD	2016-09-27 19:59:13 UTC (rev 277144)
@@ -3,8 +3,8 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.20.1
-pkgrel=2
+pkgver=3.22.0+7+gd377562
+pkgrel=1
 pkgdesc="GNOME's main interface to configure various aspects of the desktop"
 url="https://git.gnome.org/browse/gnome-control-center"
 license=(GPL2)
@@ -14,7 +14,7 @@
          libgtop libnm-gtk sound-theme-freedesktop upower libpwquality
          gnome-color-manager smbclient libmm-glib libgnomekbd grilo clutter-gtk libibus
          cheese libgudev)
-makedepends=(intltool docbook-xsl modemmanager gnome-common)
+makedepends=(intltool docbook-xsl modemmanager gnome-common git python)
 optdepends=('system-config-printer: Printer settings'
             'gnome-user-share: Bluetooth and WebDAV file sharing'
             'rygel: media sharing'
@@ -22,17 +22,33 @@
             'openssh: remote login')
 groups=(gnome)
 options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ce6474fc60f78ed3cfaf555e55a52ec3ebb6437fa184e08ad6077bbec380a1ed')
+_commit=d377562cc1734313bcac843b61f604a6cf1cbb84  # gnome-3-22
+source=("git://git.gnome.org/gnome-control-center#commit=$_commit"
+        "git://git.gnome.org/libgnome-volume-control"
+        "git://git.gnome.org/libgd")
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^GNOME_CONTROL_CENTER_//;s/_/./g;s/-/+/g'
+}
+
 prepare() {
-  cd $pkgname-$pkgver
-  ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 srcdir=. gnome-autogen.sh
+  cd $pkgname
+
+  git submodule init
+  git config --local submodule."panels/sound/gvc".url "$srcdir/libgnome-volume-control"
+  git config --local submodule.libgd.url "$srcdir/libgd"
+  git submodule update
+
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/$pkgname --disable-static
@@ -44,7 +60,7 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   make DESTDIR="$pkgdir" install