Upgrade to 1.8.2.

Switch to meson as build system (yay).
Remove unnecessary quotes and curly braces.
Remove all references to previously overlinked libraries.
Disable natural language support as we don't have intl.
Switch to current upstream url.

1 files changed, 21 insertions, 36 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d8b470a19b5c..e89b19ef1c96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,51 +2,36 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=ganv
-pkgver=1.8.0
+pkgver=1.8.2
 pkgrel=1
 pkgdesc="An interactive Gtkmm canvas widget for graph-based interfaces"
-arch=('x86_64')
-url="https://drobilla.net/software/ganv/"
-license=('GPL3')
-depends=('atkmm' 'cairo' 'gcc-libs' 'glibc' 'glibmm' 'graphviz' 'gtkmm'
-'pangomm')
-makedepends=('atk' 'fontconfig' 'gdk-pixbuf2' 'glib2' 'gtk2' 'harfbuzz' 'pango'
-'waf')
-provides=('libganv-1.so')
-source=("https://download.drobilla.net/ganv-$pkgver.tar.bz2"{,.asc})
-sha512sums=('00969879592af11d211ad790b970a8a3765ec0591515af856230e3fc9371b1611f2a4edc73d1fc59371a4c4a49c7479f279dc6f298d843296e6707cd2d495af4'
+arch=(x86_64)
+url="https://drobilla.net/software/ganv.html"
+license=(GPL3)
+depends=(cairo gcc-libs glibc graphviz)
+makedepends=(glib2 gobject-introspection gtk2 gtkmm harfbuzz libsigc++ meson pango)
+provides=(libganv-1.so)
+source=(https://download.drobilla.net/ganv-$pkgver.tar.xz{,.sig})
+sha512sums=('12544d45fc3b06a02dcfaf41be266770a8dcbd079979b07cb1a05388e3cdddd54040b609f76c16c8982d89f864e5000d04fd2d09d8036705a41cafe944c2a6dd'
             'SKIP')
-b2sums=('4936b7f87fa7cf17ed86b8165558684f0f59387c9673144d57d8505e41f367735117e9f5b08508dcecb831b77b6bbc6559323417824a9f8defc43c81cc91d469'
+b2sums=('45e5370f3b94a7010f89943225748e40291583f7d2cc80f637f3db4fac3a03c9b58217bd8e8119f7867302c43846be47e928721addce68560c63cec5faa3b4d4'
         'SKIP')
 validpgpkeys=('907D226E7E13FA337F014A083672782A9BF368F3') # David Robillard <d@drobilla.net>
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  # copy custom waf scripts in place
-  mkdir -pv tools
-  cp -av waflib/extras/autowaf.py tools/
-  touch __init__.py
-  # remove vendored waf
-  rm -rv waflib
-  # modify wscript to use current scripts
-  sed -e 's/waflib.extras/tools/' \
-      -e "s/load('autowaf'/load('autowaf', tooldir='tools'/" \
-      -i wscript
+build() {
+  # NOTE: something probably provides intl, but we don't have it, so disable natural language support
+  arch-meson $pkgname-$pkgver build -D nls=disabled
+  meson compile -C build
 }
 
-build() {
-  cd "${pkgname}-${pkgver}"
-  waf configure --prefix=/usr
-  waf build -v
+check() {
+  meson test -C build
 }
 
 package() {
-  depends+=('libatk-1.0.so' 'libfontconfig.so' 'libfreetype.so'
-  'libgdk_pixbuf-2.0.so' 'libgdk-x11-2.0.so' 'libgio-2.0.so' 'libglib-2.0.so'
-  'libgobject-2.0.so' 'libgtk-x11-2.0.so' 'libharfbuzz.so'
-  'libpangocairo-1.0.so' 'libpangoft2-1.0.so' 'libpango-1.0.so')
-  cd "${pkgname}-${pkgver}"
-  waf install -v --destdir="${pkgdir}"
-  install -vDm 644 {AUTHORS,NEWS,README.md} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}/"
+  depends+=(libgdk-x11-2.0.so libglib-2.0.so libgobject-2.0.so
+  libgtk-x11-2.0.so libpangocairo-1.0.so libpango-1.0.so libsigc-2.0.so)
+
+  meson install -C build --destdir "$pkgdir"
+  install -vDm 644 $pkgname-$pkgver/{AUTHORS,NEWS,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
 }