[arch-commits] Commit in gnome-calculator/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Wednesday, March 14, 2018 @ 08:55:16
  Author: bpiotrowski
Revision: 318956

3.28.0-1

Modified:
  gnome-calculator/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-14 08:49:25 UTC (rev 318955)
+++ PKGBUILD	2018-03-14 08:55:16 UTC (rev 318956)
@@ -3,17 +3,17 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-calculator
-pkgver=3.26.0
-pkgrel=3
+pkgver=3.28.0
+pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 url="https://wiki.gnome.org/Apps/Calculator"
 arch=(x86_64)
 license=(GPL)
 depends=(gtk3 dconf gtksourceview3 mpfr libsoup libmpc)
-makedepends=(intltool yelp-tools vala git appstream-glib)
+makedepends=(intltool yelp-tools vala git appstream-glib meson)
 groups=(gnome)
 options=(!emptydirs)
-_commit=b2d0bb15ec8618b0bfc2350d556b688086d4a3b9  # tags/3.26.0^0
+_commit=d1d38fb5af568f73452de9271590fda74e172715  # tags/3.28.0^0
 source=("git+https://git.gnome.org/browse/gnome-calculator#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -22,21 +22,11 @@
   git describe --tags | sed 's/-/+/g'
 }
 
-prepare() {
-  cd $pkgname
-  git cherry-pick -n ad694dba6d13633bb5a2ec6f41b3a3fe9758007d
-  NOCONFIGURE=1 ./autogen.sh
-}
-
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \
-      --localstatedir=/var --libexecdir=/usr/lib/gnome-calculator
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  arch-meson $pkgname build
+  ninja -C build
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" ninja -C build install
 }