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

2018-09-28 Thread Alexander Rødseth via arch-commits
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
===
--- PKGBUILD2018-09-28 10:37:39 UTC (rev 387161)
+++ PKGBUILD2018-09-28 10:41:51 UTC (rev 387162)
@@ -1,37 +1,39 @@
-# Maintainer: Alexander Rødseth 
+# Maintainer: Alexander F. Rødseth 
 # Contributor: Kevin Piche 
 # Contributor: Jason Chu 
 
 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:


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

2018-06-04 Thread Felix Yan via arch-commits
Date: Monday, June 4, 2018 @ 13:54:20
  Author: felixonmars
Revision: 340335

upgpkg: mahjong 1.14-2

BUILDINFO Rebuild

Modified:
  mahjong/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-04 13:50:57 UTC (rev 340334)
+++ PKGBUILD2018-06-04 13:54:20 UTC (rev 340335)
@@ -5,7 +5,7 @@
 
 pkgname=mahjong
 pkgver=1.14
-pkgrel=1
+pkgrel=2
 pkgdesc='The classical game of Mah Jong (not the solitare version) with 
network support'
 arch=('x86_64')
 url='http://mahjong.julianbradfield.org/'
@@ -13,7 +13,7 @@
 depends=('gtk2')
 makedepends=('gendesk' 'imagemagick')
 source=("http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz";)
-sha256sums=('976c9e0e11b78066cd74568992ff5382930711d7536bb11c9fa6877366c63dd6')
+sha512sums=('b4c631ce388041475b877cd4b413fda200932aea19212c00cb606d2ef0bb6a498fe12b7b52b04ef744b296c37c531bc44d9e35f9aed44edf89651580acde91e5')
 
 prepare() {
   gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \


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

2014-04-07 Thread Alexander Rødseth
Date: Monday, April 7, 2014 @ 22:57:58
  Author: arodseth
Revision: 108937

upgpkg: mahjong 1.14-1

Modified:
  mahjong/trunk/PKGBUILD

--+
 PKGBUILD |   36 ++--
 1 file changed, 26 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-07 20:19:48 UTC (rev 108936)
+++ PKGBUILD2014-04-07 20:57:58 UTC (rev 108937)
@@ -1,26 +1,42 @@
 # $Id$
-# Maintainer: Kevin Piche 
+# Maintainer: Alexander Rødseth 
+# Contributor: Kevin Piche 
 # Contributor: Jason Chu 
 
 pkgname=mahjong
-pkgver=1.12.1
+pkgver=1.14
 pkgrel=1
-pkgdesc="The classical game of Mah Jong (not the solitare version) with 
network support"
-arch=('i686' 'x86_64')
-url="http://www.stevens-bradfield.com/MahJong/";
+pkgdesc='The classical game of Mah Jong (not the solitare version) with 
network support'
+arch=('x86_64' 'i686')
+url='http://mahjong.julianbradfield.org/'
 license=('GPL' 'custom')
 depends=('gtk2')
-source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz)
-md5sums=('a74acae39d6a49bad9c34b84088f72f3')
+makedepends=('gendesk' 'imagemagick')
+source=("http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz";)
+sha256sums=('976c9e0e11b78066cd74568992ff5382930711d7536bb11c9fa6877366c63dd6')
 
+prepare() {
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
+--categories 'Application;Game' --exec xmj 
+  convert "mj-$pkgver-src/icon.ico" "$pkgname.png"
+}
+
 build() {
-  cd "$srcdir/mj-$pkgver-src"
+  cd "mj-$pkgver-src"
+
   sed -i 's/& Calling/Calling/' gui-dial.c
   make LDLIBS="-lm"
 }
 
 package() {
-  cd "$srcdir/mj-$pkgver-src"
+  cd "mj-$pkgver-src"
+
   make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man
-  install -D -m644 tiles-v1/README 
"$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
+  install -Dm644 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"
 }
+
+# vim:set ts=2 sw=2 et:



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

2012-05-27 Thread Eric Bélanger
Date: Monday, May 28, 2012 @ 01:15:54
  Author: eric
Revision: 160019

upgpkg: mahjong 1.12.1-1

Upstream update

Modified:
  mahjong/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-28 02:15:20 UTC (rev 160018)
+++ PKGBUILD2012-05-28 05:15:54 UTC (rev 160019)
@@ -3,7 +3,7 @@
 # Contributor: Jason Chu 
 
 pkgname=mahjong
-pkgver=1.11
+pkgver=1.12.1
 pkgrel=1
 pkgdesc="The classical game of Mah Jong (not the solitare version) with 
network support"
 arch=('i686' 'x86_64')
@@ -11,12 +11,12 @@
 license=('GPL' 'custom')
 depends=('gtk2')
 source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz)
-md5sums=('c0cd19620eb3fcef3e0a83eaed6c3780')
+md5sums=('a74acae39d6a49bad9c34b84088f72f3')
 
 build() {
   cd "$srcdir/mj-$pkgver-src"
   sed -i 's/& Calling/Calling/' gui-dial.c
-  make
+  make LDLIBS="-lm"
 }
 
 package() {



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

2011-09-04 Thread Eric Bélanger
Date: Sunday, September 4, 2011 @ 17:26:28
  Author: eric
Revision: 136994

upgpkg: mahjong 1.11-1

Upstream update, Improve description

Modified:
  mahjong/trunk/PKGBUILD

--+
 PKGBUILD |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-04 20:46:19 UTC (rev 136993)
+++ PKGBUILD2011-09-04 21:26:28 UTC (rev 136994)
@@ -3,20 +3,24 @@
 # Contributor: Jason Chu 
 
 pkgname=mahjong
-pkgver=1.10
+pkgver=1.11
 pkgrel=1
-pkgdesc="The classical game of Mah Jongg (not the solitare version).  Includes 
network play"
+pkgdesc="The classical game of Mah Jong (not the solitare version) with 
network support"
 arch=('i686' 'x86_64')
 url="http://www.stevens-bradfield.com/MahJong/";
 license=('GPL' 'custom')
 depends=('gtk2')
 source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz)
-md5sums=('f9bacf9fd6743d5e3a2fd86863607ce2')
+md5sums=('c0cd19620eb3fcef3e0a83eaed6c3780')
 
 build() {
-   cd $srcdir/mj-$pkgver-src
-   make || return 1
-   make DESTDIR=$pkgdir/usr/ MANDIR=share/man/man1 install install.man
-   install -m644 -D tiles-v1/README \
-   $pkgdir/usr/share/licenses/$pkgname/tiles-license.txt
+  cd "$srcdir/mj-$pkgver-src"
+  sed -i 's/& Calling/Calling/' gui-dial.c
+  make
 }
+
+package() {
+  cd "$srcdir/mj-$pkgver-src"
+  make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man
+  install -D -m644 tiles-v1/README 
"$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
+}