Switch to Meson Build system. Updated package to latest commit.

2 files changed, 24 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 868ce18b52b1..d9a257888f70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
-# Generated by mksrcinfo v8
-# Tue Dec 15 15:25:51 UTC 2015
 pkgbase = connman-gtk
-	pkgdesc = GTK GUI for ConnMan
-	pkgver = 1.1.1
-	pkgrel = 1
+	pkgdesc = Tray menu and GUI for ConnMan
+	pkgver = v1.1.1
+	pkgrel = 2
 	url = https://github.com/jgke/connman-gtk
-	install = connman-gtk.install
-	arch = i686
 	arch = x86_64
-	license = GPL
+	license = GPL2
 	makedepends = intltool
 	makedepends = git
+	makedepends = meson
 	makedepends = openconnect
 	depends = glib2
 	depends = gtk3
-	optdepends = openconnect: for AnyConnect VPNs
-	source = git+https://github.com/jgke/connman-gtk.git#tag=v1.1.1
+	optdepends = openconnect: Easier authentication to AnyConnect VPNs
+	source = git+https://github.com/jgke/connman-gtk.git#commit=b72c6ab3bb19c07325c8e659902b046daa23c506
 	sha256sums = SKIP
 
 pkgname = connman-gtk
diff --git a/PKGBUILD b/PKGBUILD
index f2519fafe058..7dd79643833a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,27 @@
-# Maintainer: American_Jesus <american.jesus.pt AT gmail DOT com>
+# Based on the files created for Arch Linux by:
+# American_Jesus <american.jesus.pt AT gmail DOT com>
+# Gregory Petrosyan <gregory.mkv at gmail.com>
+
 pkgname=connman-gtk
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="GTK GUI for ConnMan"
-arch=('i686' 'x86_64')
+pkgver=v1.1.1
+pkgrel=2
+pkgdesc="Tray menu and GUI for ConnMan"
+arch=('x86_64')
 url="https://github.com/jgke/connman-gtk"
-license=('GPL')
+license=('GPL2')
 depends=('glib2' 'gtk3')
-makedepends=('intltool' 'git' 'openconnect')
-optdepends=('openconnect: for AnyConnect VPNs')
-install=$pkgname.install
-source=("git+https://github.com/jgke/connman-gtk.git#tag=v${pkgver}")
+makedepends=('intltool' 'git' 'meson' 'openconnect')
+optdepends=('openconnect: Easier authentication to AnyConnect VPNs')
+_commit=b72c6ab3bb19c07325c8e659902b046daa23c506
+source=("git+https://github.com/jgke/connman-gtk.git#commit=$_commit")
 sha256sums=('SKIP')
 
 build() {
-  cd "${srcdir}/$pkgname"
-  ./autogen.sh
-  ./configure \
-    --bindir=/usr/bin \
-    --datarootdir=/usr/share \
-    --mandir=/usr/share/man \
-    --with-openconnect=dynamic
-  make
+  mkdir build
+  meson --prefix /usr --buildtype=plain -Duse_openconnect=dynamic "${srcdir}/${pkgname}" build
+  ninja -C build
 }
 
 package() {
-  cd "${srcdir}/$pkgname"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
-