pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc se ncurses is_keypad function rather than directly loo...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bfab998e0761
branches: trunk
changeset: 356637:bfab998e0761
user: roy <roy%pkgsrc.org@localhost>
date: Mon Jan 02 20:52:46 2017 +0000
description:
se ncurses is_keypad function rather than directly looking at the
WINDOW structure.
Include <term.h> when needed and rename lines and columns vars to avoid
conflicts.
Builds and works with NetBSD-8 curses, so use mk/curses.buildlink3.mk
and test for getsyx(3) in curses rather than indescriminately linking
to ncurses.
diffstat:
devel/py-curses/Makefile | 16 +-
lang/python27/distinfo | 4 +-
lang/python27/patches/patch-ah | 113 ++++++++++++++-
lang/python34/distinfo | 4 +-
lang/python34/patches/patch-ah | 136 +++++++++++++++++-
lang/python35/distinfo | 4 +-
lang/python35/patches/patch-Modules___cursesmodule.c | 135 +++++++++++++++++-
7 files changed, 367 insertions(+), 45 deletions(-)
diffs (truncated from 649 to 300 lines):
diff -r 5c01b18a2899 -r bfab998e0761 devel/py-curses/Makefile
--- a/devel/py-curses/Makefile Mon Jan 02 19:31:47 2017 +0000
+++ b/devel/py-curses/Makefile Mon Jan 02 20:52:46 2017 +0000
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.42 2015/08/18 07:31:05 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2017/01/02 20:52:47 roy Exp $
PKGNAME= ${PYPKGPREFIX}-curses-${PY_DISTVERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel python
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.python.org/doc/current/lib/module-curses.html
COMMENT= Curses module for Python
-USE_NCURSES= yes
-# needs: filter getsyx getwin has_key immedok mvwinsnstr mvwinsstr ...
-# noqiflush pechochar putp putwin qiflush redrawwin setsyx syncok termattrs
-# termname tigetflag tigetnum tigetstr tparm typeahead use_env wcursyncup
-# wechochar winsnstr winsstr wredrawln wsyncdown wsyncup
EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_cursesmodule.c
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
+# NetBSD-8 curses has enough support for py-curses
+USE_CURSES= getsyx
+# But we build as ncurses still to get the full feature set easily
+FAKE_NCURSES= yes
+
PY_SETUP_SUBST= NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload
@@ -30,5 +30,5 @@
.include "../../lang/python/extension.mk"
.include "../../lang/python/srcdist.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5c01b18a2899 -r bfab998e0761 lang/python27/distinfo
--- a/lang/python27/distinfo Mon Jan 02 19:31:47 2017 +0000
+++ b/lang/python27/distinfo Mon Jan 02 20:52:46 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2016/12/30 10:53:21 adam Exp $
+$NetBSD: distinfo,v 1.60 2017/01/02 20:52:46 roy Exp $
SHA1 (Python-2.7.13.tar.xz) = 18a8f30a0356c751b8d0ea6f76e764cab13ee046
RMD160 (Python-2.7.13.tar.xz) = be09518cdc335314de1c5ebe181690082ce780d7
@@ -18,7 +18,7 @@
SHA1 (patch-ab) = ea4feba4e93dbcff07050c82a00d591bb650e934
SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
-SHA1 (patch-ah) = 90b19239d8a7c8abc3bbc05d49408a2c5da6174d
+SHA1 (patch-ah) = f6e7ad94501bfee30dc7bb8336dbb4284e5ee84e
SHA1 (patch-al) = 541936b79f281db06761f4fa6a65a04e852b02b4
SHA1 (patch-am) = cf82bd1996aea8a8536bd37a74563bb85817c968
SHA1 (patch-an) = 9aad78714c4fe1a21cf66a6627d97d164ecea196
diff -r 5c01b18a2899 -r bfab998e0761 lang/python27/patches/patch-ah
--- a/lang/python27/patches/patch-ah Mon Jan 02 19:31:47 2017 +0000
+++ b/lang/python27/patches/patch-ah Mon Jan 02 20:52:46 2017 +0000
@@ -1,8 +1,24 @@
-$NetBSD: patch-ah,v 1.4 2015/04/24 03:01:36 rodent Exp $
+$NetBSD: patch-ah,v 1.5 2017/01/02 20:52:46 roy Exp $
+
+Allow py-curses to use NetBSD curses as well as ncurses
+http://bugs.python.org/issue21457
---- Modules/_cursesmodule.c.orig 2014-12-10 15:59:53.000000000 +0000
+--- Modules/_cursesmodule.c.orig 2016-06-25 21:49:31.000000000 +0000
+++ Modules/_cursesmodule.c
-@@ -322,17 +322,9 @@ Window_NoArg2TupleReturnFunction(getpary
+@@ -117,9 +117,10 @@ char *PyCursesVersion = "2.2";
+ #defines many common symbols (such as "lines") which breaks the
+ curses module in other ways. So the code will just specify
+ explicit prototypes here. */
+-extern int setupterm(char *,int,int *);
+-#ifdef __sgi
++#if defined(__NetBSD__) || defined(__sgi)
+ #include <term.h>
++#else
++extern int setupterm(char *, int, int *);
+ #endif
+
+ #if !defined(HAVE_NCURSES_H) && (defined(sgi) || defined(__sun) || defined(SCO5))
+@@ -322,17 +323,9 @@ Window_NoArg2TupleReturnFunction(getpary
Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
@@ -20,7 +36,43 @@
Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-@@ -2110,7 +2102,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
+@@ -807,7 +800,7 @@ PyCursesWindow_EchoChar(PyCursesWindowOb
+ }
+
+ #ifdef WINDOW_HAS_FLAGS
+- if (self->win->_flags & _ISPAD)
++ if (is_keypad(self->win))
+ return PyCursesCheckERR(pechochar(self->win, ch | attr),
+ "echochar");
+ else
+@@ -1237,7 +1230,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWind
+ #ifndef WINDOW_HAS_FLAGS
+ if (0)
+ #else
+- if (self->win->_flags & _ISPAD)
++ if (is_keypad(self->win))
+ #endif
+ {
+ switch(PyTuple_Size(args)) {
+@@ -1380,7 +1373,7 @@ PyCursesWindow_Refresh(PyCursesWindowObj
+ #ifndef WINDOW_HAS_FLAGS
+ if (0)
+ #else
+- if (self->win->_flags & _ISPAD)
++ if (is_keypad(self->win))
+ #endif
+ {
+ switch(PyTuple_Size(args)) {
+@@ -1447,7 +1440,7 @@ PyCursesWindow_SubWin(PyCursesWindowObje
+
+ /* printf("Subwin: %i %i %i %i \n", nlines, ncols, begin_y, begin_x); */
+ #ifdef WINDOW_HAS_FLAGS
+- if (self->win->_flags & _ISPAD)
++ if (is_keypad(self->win))
+ win = subpad(self->win, nlines, ncols, begin_y, begin_x);
+ else
+ #endif
+@@ -2110,7 +2103,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
}
#endif /* HAVE_CURSES_IS_TERM_RESIZED */
@@ -28,7 +80,7 @@
static PyObject *
PyCurses_KeyName(PyObject *self, PyObject *args)
{
-@@ -2129,7 +2120,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
+@@ -2129,7 +2121,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
return PyString_FromString((knp == NULL) ? "" : (char *)knp);
}
@@ -36,7 +88,50 @@
static PyObject *
PyCurses_KillChar(PyObject *self)
-@@ -2674,9 +2664,7 @@ static PyMethodDef PyCurses_methods[] =
+@@ -2383,16 +2374,16 @@ update_lines_cols(void)
+ static PyObject *
+ PyCurses_ResizeTerm(PyObject *self, PyObject *args)
+ {
+- int lines;
+- int columns;
++ int nlines;
++ int ncolumns;
+ PyObject *result;
+
+ PyCursesInitialised;
+
+- if (!PyArg_ParseTuple(args,"ii:resizeterm", &lines, &columns))
++ if (!PyArg_ParseTuple(args,"ii:resizeterm", &nlines, &ncolumns))
+ return NULL;
+
+- result = PyCursesCheckERR(resizeterm(lines, columns), "resizeterm");
++ result = PyCursesCheckERR(resizeterm(nlines, ncolumns), "resizeterm");
+ if (!result)
+ return NULL;
+ if (!update_lines_cols())
+@@ -2406,17 +2397,17 @@ PyCurses_ResizeTerm(PyObject *self, PyOb
+ static PyObject *
+ PyCurses_Resize_Term(PyObject *self, PyObject *args)
+ {
+- int lines;
+- int columns;
++ int nlines;
++ int ncolumns;
+
+ PyObject *result;
+
+ PyCursesInitialised;
+
+- if (!PyArg_ParseTuple(args,"ii:resize_term", &lines, &columns))
++ if (!PyArg_ParseTuple(args,"ii:resize_term", &nline, &ncolumns))
+ return NULL;
+
+- result = PyCursesCheckERR(resize_term(lines, columns), "resize_term");
++ result = PyCursesCheckERR(resize_term(nlines, ncolumns), "resize_term");
+ if (!result)
+ return NULL;
+ if (!update_lines_cols())
+@@ -2674,9 +2665,7 @@ static PyMethodDef PyCurses_methods[] =
#ifdef HAVE_CURSES_IS_TERM_RESIZED
{"is_term_resized", (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
#endif
@@ -46,7 +141,7 @@
{"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
{"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
{"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2785,9 +2773,7 @@ init_curses(void)
+@@ -2785,9 +2774,7 @@ init_curses(void)
SetDictInt("A_DIM", A_DIM);
SetDictInt("A_BOLD", A_BOLD);
SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
@@ -56,7 +151,7 @@
SetDictInt("A_PROTECT", A_PROTECT);
SetDictInt("A_CHARTEXT", A_CHARTEXT);
SetDictInt("A_COLOR", A_COLOR);
-@@ -2859,7 +2845,6 @@ init_curses(void)
+@@ -2859,7 +2846,6 @@ init_curses(void)
int key;
char *key_n;
char *key_n2;
@@ -64,7 +159,7 @@
for (key=KEY_MIN;key < KEY_MAX; key++) {
key_n = (char *)keyname(key);
if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2887,7 +2872,6 @@ init_curses(void)
+@@ -2887,7 +2873,6 @@ init_curses(void)
if (key_n2 != key_n)
free(key_n2);
}
diff -r 5c01b18a2899 -r bfab998e0761 lang/python34/distinfo
--- a/lang/python34/distinfo Mon Jan 02 19:31:47 2017 +0000
+++ b/lang/python34/distinfo Mon Jan 02 20:52:46 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2016/07/02 15:23:33 adam Exp $
+$NetBSD: distinfo,v 1.22 2017/01/02 20:52:46 roy Exp $
SHA1 (Python-3.4.5.tar.xz) = 882e83e0286b253ee651aa3f9a5d27ebc46e6632
RMD160 (Python-3.4.5.tar.xz) = 47604be01f37671a16c17e27316af327a1048fd6
@@ -6,7 +6,7 @@
Size (Python-3.4.5.tar.xz) = 14516820 bytes
SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57
SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d
-SHA1 (patch-ah) = 1c4eec742ab26f77c6326b7d12e44e26be493c0f
+SHA1 (patch-ah) = f5e6ee512df69b6f0718c8d303e5b8ede39357ed
SHA1 (patch-al) = 7239d10b67c739c3ee33dd2fc95bb770360d152f
SHA1 (patch-am) = 1752a06fec7626af57e85b6cbd9b6cc38b99272f
SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
diff -r 5c01b18a2899 -r bfab998e0761 lang/python34/patches/patch-ah
--- a/lang/python34/patches/patch-ah Mon Jan 02 19:31:47 2017 +0000
+++ b/lang/python34/patches/patch-ah Mon Jan 02 20:52:46 2017 +0000
@@ -1,11 +1,26 @@
-$NetBSD: patch-ah,v 1.3 2014/10/09 09:15:38 adam Exp $
+$NetBSD: patch-ah,v 1.4 2017/01/02 20:52:46 roy Exp $
-Ncurses will be used by devel/py-curses and devel/py-cursespanel.
+Allow py-curses to use NetBSD curses as well as ncurses
http://bugs.python.org/issue21457
---- Modules/_cursesmodule.c.orig 2014-05-04 20:59:51.000000000 +0000
+--- Modules/_cursesmodule.c.orig 2016-06-25 21:52:32.000000000 +0000
+++ Modules/_cursesmodule.c
-@@ -484,17 +484,9 @@ Window_NoArg2TupleReturnFunction(getpary
+@@ -112,14 +112,7 @@ char *PyCursesVersion = "2.2";
+ #define CURSES_MODULE
+ #include "py_curses.h"
+
+-/* These prototypes are in <term.h>, but including this header
+- #defines many common symbols (such as "lines") which breaks the
+- curses module in other ways. So the code will just specify
+- explicit prototypes here. */
+-extern int setupterm(char *,int,int *);
+-#ifdef __sgi
+ #include <term.h>
+-#endif
+
+ #ifdef HAVE_LANGINFO_H
+ #include <langinfo.h>
+@@ -484,17 +477,9 @@ Window_NoArg2TupleReturnFunction(getpary
Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
@@ -23,7 +38,16 @@
Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-@@ -1219,11 +1211,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
+@@ -1133,7 +1118,7 @@ PyCursesWindow_EchoChar(PyCursesWindowOb
+ return NULL;
+
+ #ifdef WINDOW_HAS_FLAGS
+- if (self->win->_flags & _ISPAD)
++ if (is_keypad(self->win))
+ return PyCursesCheckERR(pechochar(self->win, ch | attr),
+ "echochar");
+ else
+@@ -1219,11 +1204,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
return Py_BuildValue("C", rtn);
} else {
const char *knp;
@@ -35,7 +59,54 @@
return PyUnicode_FromString((knp == NULL) ? "" : knp);
}
}
-@@ -2658,7 +2646,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
+@@ -1656,7 +1637,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWind
+ #ifndef WINDOW_HAS_FLAGS
+ if (0)
Home |
Main Index |
Thread Index |
Old Index