Align with Arch packaging standards

1 files changed, 16 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7c63556bcbdd..0d04714c4f7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,42 @@
 # Maintainer: Campbell Jones <dev at serebit dot com>
 
 pkgname=budgie-desktop-git
-pkgver=10.6.r63.g84edf57d
+pkgver=10.6.r65.g01e1f2bd
 pkgrel=1
-pkgdesc="A feature-rich, modern desktop - latest git"
+pkgdesc="A familiar, modern desktop environment - latest git"
 arch=('x86_64')
 url="https://github.com/BuddiesOfBudgie/budgie-desktop"
-license=('GPL2' 'LGPL2.1')
-depends=('gnome-bluetooth' 'gnome-menus' 'gnome-session' 'gnome-themes-standard' 'libgee' 'libpeas' 'libwnck3'
-         'mutter' 'accountsservice' 'sassc' 'ibus')
+license=('GPL' 'LGPL')
+depends=('budgie-screensaver' 'gnome-bluetooth' 'gnome-menus' 'gnome-session' 'gnome-themes-standard'
+         'libgee' 'libpeas' 'libwnck3' 'mutter' 'accountsservice' 'sassc' 'ibus')
 makedepends=('meson' 'git' 'gobject-introspection' 'intltool' 'vala' 'gtk-doc')
 optdepends=('gnome-backgrounds: Default background'
             'budgie-control-center: System settings'
-            'budgie-screensaver: Lock screen'
             'network-manager-applet: Network management')
 provides=('budgie-desktop')
 conflicts=('budgie-desktop')
-source=("$pkgname"::'git+https://github.com/BuddiesOfBudgie/budgie-desktop.git')
-md5sums=('SKIP')
+source=("$pkgname"::'git+https://github.com/BuddiesOfBudgie/budgie-desktop.git'
+        "gvc"::"git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
+md5sums=('SKIP'
+         'SKIP')
 
 pkgver() {
     cd "$pkgname"
-    git describe --long --tags | sed -r 's/^v([^-]*)-([^-]*)-/\1.r\2./'
+    git describe --tags --long | sed 's/\([^-]*-g\)/r\1/; s/-/./g; s/^v//g'
 }
 
 prepare() {
     cd "$pkgname"
-    git submodule update --init
+    git submodule init
+    git config submodule.gvc "$srcdir/gvc"
+    git submodule update
 }
 
 build() {
-    cd "$pkgname"
-    meson build --prefix=/usr --sysconfdir=/etc --buildtype plain
-    ninja -C build
+    arch-meson "$pkgname" build
+    meson compile -C build
 }
 
 package() {
-    cd "$pkgname"
-    DESTDIR=$pkgdir ninja -C build install
+    meson install -C build --destdir "$pkgdir"
 }