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

[Jan Steffens]

    Date: Sunday, March 11, 2018 @ 20:41:16
  Author: heftig
Revision: 318650

3.27.92+4+g77d81dc15-1

Modified:
  gnome-control-center/trunk/PKGBUILD

----------+
 PKGBUILD |   37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-11 20:18:12 UTC (rev 318649)
+++ PKGBUILD	2018-03-11 20:41:16 UTC (rev 318650)
@@ -3,10 +3,10 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.26.2+14+g5ac6a0da6
+pkgver=3.27.92+4+g77d81dc15
 pkgrel=1
 pkgdesc="GNOME's main interface to configure various aspects of the desktop"
-url="https://git.gnome.org/browse/gnome-control-center"
+url="https://gitlab.gnome.org/GNOME/gnome-control-center"
 license=(GPL2)
 arch=(x86_64)
 depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
@@ -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 git python)
+makedepends=(docbook-xsl modemmanager git python meson)
 optdepends=('system-config-printer: Printer settings'
             'gnome-user-share: Bluetooth and WebDAV file sharing'
             'rygel: media sharing'
@@ -21,9 +21,8 @@
             'vino: screen sharing'
             'openssh: remote login')
 groups=(gnome)
-options=('!emptydirs')
-_commit=5ac6a0da687a0980d83af79e9cff4531edb1bc80  # gnome-3-26
-source=("git+https://git.gnome.org/browse/gnome-control-center#commit=$_commit"
+_commit=77d81dc155ddc0d865020c0ae923668be0bff972  # gnome-3-28
+source=("git+https://gitlab.gnome.org/GNOME/gnome-control-center.git#commit=$_commit"
         "git+https://git.gnome.org/browse/libgnome-volume-control"
         "git+https://git.gnome.org/browse/libgd")
 sha256sums=('SKIP'
@@ -37,32 +36,24 @@
 
 prepare() {
   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 config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
+  git config --local submodule.subprojects/libgd.url "$srcdir/libgd"
   git submodule update
-
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 
 build() {
-  cd $pkgname
+  arch-meson $pkgname build -D documentation=true -D b_lto=false
+  ninja -C build
+}
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib --disable-static
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  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
+check() {
+  cd build
+  meson test
 }
 
 package() {
-  cd $pkgname
-
-  make DESTDIR="$pkgdir" install
-
+  DESTDIR="$pkgdir" ninja -C build install
   install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
 }