autu: Update to 1.16-1

2 files changed, 37 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a641f7293c87..30c37079d2d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Oct 20 23:30:40 UTC 2019
+# Sun Jun  7 22:53:20 UTC 2020
 pkgbase = mahjong
 	pkgdesc = The classical game of Mah Jong (multiplayer)
-	pkgver = 1.15
+	pkgver = 1.16
 	pkgrel = 1
 	url = http://mahjong.julianbradfield.org/
 	arch = x86_64
@@ -12,9 +12,17 @@ pkgbase = mahjong
 	makedepends = imagemagick
 	makedepends = setconf
 	depends = gtk2
-	source = http://mahjong.julianbradfield.org/Source/mj-1.15-src.tar.gz
-	md5sums = 52eb521f5276a4057e0e44f84d3b27e4
-	sha256sums = d115a1769b41a32cced0b236e4dbca9d9b0f30827032b507a18216896ef6da92
+	depends = pango
+	depends = atk
+	depends = cairo
+	depends = gdk-pixbuf2
+	depends = glib2
+	depends = harfbuzz
+	depends = fontconfig
+	depends = freetype2
+	source = http://mahjong.julianbradfield.org/Source/mj-1.16-src.tar.gz
+	md5sums = 0b10ae8a20f16b31eedb5d20e11473a5
+	sha256sums = c25e9848f49f70635e5e3ba0cb59799e5bc149a95f786621b99696b66787a29d
 
 pkgname = mahjong
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d091c35eb53..668f5cb72507 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,43 +3,41 @@
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
-pkgname=mahjong
-pkgver=1.15
-pkgrel=1
+set -u
+pkgname='mahjong'
+pkgver='1.16'
+pkgrel='1'
 pkgdesc='The classical game of Mah Jong (multiplayer)'
 arch=('x86_64')
 url='http://mahjong.julianbradfield.org/'
 license=('GPL' 'custom')
-depends=('gtk2')
+depends=('gtk2' 'pango' 'atk' 'cairo' 'gdk-pixbuf2' 'glib2' 'harfbuzz' 'fontconfig' 'freetype2')
 makedepends=('gendesk' 'imagemagick' 'setconf')
-source=("http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz")
-md5sums=('52eb521f5276a4057e0e44f84d3b27e4')
-sha256sums=('d115a1769b41a32cced0b236e4dbca9d9b0f30827032b507a18216896ef6da92')
+source=("http://mahjong.julianbradfield.org/Source/mj-${pkgver}-src.tar.gz")
+md5sums=('0b10ae8a20f16b31eedb5d20e11473a5')
+sha256sums=('c25e9848f49f70635e5e3ba0cb59799e5bc149a95f786621b99696b66787a29d')
 
 prepare() {
-  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
-    --categories 'Application;Game' --exec xmj
-  convert +set date:create +set date:modify \
-    "mj-$pkgver-src/icon.ico" "$pkgname.png"
-  sed -i 's/& Calling/Calling/' "mj-$pkgver-src/gui-dial.c"
-  setconf "mj-$pkgver-src/Makefile" \
-    CFLAGS="$CFLAGS $(pkg-config gtk+-2.0 --cflags) \
-    -DTILESET=NULL -DTILESETPATH=NULL -DGTK2=1 -w"
+  set -u
+  gendesk -f -n --pkgname "${pkgname}" --pkgdesc "$pkgdesc" --categories 'Application;Game' --exec 'xmj'
+  convert +set 'date:create' +set 'date:modify' "mj-${pkgver}-src/icon.ico" "${pkgname}.png"
+  sed -e 's/& Calling/Calling/' -i "mj-${pkgver}-src/gui-dial.c"
+  setconf "mj-${pkgver}-src/Makefile" CFLAGS="$CFLAGS $(pkg-config gtk+-2.0 --cflags) -DTILESET=NULL -DTILESETPATH=NULL -DGTK2=1 -w"
+  set +u
 }
 
 build() {
-  make -C "mj-$pkgver-src" LDLIBS="-lm"
+  set -u
+  make -C "mj-${pkgver}-src" LDLIBS='-lm'
+  set +u
 }
 
 package() {
-  make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 \
-    -C "mj-$pkgver-src" install install.man
-  install -Dm644 "mj-$pkgver-src/tiles-v1/README" \
-    "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  set -u
+  make DESTDIR="${pkgdir}/usr/" MANDIR='share/man/man1' -C "mj-${pkgver}-src" install 'install.man'
+  install -Dpm644 "mj-${pkgver}-src/tiles-v1/README" "${pkgdir}/usr/share/licenses/${pkgname}/tiles-license.txt"
+  install -Dpm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
+  install -Dpm644 "${srcdir}/${pkgname}.png" -t "${pkgdir}/usr/share/pixmaps/"
+  set +u
 }
-
-# vim: ts=2 sw=2 et:
+set +u