Import of pkgsrc-2015Q2

lang/python33/patches/patch-ah

@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
+$NetBSD: patch-ah,v 1.2 2015/04/24 03:24:32 rodent Exp $
 
 * Ncurses will be used by devel/py-curses and devel/py-cursespanel.
 
---- Modules/_cursesmodule.c.orig	2012-02-23 20:22:47.000000000 +0000
+--- Modules/_cursesmodule.c.orig	2014-10-12 07:03:53.000000000 +0000
 +++ Modules/_cursesmodule.c
-@@ -332,17 +332,9 @@ Window_NoArg2TupleReturnFunction(getpary
+@@ -482,17 +482,9 @@ Window_NoArg2TupleReturnFunction(getpary
  
  Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
  Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
@@ -22,7 +22,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  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")
-@@ -901,11 +893,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
+@@ -1146,11 +1138,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
          return Py_BuildValue("C", rtn);
      } else {
          const char *knp;
@@ -34,7 +34,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
          return PyUnicode_FromString((knp == NULL) ? "" : knp);
      }
  }
-@@ -2187,7 +2175,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
+@@ -2580,7 +2568,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
  }
  #endif /* HAVE_CURSES_IS_TERM_RESIZED */
  
@@ -42,7 +42,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  static PyObject *
  PyCurses_KeyName(PyObject *self, PyObject *args)
  {
-@@ -2206,7 +2193,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
+@@ -2599,7 +2586,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
  
      return PyBytes_FromString((knp == NULL) ? "" : (char *)knp);
  }
@@ -50,7 +50,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  
  static PyObject *
  PyCurses_KillChar(PyObject *self)
-@@ -2744,9 +2730,7 @@ static PyMethodDef PyCurses_methods[] = 
+@@ -3206,9 +3192,7 @@ static PyMethodDef PyCurses_methods[] = 
  #ifdef HAVE_CURSES_IS_TERM_RESIZED
      {"is_term_resized",     (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
  #endif
@@ -60,7 +60,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
      {"killchar",            (PyCFunction)PyCurses_KillChar, METH_NOARGS},
      {"longname",            (PyCFunction)PyCurses_longname, METH_NOARGS},
      {"meta",                (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2869,9 +2853,7 @@ PyInit__curses(void)
+@@ -3334,9 +3318,7 @@ PyInit__curses(void)
      SetDictInt("A_DIM",                 A_DIM);
      SetDictInt("A_BOLD",                A_BOLD);
      SetDictInt("A_ALTCHARSET",          A_ALTCHARSET);
@@ -70,7 +70,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
      SetDictInt("A_PROTECT",         A_PROTECT);
      SetDictInt("A_CHARTEXT",        A_CHARTEXT);
      SetDictInt("A_COLOR",           A_COLOR);
-@@ -2943,7 +2925,6 @@ PyInit__curses(void)
+@@ -3408,7 +3390,6 @@ PyInit__curses(void)
          int key;
          char *key_n;
          char *key_n2;
@@ -78,7 +78,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
          for (key=KEY_MIN;key < KEY_MAX; key++) {
              key_n = (char *)keyname(key);
              if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2971,7 +2952,6 @@ PyInit__curses(void)
+@@ -3436,7 +3417,6 @@ PyInit__curses(void)
              if (key_n2 != key_n)
                  free(key_n2);
          }