Switch to meson

2 files changed, 5 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64562fbf8e03..935b1fd0a562 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Feb 13 23:05:55 UTC 2018
+# Mon Jun 18 14:28:43 UTC 2018
 pkgbase = switchboard-plug-security-privacy-git
 	pkgdesc = Switchboard Security & Privacy Plug
 	pkgver = r542.f49c046
@@ -7,9 +7,9 @@ pkgbase = switchboard-plug-security-privacy-git
 	url = https://launchpad.net/switchboard-plug-security-privacy
 	arch = x86_64
 	license = GPL3
-	makedepends = cmake
 	makedepends = git
 	makedepends = granite-git
+	makedepends = meson
 	makedepends = switchboard-git
 	makedepends = vala
 	depends = glib2
@@ -25,7 +25,6 @@ pkgbase = switchboard-plug-security-privacy-git
 	depends = libswitchboard-2.0.so
 	provides = switchboard-plug-security-privacy
 	conflicts = switchboard-plug-security-privacy
-	replaces = switchboard-plug-security-privacy-bzr
 	source = git+https://github.com/elementary/switchboard-plug-security-privacy.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 456224aaa86a..1cf98c7a5e73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,10 +10,9 @@ license=('GPL3')
 depends=('glib2' 'glibc' 'gtk3' 'libgee' 'light-locker'
          'pantheon-dpms-helper-git' 'polkit' 'ufw' 'zeitgeist'
          'libgranite.so' 'libswitchboard-2.0.so')
-makedepends=('cmake' 'git' 'granite-git' 'switchboard-git' 'vala')
+makedepends=('git' 'granite-git' 'meson' 'switchboard-git' 'vala')
 provides=('switchboard-plug-security-privacy')
 conflicts=('switchboard-plug-security-privacy')
-replaces=('switchboard-plug-security-privacy-bzr')
 source=('git+https://github.com/elementary/switchboard-plug-security-privacy.git')
 sha256sums=('SKIP')
 
@@ -23,31 +22,12 @@ pkgver() {
   echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  cd switchboard-plug-security-privacy
-
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
-}
-
 build() {
-  cd switchboard-plug-security-privacy/build
-
-  cmake .. \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DCMAKE_INSTALL_LIBDIR='/usr/lib'
-  make
+  arch-meson switchboard-plug-security-privacy build
 }
 
 package() {
-  cd switchboard-plug-security-privacy/build
-
-  make DESTDIR="${pkgdir}" install
-
-  chmod 755 "${pkgdir}"/usr/lib/switchboard/personal/pantheon-security-privacy/security-privacy-plug-helper
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et: