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

[Alexander Rødseth]

    Date: Friday, September 28, 2018 @ 10:41:51
  Author: arodseth
Revision: 387162

upgpkg: mahjong 1.14-3

Modified:
  mahjong/trunk/PKGBUILD

----------+
 PKGBUILD |   36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-28 10:37:39 UTC (rev 387161)
+++ PKGBUILD	2018-09-28 10:41:51 UTC (rev 387162)
@@ -1,37 +1,39 @@
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
 # Contributor: Kevin Piche <kevin at archlinux.org>
 # Contributor: Jason Chu <jchu at xentac.net>
 
 pkgname=mahjong
 pkgver=1.14
-pkgrel=2
-pkgdesc='The classical game of Mah Jong (not the solitare version) with network support'
+pkgrel=3
+pkgdesc='The classical game of Mah Jong (multiplayer)'
 arch=('x86_64')
 url='http://mahjong.julianbradfield.org/'
 license=('GPL' 'custom')
 depends=('gtk2')
-makedepends=('gendesk' 'imagemagick')
+makedepends=('gendesk' 'imagemagick' 'setconf')
 source=("http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz")
-sha512sums=('b4c631ce388041475b877cd4b413fda200932aea19212c00cb606d2ef0bb6a498fe12b7b52b04ef744b296c37c531bc44d9e35f9aed44edf89651580acde91e5')
+sha256sums=('976c9e0e11b78066cd74568992ff5382930711d7536bb11c9fa6877366c63dd6')
 
 prepare() {
-  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
-    --categories 'Application;Game' --exec xmj 
-  convert "mj-$pkgver-src/icon.ico" "$pkgname.png"
+  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"
 }
 
 build() {
-  cd "mj-$pkgver-src"
-
-  sed -i 's/& Calling/Calling/' gui-dial.c
-  make LDLIBS="-lm"
+  make -C "mj-$pkgver-src" LDLIBS="-lm"
 }
 
 package() {
-  cd "mj-$pkgver-src"
-
-  make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man
-  install -Dm644 tiles-v1/README "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
+  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" \
@@ -38,4 +40,4 @@
     "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et: