updating pkgver and porting to meson

2 files changed, 19 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5b4e1b9d467..3e0ce133e342 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec  7 04:31:42 UTC 2017
+# Wed Feb 14 16:52:29 UTC 2018
 pkgbase = network-manager-applet-git
 	pkgdesc = Applet for managing network connections
-	pkgver = 1.8.7.dev.r26.g76c867ca
+	pkgver = 1.8.11.dev.r13.g6078306a
 	pkgrel = 1
 	url = http://www.gnome.org/projects/NetworkManager/
 	arch = i686
@@ -27,7 +27,7 @@ pkgbase = network-manager-applet-git
 
 pkgname = nm-connection-editor-git
 	pkgdesc = NetworkManager GUI connection editor and widgets
-	provides = libnm-gtk=1.8.7.dev.r26.g76c867ca-1
+	provides = libnm-gtk=1.8.11.dev.r13.g6078306a-1
 	provides = nm-connection-editor
 	conflicts = libnm-gtk
 	conflicts = nm-connection-editor
diff --git a/PKGBUILD b/PKGBUILD
index 0726dea350a1..00ea868bed57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=network-manager-applet-git
 pkgname=(nm-connection-editor-git network-manager-applet-git)
-pkgver=1.8.7.dev.r26.g76c867ca
+pkgver=1.8.11.dev.r13.g6078306a
 pkgrel=1
 pkgdesc="Applet for managing network connections"
 arch=('i686' 'x86_64')
@@ -32,31 +32,23 @@ mkdir -p nma/etc/xdg nma/usr/bin \
 build() {
 	cd $srcdir/network-manager-applet
 	
-	./configure --prefix=/usr \
-    --sysconfdir=/etc \
-		--localstatedir=/var \
-    runstatedir=/run \
-    --sbindir=/usr/bin \
-		--libexecdir=/usr/lib/networkmanager \
-		--disable-static \
-		--disable-maintainer-mode \
-		--enable-gtk-doc \
-    --enable-introspection \
-    --enable-ld-gc \
-    --with-team \
-    --with-wwan \
-    --without-appindicator \
-    --without-selinux
-	
-   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+	arch-meson build \
+		-Dgtk_doc=true \
+    -Dintrospection=true \
+    -Dld_gc=true \
+    -Dteam=true \
+    -Dwwan=true \
+    -Dappindicator=false \
+    -Dselinux=false \
+    -Db_lto=false
 
-  make
+  ninja -C build
 }
 
-check() {
-  cd $srcdir/network-manager-applet
-  make -k check
-}
+#check() {
+#  cd $srcdir/network-manager-applet
+#  make -k check
+#}
 
 package_nm-connection-editor-git() {
   pkgdesc="NetworkManager GUI connection editor and widgets"
@@ -65,7 +57,7 @@ package_nm-connection-editor-git() {
   replaces=(libnm-gtk nm-connection-editor)
 
   cd $srcdir/network-manager-applet
-  make DESTDIR="$pkgdir" install
+  DESTDIR="${pkgdir}" ninja -C build install
 
 ### Split network-manager-applet
   cd ../nma