Tue Feb 4 03:33:07 UTC 2014

2 files changed, 37 insertions, 26 deletions

diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD
index 34bd4c7b5..bb6294870 100644
--- a/community/gtypist/PKGBUILD
+++ b/community/gtypist/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92635 2013-06-10 09:42:13Z spupykin $
+# $Id: PKGBUILD 105230 2014-02-03 09:21:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ben Mazer <blm@groknil.org>
 # Contributor: Mike Douglas <code_monkey@gooeylinux.org>
 
 pkgname=gtypist
-pkgver=2.9.3
+pkgver=2.9.4
 pkgrel=1
 pkgdesc="universal typing tutor"
 arch=('i686' 'x86_64')
@@ -15,13 +15,17 @@ makedepends=('emacs')
 install=gtypist.install
 source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
 	ncurses.patch)
-md5sums=('e26c29be0adf345604a802be81712bee'
-         'e37a2e8fe90c6c0c684c1a12d016ee03')
+md5sums=('1b6acd602996b86f8967ab7693b06ec8'
+         'a836141e70941b7e0d3477bc8ecdecdf')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/ncurses.patch
   autoreconf
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
diff --git a/community/gtypist/ncurses.patch b/community/gtypist/ncurses.patch
index 9fa484ffd..a1c144562 100644
--- a/community/gtypist/ncurses.patch
+++ b/community/gtypist/ncurses.patch
@@ -1,7 +1,7 @@
-diff -wbBur gtypist-2.9.3/configure.ac gtypist-2.9.3.q/configure.ac
---- gtypist-2.9.3/configure.ac	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/configure.ac	2013-06-10 13:32:54.284038071 +0400
-@@ -44,14 +44,14 @@
+diff -wbBur gtypist-2.9.4/configure.ac gtypist-2.9.4.my/configure.ac
+--- gtypist-2.9.4/configure.ac	2014-02-02 15:38:40.000000000 +0400
++++ gtypist-2.9.4.my/configure.ac	2014-02-03 13:08:53.085983684 +0400
+@@ -44,20 +44,20 @@
  AC_FUNC_STRTOD
  AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify dcgettext getcwd getwd mempcpy memset munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strstr strtoul])
  
@@ -18,12 +18,19 @@ diff -wbBur gtypist-2.9.3/configure.ac gtypist-2.9.3.q/configure.ac
  else
 -   echo -e "Error:  both library and header files for the ncursesw library\n"\
 +   echo -e "Error:  both library and header files for the ncurses library\n"\
-    	"are required to build this package.  See INSTALL file for"\
- 	"further information. On Debian/Ubuntu you need to install libncursesw5-dev."
+        "are required to build this package.  See INSTALL file for"\
+        "further information. On Debian/Ubuntu you need to install libncursesw5-dev."
     exit 1;
-diff -wbBur gtypist-2.9.3/src/cursmenu.c gtypist-2.9.3.q/src/cursmenu.c
---- gtypist-2.9.3/src/cursmenu.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/cursmenu.c	2013-06-10 13:33:16.610704480 +0400
+ fi
+ AC_SEARCH_LIBS(cbreak, tinfo, [],
+-  [AC_MSG_ERROR([Can't find cbreak() in -lncursesw or -ltinfo])])
++  [AC_MSG_ERROR([Can't find cbreak() in -lncurses or -ltinfo])])
+ 
+ 
+ # iconv
+diff -wbBur gtypist-2.9.4/src/cursmenu.c gtypist-2.9.4.my/src/cursmenu.c
+--- gtypist-2.9.4/src/cursmenu.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/cursmenu.c	2014-02-03 13:09:04.669316878 +0400
 @@ -24,7 +24,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -33,9 +40,9 @@ diff -wbBur gtypist-2.9.3/src/cursmenu.c gtypist-2.9.3.q/src/cursmenu.c
  #endif
  
  #include "error.h"
-diff -wbBur gtypist-2.9.3/src/error.c gtypist-2.9.3.q/src/error.c
---- gtypist-2.9.3/src/error.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/error.c	2013-06-10 13:33:26.124037704 +0400
+diff -wbBur gtypist-2.9.4/src/error.c gtypist-2.9.4.my/src/error.c
+--- gtypist-2.9.4/src/error.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/error.c	2014-02-03 13:09:04.669316878 +0400
 @@ -25,7 +25,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -45,9 +52,9 @@ diff -wbBur gtypist-2.9.3/src/error.c gtypist-2.9.3.q/src/error.c
  #endif
  
  #include <stdlib.h>
-diff -wbBur gtypist-2.9.3/src/gtypist.c gtypist-2.9.3.q/src/gtypist.c
---- gtypist-2.9.3/src/gtypist.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/gtypist.c	2013-06-10 13:33:18.844037788 +0400
+diff -wbBur gtypist-2.9.4/src/gtypist.c gtypist-2.9.4.my/src/gtypist.c
+--- gtypist-2.9.4/src/gtypist.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/gtypist.c	2014-02-03 13:09:04.669316878 +0400
 @@ -31,7 +31,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -57,9 +64,9 @@ diff -wbBur gtypist-2.9.3/src/gtypist.c gtypist-2.9.3.q/src/gtypist.c
  #endif
  
  #include <time.h>
-diff -wbBur gtypist-2.9.3/src/script.c gtypist-2.9.3.q/src/script.c
---- gtypist-2.9.3/src/script.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/script.c	2013-06-10 13:33:21.067371095 +0400
+diff -wbBur gtypist-2.9.4/src/script.c gtypist-2.9.4.my/src/script.c
+--- gtypist-2.9.4/src/script.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/script.c	2014-02-03 13:09:04.669316878 +0400
 @@ -24,7 +24,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -69,9 +76,9 @@ diff -wbBur gtypist-2.9.3/src/script.c gtypist-2.9.3.q/src/script.c
  #endif
  
  #include "error.h"
-diff -wbBur gtypist-2.9.3/src/utf8.c gtypist-2.9.3.q/src/utf8.c
---- gtypist-2.9.3/src/utf8.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/utf8.c	2013-06-10 13:33:23.604037733 +0400
+diff -wbBur gtypist-2.9.4/src/utf8.c gtypist-2.9.4.my/src/utf8.c
+--- gtypist-2.9.4/src/utf8.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/utf8.c	2014-02-03 13:09:04.669316878 +0400
 @@ -23,7 +23,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>