summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD31
2 files changed, 21 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 83aa1885a72f..4597c63824ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
pkgbase = budgie-desktop-git
- pkgdesc = A feature-rich, modern desktop - latest git
+ pkgdesc = A familiar, modern desktop environment - latest git
pkgver = 10.6.r63.g84edf57d
pkgrel = 1
url = https://github.com/BuddiesOfBudgie/budgie-desktop
arch = x86_64
- license = GPL2
- license = LGPL2.1
+ license = GPL
+ license = LGPL
makedepends = meson
makedepends = git
makedepends = gobject-introspection
@@ -30,6 +30,8 @@ pkgbase = budgie-desktop-git
provides = budgie-desktop
conflicts = budgie-desktop
source = budgie-desktop-git::git+https://github.com/BuddiesOfBudgie/budgie-desktop.git
+ source = gvc::git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
+ md5sums = SKIP
md5sums = SKIP
pkgname = budgie-desktop-git
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"
}