[arch-commits] Commit in gtypist/trunk (PKGBUILD ncurses.patch)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Mon Jun 10 09:41:53 UTC 2013
Date: Monday, June 10, 2013 @ 11:41:53
Author: spupykin
Revision: 92634
upgpkg: gtypist 2.9.3-1
upd
Modified:
gtypist/trunk/PKGBUILD
gtypist/trunk/ncurses.patch
---------------+
PKGBUILD | 7 ++--
ncurses.patch | 96 ++++++++++++++++++--------------------------------------
2 files changed, 35 insertions(+), 68 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-10 09:13:55 UTC (rev 92633)
+++ PKGBUILD 2013-06-10 09:41:53 UTC (rev 92634)
@@ -4,7 +4,7 @@
# Contributor: Mike Douglas <code_monkey at gooeylinux.org>
pkgname=gtypist
-pkgver=2.9.2
+pkgver=2.9.3
pkgrel=1
pkgdesc="universal typing tutor"
arch=('i686' 'x86_64')
@@ -15,12 +15,13 @@
install=gtypist.install
source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
ncurses.patch)
-md5sums=('e6f5ce16d3bdb335f7c698957bc54526'
- 'ba5e990d948ba5019391094dac890aa6')
+md5sums=('e26c29be0adf345604a802be81712bee'
+ 'e37a2e8fe90c6c0c684c1a12d016ee03')
build() {
cd $srcdir/$pkgname-$pkgver
patch -p1 <$srcdir/ncurses.patch
+ autoreconf
./configure --prefix=/usr
make
}
Modified: ncurses.patch
===================================================================
--- ncurses.patch 2013-06-10 09:13:55 UTC (rev 92633)
+++ ncurses.patch 2013-06-10 09:41:53 UTC (rev 92634)
@@ -1,63 +1,29 @@
-diff -wbBur gtypist-2.9.1/configure gtypist-2.9.1.my/configure
---- gtypist-2.9.1/configure 2011-11-29 00:14:11.000000000 +0400
-+++ gtypist-2.9.1.my/configure 2011-11-29 13:03:51.000000000 +0400
-@@ -4011,13 +4011,13 @@
- ALL_LINGUAS="cs de es eu fi fr nl pl ru tr zh_CN zh_TW"
+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 @@
+ 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])
- # Checks for libraries.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_wch in -lncursesw" >&5
--$as_echo_n "checking for add_wch in -lncursesw... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_wch in -lncurses" >&5
-+$as_echo_n "checking for add_wch in -lncurses... " >&6; }
- if ${ac_cv_lib_ncursesw_add_wch+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lncursesw $LIBS"
-+LIBS="-lncurses $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-# check for libncursesw
++# check for libncurses
-@@ -4464,7 +4464,7 @@
- done
-
-
--ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
-+ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
- if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then :
- HAVE_NCURSESW_H=1
- fi
-@@ -4473,7 +4473,7 @@
-
- # sanity check for libncursesw:
+-AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1)
+-AC_CHECK_LIB(ncursesw, add_wch, HAVE_LIBNCURSESW=1)
++AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1)
++AC_CHECK_LIB(ncurses, add_wch, HAVE_LIBNCURSESW=1)
if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW"; then
- LIBS="-lncursesw $LIBS"
+ LIBS="-lncurses $LIBS"
else
- echo -e "Error: both library and header files for the ncursesw library\n"\
+- 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"\
-diff -wbBur gtypist-2.9.1/configure.ac gtypist-2.9.1.my/configure.ac
---- gtypist-2.9.1/configure.ac 2011-11-21 03:27:02.000000000 +0400
-+++ gtypist-2.9.1.my/configure.ac 2011-11-29 13:02:53.000000000 +0400
-@@ -21,13 +21,13 @@
- ALL_LINGUAS="cs de es eu fi fr nl pl ru tr zh_CN zh_TW"
-
- # Checks for libraries.
--AC_CHECK_LIB(ncursesw, add_wch, HAVE_LIBNCURSESW=1)
-+AC_CHECK_LIB(ncurses, add_wch, HAVE_LIBNCURSESW=1)
-
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([unistd.h alloca.h argz.h errno.h fcntl.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h])
-
--AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1)
-+AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1)
-
- # sanity check for libncursesw:
- if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW"; then
-diff -wbBur gtypist-2.9.1/src/cursmenu.c gtypist-2.9.1.my/src/cursmenu.c
---- gtypist-2.9.1/src/cursmenu.c 2011-11-01 04:13:02.000000000 +0400
-+++ gtypist-2.9.1.my/src/cursmenu.c 2011-11-29 13:04:15.000000000 +0400
+ "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
@@ -24,7 +24,7 @@
#ifdef HAVE_PDCURSES
#include <curses.h>
@@ -67,9 +33,9 @@
#endif
#include "error.h"
-diff -wbBur gtypist-2.9.1/src/error.c gtypist-2.9.1.my/src/error.c
---- gtypist-2.9.1/src/error.c 2011-11-01 04:13:02.000000000 +0400
-+++ gtypist-2.9.1.my/src/error.c 2011-11-29 13:04:15.000000000 +0400
+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
@@ -25,7 +25,7 @@
#ifdef HAVE_PDCURSES
#include <curses.h>
@@ -79,9 +45,9 @@
#endif
#include <stdlib.h>
-diff -wbBur gtypist-2.9.1/src/gtypist.c gtypist-2.9.1.my/src/gtypist.c
---- gtypist-2.9.1/src/gtypist.c 2011-11-22 17:31:25.000000000 +0400
-+++ gtypist-2.9.1.my/src/gtypist.c 2011-11-29 13:04:15.000000000 +0400
+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
@@ -31,7 +31,7 @@
#ifdef HAVE_PDCURSES
#include <curses.h>
@@ -91,9 +57,9 @@
#endif
#include <time.h>
-diff -wbBur gtypist-2.9.1/src/script.c gtypist-2.9.1.my/src/script.c
---- gtypist-2.9.1/src/script.c 2011-11-28 19:39:48.000000000 +0400
-+++ gtypist-2.9.1.my/src/script.c 2011-11-29 13:04:15.000000000 +0400
+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
@@ -24,7 +24,7 @@
#ifdef HAVE_PDCURSES
#include <curses.h>
@@ -103,9 +69,9 @@
#endif
#include "error.h"
-diff -wbBur gtypist-2.9.1/src/utf8.c gtypist-2.9.1.my/src/utf8.c
---- gtypist-2.9.1/src/utf8.c 2011-11-28 19:39:19.000000000 +0400
-+++ gtypist-2.9.1.my/src/utf8.c 2011-11-29 13:04:15.000000000 +0400
+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
@@ -23,7 +23,7 @@
#ifdef HAVE_PDCURSES
#include <curses.h>
More information about the arch-commits
mailing list