Date: Tuesday, August 12, 2014 @ 19:00:03
Author: spupykin
Revision: 117314
archrelease: copy trunk to community-i686, community-x86_64
Added:
gtypist/repos/community-i686/PKGBUILD
(from rev 117313, gtypist/trunk/PKGBUILD)
gtypist/repos/community-i686/gtypist.install
(from rev 117313, gtypist/trunk/gtypist.install)
gtypist/repos/community-i686/ncurses.patch
(from rev 117313, gtypist/trunk/ncurses.patch)
gtypist/repos/community-x86_64/PKGBUILD
(from rev 117313, gtypist/trunk/PKGBUILD)
gtypist/repos/community-x86_64/gtypist.install
(from rev 117313, gtypist/trunk/gtypist.install)
gtypist/repos/community-x86_64/ncurses.patch
(from rev 117313, gtypist/trunk/ncurses.patch)
Deleted:
gtypist/repos/community-i686/PKGBUILD
gtypist/repos/community-i686/gtypist.install
gtypist/repos/community-i686/ncurses.patch
gtypist/repos/community-x86_64/PKGBUILD
gtypist/repos/community-x86_64/gtypist.install
gtypist/repos/community-x86_64/ncurses.patch
----------------------------------+
/PKGBUILD | 74 +++++++++++++++
/gtypist.install | 36 +++++++
/ncurses.patch | 180 +++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 37 -------
community-i686/gtypist.install | 18 ---
community-i686/ncurses.patch | 90 ------------------
community-x86_64/PKGBUILD | 37 -------
community-x86_64/gtypist.install | 18 ---
community-x86_64/ncurses.patch | 90 ------------------
9 files changed, 290 insertions(+), 290 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-08-12 16:59:48 UTC (rev 117313)
+++ community-i686/PKGBUILD 2014-08-12 17:00:03 UTC (rev 117314)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Ben Mazer <b...@groknil.org>
-# Contributor: Mike Douglas <code_mon...@gooeylinux.org>
-
-pkgname=gtypist
-pkgver=2.9.4
-pkgrel=1
-pkgdesc="universal typing tutor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gtypist/gtypist.html";
-license=("GPL")
-depends=('ncurses' 'perl')
-makedepends=('emacs')
-install=gtypist.install
-source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
- ncurses.patch)
-md5sums=('1b6acd602996b86f8967ab7693b06ec8'
- 'a836141e70941b7e0d3477bc8ecdecdf')
-
-prepare() {
- cd $srcdir/$pkgname-$pkgver
- patch -p1 <$srcdir/ncurses.patch
- autoreconf
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr install
- rm -f $pkgdir/usr/share/info/dir
-}
Copied: gtypist/repos/community-i686/PKGBUILD (from rev 117313,
gtypist/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-08-12 17:00:03 UTC (rev 117314)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Ben Mazer <b...@groknil.org>
+# Contributor: Mike Douglas <code_mon...@gooeylinux.org>
+
+pkgname=gtypist
+pkgver=2.9.5
+pkgrel=1
+pkgdesc="universal typing tutor"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/gtypist/gtypist.html";
+license=("GPL")
+depends=('ncurses' 'perl')
+makedepends=('emacs')
+install=gtypist.install
+source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
+ ncurses.patch)
+md5sums=('6098c32890f2437384b5efe4e993fb32'
+ 'a836141e70941b7e0d3477bc8ecdecdf')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -p1 <$srcdir/ncurses.patch
+ autoreconf
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make prefix=$pkgdir/usr install
+ rm -f $pkgdir/usr/share/info/dir
+}
Deleted: community-i686/gtypist.install
===================================================================
--- community-i686/gtypist.install 2014-08-12 16:59:48 UTC (rev 117313)
+++ community-i686/gtypist.install 2014-08-12 17:00:03 UTC (rev 117314)
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(gtypist.info)
-
-post_install() {
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
Copied: gtypist/repos/community-i686/gtypist.install (from rev 117313,
gtypist/trunk/gtypist.install)
===================================================================
--- community-i686/gtypist.install (rev 0)
+++ community-i686/gtypist.install 2014-08-12 17:00:03 UTC (rev 117314)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(gtypist.info)
+
+post_install() {
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
Deleted: community-i686/ncurses.patch
===================================================================
--- community-i686/ncurses.patch 2014-08-12 16:59:48 UTC (rev 117313)
+++ community-i686/ncurses.patch 2014-08-12 17:00:03 UTC (rev 117314)
@@ -1,90 +0,0 @@
-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])
-
--# check for libncursesw
-+# check for libncurses
-
--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 ncurses library\n"\
- "are required to build this package. See INSTALL file for"\
- "further information. On Debian/Ubuntu you need to install
libncursesw5-dev."
- exit 1;
- 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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include "error.h"
-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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include <stdlib.h>
-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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include <time.h>
-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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include "error.h"
-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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include <stdlib.h>
Copied: gtypist/repos/community-i686/ncurses.patch (from rev 117313,
gtypist/trunk/ncurses.patch)
===================================================================
--- community-i686/ncurses.patch (rev 0)
+++ community-i686/ncurses.patch 2014-08-12 17:00:03 UTC (rev 117314)
@@ -0,0 +1,90 @@
+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])
+
+-# check for libncursesw
++# check for libncurses
+
+-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 ncurses library\n"\
+ "are required to build this package. See INSTALL file for"\
+ "further information. On Debian/Ubuntu you need to install
libncursesw5-dev."
+ exit 1;
+ 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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include "error.h"
+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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include <stdlib.h>
+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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include <time.h>
+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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include "error.h"
+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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include <stdlib.h>
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-08-12 16:59:48 UTC (rev 117313)
+++ community-x86_64/PKGBUILD 2014-08-12 17:00:03 UTC (rev 117314)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Ben Mazer <b...@groknil.org>
-# Contributor: Mike Douglas <code_mon...@gooeylinux.org>
-
-pkgname=gtypist
-pkgver=2.9.4
-pkgrel=1
-pkgdesc="universal typing tutor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gtypist/gtypist.html";
-license=("GPL")
-depends=('ncurses' 'perl')
-makedepends=('emacs')
-install=gtypist.install
-source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
- ncurses.patch)
-md5sums=('1b6acd602996b86f8967ab7693b06ec8'
- 'a836141e70941b7e0d3477bc8ecdecdf')
-
-prepare() {
- cd $srcdir/$pkgname-$pkgver
- patch -p1 <$srcdir/ncurses.patch
- autoreconf
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr install
- rm -f $pkgdir/usr/share/info/dir
-}
Copied: gtypist/repos/community-x86_64/PKGBUILD (from rev 117313,
gtypist/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-08-12 17:00:03 UTC (rev 117314)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Ben Mazer <b...@groknil.org>
+# Contributor: Mike Douglas <code_mon...@gooeylinux.org>
+
+pkgname=gtypist
+pkgver=2.9.5
+pkgrel=1
+pkgdesc="universal typing tutor"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/gtypist/gtypist.html";
+license=("GPL")
+depends=('ncurses' 'perl')
+makedepends=('emacs')
+install=gtypist.install
+source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
+ ncurses.patch)
+md5sums=('6098c32890f2437384b5efe4e993fb32'
+ 'a836141e70941b7e0d3477bc8ecdecdf')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -p1 <$srcdir/ncurses.patch
+ autoreconf
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make prefix=$pkgdir/usr install
+ rm -f $pkgdir/usr/share/info/dir
+}
Deleted: community-x86_64/gtypist.install
===================================================================
--- community-x86_64/gtypist.install 2014-08-12 16:59:48 UTC (rev 117313)
+++ community-x86_64/gtypist.install 2014-08-12 17:00:03 UTC (rev 117314)
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(gtypist.info)
-
-post_install() {
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
Copied: gtypist/repos/community-x86_64/gtypist.install (from rev 117313,
gtypist/trunk/gtypist.install)
===================================================================
--- community-x86_64/gtypist.install (rev 0)
+++ community-x86_64/gtypist.install 2014-08-12 17:00:03 UTC (rev 117314)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(gtypist.info)
+
+post_install() {
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
Deleted: community-x86_64/ncurses.patch
===================================================================
--- community-x86_64/ncurses.patch 2014-08-12 16:59:48 UTC (rev 117313)
+++ community-x86_64/ncurses.patch 2014-08-12 17:00:03 UTC (rev 117314)
@@ -1,90 +0,0 @@
-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])
-
--# check for libncursesw
-+# check for libncurses
-
--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 ncurses library\n"\
- "are required to build this package. See INSTALL file for"\
- "further information. On Debian/Ubuntu you need to install
libncursesw5-dev."
- exit 1;
- 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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include "error.h"
-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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include <stdlib.h>
-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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include <time.h>
-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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include "error.h"
-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>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include <stdlib.h>
Copied: gtypist/repos/community-x86_64/ncurses.patch (from rev 117313,
gtypist/trunk/ncurses.patch)
===================================================================
--- community-x86_64/ncurses.patch (rev 0)
+++ community-x86_64/ncurses.patch 2014-08-12 17:00:03 UTC (rev 117314)
@@ -0,0 +1,90 @@
+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])
+
+-# check for libncursesw
++# check for libncurses
+
+-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 ncurses library\n"\
+ "are required to build this package. See INSTALL file for"\
+ "further information. On Debian/Ubuntu you need to install
libncursesw5-dev."
+ exit 1;
+ 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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include "error.h"
+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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include <stdlib.h>
+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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include <time.h>
+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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include "error.h"
+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>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+
+ #include <stdlib.h>
