summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD28
2 files changed, 9 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2affed4a6c0c..6363d6d5f3e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
-# Generated by mksrcinfo v8
-# Mon May 8 12:55:05 UTC 2017
pkgbase = switchboard-plug-a11y-git
pkgdesc = Switchboard Universal Access Plug
- pkgver = r158.f7621ec
+ pkgver = 2.2.0.r52.gbd7505e
pkgrel = 1
url = https://github.com/elementary/switchboard-plug-a11y
- arch = i686
arch = x86_64
groups = pantheon-unstable
license = GPL3
- makedepends = cmake
makedepends = git
makedepends = granite-git
- makedepends = switchboard-git
+ makedepends = meson
+ makedepends = switchboard
makedepends = vala
depends = glib2
depends = glibc
@@ -26,4 +23,3 @@ pkgbase = switchboard-plug-a11y-git
sha256sums = SKIP
pkgname = switchboard-plug-a11y-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 59abbac2815c..732fba8b5ddc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=switchboard-plug-a11y-git
-pkgver=r158.f7621ec
+pkgver=2.2.0.r52.gbd7505e
pkgrel=1
pkgdesc='Switchboard Universal Access Plug'
arch=('x86_64')
@@ -10,7 +10,7 @@ license=('GPL3')
groups=('pantheon-unstable')
depends=('glib2' 'glibc' 'gtk3' 'libgee'
'libgranite.so' 'libswitchboard-2.0.so')
-makedepends=('cmake' 'git' 'granite-git' 'switchboard-git' 'vala')
+makedepends=('git' 'granite-git' 'meson' 'switchboard' 'vala')
provides=('switchboard-plug-a11y')
conflicts=('switchboard-plug-a11y')
source=('git+https://github.com/elementary/switchboard-plug-a11y.git')
@@ -19,32 +19,16 @@ sha256sums=('SKIP')
pkgver() {
cd switchboard-plug-a11y
- echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
-}
-
-prepare() {
- cd switchboard-plug-a11y
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd switchboard-plug-a11y/build
-
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DCMAKE_INSTALL_LIBDIR='/usr/lib'
- make
+ arch-meson switchboard-plug-a11y build
+ ninja -C build
}
package() {
- cd switchboard-plug-a11y/build
-
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -C build install
}
# vim: ts=2 sw=2 et: