summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2018-07-27 13:58:15 +0200
committerMaxime Gauduin2018-07-27 13:58:15 +0200
commit05eef68e1976a0db9edf036f2c72c1ab9c9f0e2f (patch)
tree1ba99f0918f61b9d2e72ea1abe78156d68ab9aad
parenta63b3fb141af23092ea5c9a6662a48bdb7d56bd5 (diff)
downloadaur-05eef68e1976a0db9edf036f2c72c1ab9c9f0e2f.tar.gz
Switch to meson
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD30
2 files changed, 9 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 124033cee524..c142455fe57f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
# Generated by mksrcinfo v8
-# Fri Jul 20 18:40:24 UTC 2018
+# Fri Jul 27 11:58:14 UTC 2018
pkgbase = switchboard-git
pkgdesc = The Pantheon Control Center
- pkgver = r1207.40b1a6e
+ pkgver = r1211.cd4124e
pkgrel = 1
url = https://github.com/elementary/switchboard
arch = x86_64
groups = pantheon-unstable
license = GPL3
- makedepends = cmake
makedepends = git
makedepends = granite-git
makedepends = intltool
+ makedepends = meson
makedepends = vala
depends = clutter-gtk
depends = glib2
@@ -28,7 +28,6 @@ pkgbase = switchboard-git
provides = switchboard
provides = libswitchboard-2.0.so
conflicts = switchboard
- replaces = switchboard-bzr
source = git+https://github.com/elementary/switchboard.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index c9c190a8fb13..66efa28c0376 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=switchboard-git
-pkgver=r1207.40b1a6e
+pkgver=r1211.cd4124e
pkgrel=1
pkgdesc='The Pantheon Control Center'
arch=('x86_64')
@@ -10,7 +10,7 @@ license=('GPL3')
groups=('pantheon-unstable')
depends=('clutter-gtk' 'glib2' 'glibc' 'gtk3' 'libgee'
'libgranite.so')
-makedepends=('cmake' 'git' 'granite-git' 'intltool' 'vala')
+makedepends=('git' 'granite-git' 'intltool' 'meson' 'vala')
optdepends=('switchboard-plug-about-bzr: About plug'
'switchboard-plug-default-applications-bzr: Default applications plug'
'switchboard-plug-elementary-tweaks-bzr: Elementary tweaks plug'
@@ -19,7 +19,6 @@ optdepends=('switchboard-plug-about-bzr: About plug'
'switchboard-plug-power-bzr: Power plug')
provides=('switchboard' 'libswitchboard-2.0.so')
conflicts=('switchboard')
-replaces=('switchboard-bzr')
source=('git+https://github.com/elementary/switchboard.git')
sha256sums=('SKIP')
@@ -29,31 +28,14 @@ pkgver() {
echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
-prepare() {
- cd switchboard
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build
-}
-
build() {
- cd switchboard/build
-
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DCMAKE_INSTALL_LIBDIR='lib' \
- -DGSETTINGS_COMPILE='FALSE' \
- -DUSE_UNITY='FALSE'
- make
+ arch-meson switchboard build \
+ -Dlibunity='false'
+ ninja -C build
}
package() {
- cd switchboard/build
-
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -C build install
}
# vim: ts=2 sw=2 et: