summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2018-07-20 21:17:36 +0200
committerMaxime Gauduin2018-07-20 21:17:36 +0200
commit33792b37d18cf9d8bea11de8df6d57058c7c1979 (patch)
tree90aab94b6d95ce9264818776942705c3d8277f49
parentfa7ee2df6c752b31d5fb0ecd977d20ae0ea32b7a (diff)
downloadaur-33792b37d18cf9d8bea11de8df6d57058c7c1979.tar.gz
Switch to meson
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD27
2 files changed, 9 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 89d02c539217..89cb9ac127d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
+# Generated by mksrcinfo v8
+# Fri Jul 20 19:17:36 UTC 2018
pkgbase = wingpanel-indicator-network-git
pkgdesc = Network indicator for Wingpanel
- pkgver = r288.9c4dd72
+ pkgver = r463.b67512a
pkgrel = 1
url = https://github.com/elementary/wingpanel-indicator-network
arch = x86_64
groups = pantheon-unstable
license = GPL3
- makedepends = cmake
makedepends = git
makedepends = granite-git
+ makedepends = meson
makedepends = vala
makedepends = wingpanel-git
depends = glib2
diff --git a/PKGBUILD b/PKGBUILD
index 724293e935a1..395d3323f1e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=wingpanel-indicator-network-git
-pkgver=r288.9c4dd72
+pkgver=r463.b67512a
pkgrel=1
pkgdesc='Network indicator for Wingpanel'
arch=('x86_64')
@@ -11,7 +11,7 @@ groups=('pantheon-unstable')
depends=('glib2' 'glibc' 'gtk3' 'libgee' 'libnm-glib' 'networkmanager'
'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')
@@ -24,30 +24,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: