summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2018-06-19 15:33:20 +0200
committerMaxime Gauduin2018-06-19 15:33:20 +0200
commit218f1079668167a44ea0cc5aceae962443185d3f (patch)
treeebcdeaadd393aa21c7dd55805731005b2c669c0c
parent80df09e410b3190a9643a14cc876abc9bca525cb (diff)
downloadaur-218f1079668167a44ea0cc5aceae962443185d3f.tar.gz
Switch to meson
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD26
2 files changed, 6 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c4a0b1321140..491b06a34e93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
# Generated by mksrcinfo v8
-# Mon May 1 15:55:42 UTC 2017
+# Tue Jun 19 13:33:20 UTC 2018
pkgbase = wingpanel-indicator-network-git
pkgdesc = Network indicator for Wingpanel
pkgver = r288.9c4dd72
pkgrel = 1
url = https://github.com/elementary/wingpanel-indicator-network
- arch = i686
arch = x86_64
groups = pantheon-unstable
license = GPL3
- makedepends = cmake
makedepends = git
makedepends = granite-git
+ makedepends = meson
makedepends = vala
makedepends = wingpanel-git
depends = glib2
@@ -24,7 +23,6 @@ pkgbase = wingpanel-indicator-network-git
depends = libwingpanel-2.0.so
provides = wingpanel-indicator-network
conflicts = wingpanel-indicator-network
- replaces = wingpanel-indicator-nztwork-bzr
source = git+https://github.com/elementary/wingpanel-indicator-network.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index e9794be8e23a..2f093dae643f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,10 +10,9 @@ license=('GPL3')
groups=('pantheon-unstable')
depends=('glib2' 'glibc' 'gtk3' 'libgee' 'libnm-glib' 'nm-connection-editor'
'libgranite.so' 'libwingpanel-2.0.so')
-makedepends=('cmake' 'git' 'granite-git' 'vala' 'wingpanel-git')
+makedepends=('git' 'granite-git' 'meson' 'vala' 'wingpanel-git')
provides=('wingpanel-indicator-network')
conflicts=('wingpanel-indicator-network')
-replaces=('wingpanel-indicator-nztwork-bzr')
source=('git+https://github.com/elementary/wingpanel-indicator-network.git')
sha256sums=('SKIP')
@@ -23,30 +22,13 @@ pkgver() {
echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
-prepare() {
- cd wingpanel-indicator-network
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build
-}
-
build() {
- cd wingpanel-indicator-network/build
-
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
- -DGSETTINGS_COMPILE='FALSE'
- make
+ arch-meson wingpanel-indicator-network build
+ ninja -C build
}
package() {
- cd wingpanel-indicator-network/build
-
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -C build install
}
# vim: ts=2 sw=2 et: