lang/python26/patches/patch-ah

   1 $NetBSD: patch-ah,v 1.2 2010/05/02 14:09:11 wiz Exp $
   2
   3 --- Modules/_cursesmodule.c.orig        2010-08-05 16:35:53.000000000 +0000
   4 +++ Modules/_cursesmodule.c
   5 @@ -317,17 +317,9 @@ Window_NoArg2TupleReturnFunction(getpary
   6
   7  Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
   8  Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
   9 -#if defined(__NetBSD__)
  10 -Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
  11 -#else
  12  Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
  13 -#endif
  14  Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
  15 -#if defined(__NetBSD__)
  16 -Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
  17 -#else
  18  Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
  19 -#endif
  20  Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
  21  Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
  22  Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
  23 @@ -886,11 +878,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
  24          return Py_BuildValue("c", rtn);
  25      } else {
  26          const char *knp;
  27 -#if defined(__NetBSD__)
  28 -        knp = unctrl(rtn);
  29 -#else
  30          knp = keyname(rtn);
  31 -#endif
  32          return PyString_FromString((knp == NULL) ? "" : knp);
  33      }
  34  }
  35 @@ -2100,7 +2088,6 @@ PyCursesWindow_NoOutRefresh(PyCursesWind
  36          }
  37  #endif /* HAVE_CURSES_IS_TERM_RESIZED */
  38
  39 -#if !defined(__NetBSD__)
  40          static PyObject *
  41              PyCurses_KeyName(PyObject *self, PyObject *args)
  42          {
  43 @@ -2119,7 +2106,6 @@ PyCursesWindow_NoOutRefresh(PyCursesWind
  44
  45              return PyString_FromString((knp == NULL) ? "" : (char *)knp);
  46          }
  47 -#endif
  48
  49          static PyObject *
  50              PyCurses_KillChar(PyObject *self)
  51 @@ -2664,9 +2650,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWind
  52  #ifdef HAVE_CURSES_IS_TERM_RESIZED
  53              {"is_term_resized",     (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
  54  #endif
  55 -#if !defined(__NetBSD__)
  56              {"keyname",             (PyCFunction)PyCurses_KeyName, METH_VARARGS},
  57 -#endif
  58              {"killchar",            (PyCFunction)PyCurses_KillChar, METH_NOARGS},
  59              {"longname",            (PyCFunction)PyCurses_longname, METH_NOARGS},
  60              {"meta",                (PyCFunction)PyCurses_Meta, METH_VARARGS},
  61 @@ -2775,9 +2759,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWind
  62              SetDictInt("A_DIM",                 A_DIM);
  63              SetDictInt("A_BOLD",                A_BOLD);
  64              SetDictInt("A_ALTCHARSET",          A_ALTCHARSET);
  65 -#if !defined(__NetBSD__)
  66              SetDictInt("A_INVIS",           A_INVIS);
  67 -#endif
  68              SetDictInt("A_PROTECT",         A_PROTECT);
  69              SetDictInt("A_CHARTEXT",        A_CHARTEXT);
  70              SetDictInt("A_COLOR",           A_COLOR);
  71 @@ -2849,7 +2831,6 @@ PyCursesWindow_NoOutRefresh(PyCursesWind
  72                  int key;
  73                  char *key_n;
  74                  char *key_n2;
  75 -#if !defined(__NetBSD__)
  76                  for (key=KEY_MIN;key < KEY_MAX; key++) {
  77                      key_n = (char *)keyname(key);
  78                      if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
  79 @@ -2877,7 +2858,6 @@ PyCursesWindow_NoOutRefresh(PyCursesWind
  80                      if (key_n2 != key_n)
  81                          free(key_n2);
  82                  }
  83 -#endif
  84                  SetDictInt("KEY_MIN", KEY_MIN);
  85                  SetDictInt("KEY_MAX", KEY_MAX);
  86              }