version bump

2 files changed, 26 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e5057f41d7a..f2b0c10435d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = upower-nocritical
 	pkgdesc = Abstraction for enumerating power devices, listening to device events and querying history and statistics (With a patch to disable low battery action)
-	pkgver = 0.99.11
+	pkgver = 1.90.0
 	pkgrel = 1
 	url = http://upower.freedesktop.org
 	arch = i686
@@ -9,7 +9,7 @@ pkgbase = upower-nocritical
 	makedepends = intltool
 	makedepends = docbook-xsl
 	makedepends = gobject-introspection
-	makedepends = python2
+	makedepends = python
 	makedepends = git
 	makedepends = gtk-doc
 	depends = systemd
@@ -19,10 +19,18 @@ pkgbase = upower-nocritical
 	provides = upower
 	conflicts = upower
 	backup = etc/UPower/UPower.conf
-	source = git+https://gitlab.freedesktop.org/upower/upower.git#commit=e1548bba61206a05bbc318b3d49ae24571755ac6
+	source = git+https://gitlab.freedesktop.org/upower/upower.git#commit=d4259c009b3ca1169dfd19231a040c233fc3b58d
 	source = 0001-Add-a-critical-action-Ignore.patch
 	md5sums = SKIP
 	md5sums = 69fbeb7e5906a59fd39f702d01f83815
 
 pkgname = upower-nocritical
-
+	depends = systemd
+	depends = libusb
+	depends = libimobiledevice
+	depends = libgudev
+	depends = libglib-2.0.so
+	depends = libgobject-2.0.so
+	depends = libgio-2.0.so
+	provides = upower
+	provides = libupower-glib.so
diff --git a/PKGBUILD b/PKGBUILD
index 93399ddc270f..70e2722b74ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,18 @@
 
 pkgname=upower-nocritical
 _pkgname=upower
-pkgver=0.99.11
+pkgver=1.90.0
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics (With a patch to disable low battery action)"
 arch=('i686' 'x86_64')
 url="http://upower.freedesktop.org"
 license=('GPL')
 depends=('systemd' 'libusb' 'libimobiledevice' 'libgudev')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2' 'git' 'gtk-doc')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python' 'git' 'gtk-doc')
 provides=('upower')
 conflicts=('upower')
 backup=('etc/UPower/UPower.conf')
-_commit=e1548bba61206a05bbc318b3d49ae24571755ac6  # tags/UPOWER_0_99_11^0
+_commit=d4259c009b3ca1169dfd19231a040c233fc3b58d  # tags/v1.90.0^0
 source=("git+https://gitlab.freedesktop.org/upower/upower.git#commit=$_commit"
         0001-Add-a-critical-action-Ignore.patch)
 md5sums=('SKIP'
@@ -22,29 +22,26 @@ md5sums=('SKIP'
 
 pkgver() {
   cd $_pkgname
-  git describe --tags | sed -e 's/UPOWER_//' -e 's/_/\./g' -e 's/-/+/g'
+  git describe --tags | sed -e 's/^v\|^UPOWER_//;s/_/\./g;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $_pkgname
   patch -p1 < "$srcdir/0001-Add-a-critical-action-Ignore.patch"
-  sed -e 's|libplist >= 0.12|libplist-2.0 >= 2.2|' -i configure.ac # support libplist 2.2
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $_pkgname
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib \
-    --disable-static \
-    --enable-gtk-doc
-  make
+  arch-meson upower build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
 }
 
 package() {
-  cd $_pkgname
-  make DESTDIR="$pkgdir" install
+  depends+=(libg{lib,object,io}-2.0.so)
+  provides+=(libupower-glib.so)
+
+  meson install -C build --destdir "$pkgdir"
 }