[pkgsrc/trunk]: pkgsrc/lang python*: remove patch for py_curses.h that doesn'...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang python*: remove patch for py_curses.h that doesn'...
From: wiz <wiz%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 08:13:13 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/23b2ad94503e
branches:  trunk
changeset: 371054:23b2ad94503e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Nov 01 21:51:21 2017 +0000

description:
python*: remove patch for py_curses.h that doesn't make sense to me

(nor upstream)

If this is still needed, please explain it. Thanks.

diffstat:

 lang/python27/distinfo                           |   3 +-
 lang/python27/patches/patch-aa                   |  26 --------------------
 lang/python34/distinfo                           |   3 +-
 lang/python34/patches/patch-aa                   |  30 ------------------------
 lang/python35/distinfo                           |   3 +-
 lang/python35/patches/patch-Include_py__curses.h |  30 ------------------------
 lang/python36/distinfo                           |   3 +-
 lang/python36/patches/patch-Include_py__curses.h |  30 ------------------------
 8 files changed, 4 insertions(+), 124 deletions(-)

diffs (196 lines):

diff -r 0d4310d3ed91 -r 23b2ad94503e lang/python27/distinfo
--- a/lang/python27/distinfo    Wed Nov 01 19:29:30 2017 +0000
+++ b/lang/python27/distinfo    Wed Nov 01 21:51:21 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2017/09/17 09:54:52 adam Exp $
+$NetBSD: distinfo,v 1.67 2017/11/01 21:51:21 wiz Exp $
 
 SHA1 (Python-2.7.14.tar.xz) = cf146474fc988b4b6b53fdd81b71c2815873b469
 RMD160 (Python-2.7.14.tar.xz) = 816553f988c661cfe31b6e89a513fdfbf87963d5
@@ -16,7 +16,6 @@
 SHA1 (patch-Modules_getpath.c) = 9bb2c040895ad6bbe4d0b5807803723b5437d47b
 SHA1 (patch-Modules_posixmodule.c) = 5105d380cd49bf49b8adbd9aa5ffb245195728ed
 SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4
-SHA1 (patch-aa) = d9626c1648d7ff2a7da7352665bcb05f4ab0412a
 SHA1 (patch-ab) = ea4feba4e93dbcff07050c82a00d591bb650e934
 SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
 SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
diff -r 0d4310d3ed91 -r 23b2ad94503e lang/python27/patches/patch-aa
--- a/lang/python27/patches/patch-aa    Wed Nov 01 19:29:30 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2015/04/24 03:01:36 rodent Exp $
-
---- Include/py_curses.h.orig   2014-12-10 15:59:32.000000000 +0000
-+++ Include/py_curses.h
-@@ -44,6 +44,21 @@
- #endif
- #endif
- 
-+#ifdef __NetBSD__
-+/*
-+** On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-+** against multiple definition of wchar_t and wint_t.
-+*/
-+#ifdef        _XOPEN_SOURCE_EXTENDED
-+#ifndef _WCHAR_T
-+#define _WCHAR_T
-+#endif
-+#ifndef _WINT_T
-+#define _WINT_T
-+#endif
-+#endif
-+#endif
-+
- #ifdef HAVE_NCURSES_H
- #include <ncurses.h>
- #else
diff -r 0d4310d3ed91 -r 23b2ad94503e lang/python34/distinfo
--- a/lang/python34/distinfo    Wed Nov 01 19:29:30 2017 +0000
+++ b/lang/python34/distinfo    Wed Nov 01 21:51:21 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2017/08/14 09:20:00 adam Exp $
+$NetBSD: distinfo,v 1.28 2017/11/01 21:51:21 wiz Exp $
 
 SHA1 (Python-3.4.7.tar.xz) = 7b05bf099f3f311ba568232d0d03d64e67da9908
 RMD160 (Python-3.4.7.tar.xz) = 8c4cde8603a15cd55b59b665a84efd0e8f9d7553
@@ -7,7 +7,6 @@
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57
 SHA1 (patch-Modules_socketmodule.c) = 3b091755d7c104b5d1fc696a0d4a679ed3565ef4
 SHA1 (patch-Modules_socketmodule.h) = ed334a97c2a6662c5b44b4e50c1b8efcc220fa1f
-SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d
 SHA1 (patch-ah) = 0acdfcbf3ebcb96b18a1cf28f18b286aa507a62f
 SHA1 (patch-al) = 5cf4d44d24020a9b6fe41deeb916edbe87a937cb
 SHA1 (patch-am) = 5822927f1c315b4fce5078626efe5418c764665e
diff -r 0d4310d3ed91 -r 23b2ad94503e lang/python34/patches/patch-aa
--- a/lang/python34/patches/patch-aa    Wed Nov 01 19:29:30 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2014/05/09 09:19:06 wiz Exp $
-
-* On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-  against multiple definition of wchar_t and wint_t.
-http://bugs.python.org/issue21457
-
---- Include/py_curses.h.orig   2009-09-06 21:26:46.000000000 +0000
-+++ Include/py_curses.h
-@@ -44,6 +44,21 @@
- #endif
- #endif
- 
-+#ifdef __NetBSD__
-+/*
-+** On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-+** against multiple definition of wchar_t and wint_t.
-+*/
-+#ifdef        _XOPEN_SOURCE_EXTENDED
-+#ifndef _WCHAR_T
-+#define _WCHAR_T
-+#endif
-+#ifndef _WINT_T
-+#define _WINT_T
-+#endif
-+#endif
-+#endif
-+
- #ifdef HAVE_NCURSES_H
- #include <ncurses.h>
- #else
diff -r 0d4310d3ed91 -r 23b2ad94503e lang/python35/distinfo
--- a/lang/python35/distinfo    Wed Nov 01 19:29:30 2017 +0000
+++ b/lang/python35/distinfo    Wed Nov 01 21:51:21 2017 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2017/08/14 09:16:28 adam Exp $
+$NetBSD: distinfo,v 1.13 2017/11/01 21:51:22 wiz Exp $
 
 SHA1 (Python-3.5.4.tar.xz) = 4aacbd09ca6988255de84a98ab9e4630f584efba
 RMD160 (Python-3.5.4.tar.xz) = b0df9be4047421672456c9c57b4ddc0aaad7c095
 SHA512 (Python-3.5.4.tar.xz) = dbbe2740ee1cce5404b7b6436a9b3887e15f415a1006efa22014ec7e5b1e48c43eed0ff98f6f5b365c527b8d2525be4ce72bbe404ce71c0835529fcd6f0267ff
 Size (Python-3.5.4.tar.xz) = 15332320 bytes
-SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
 SHA1 (patch-Lib_distutils_command_install.py) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d0b70a64b79ee6084c41d8fbb01c8e8e4553419
 SHA1 (patch-Makefile.pre.in) = 330a1a74fbd967e0777860fa3ceecb88ac2eb7fd
diff -r 0d4310d3ed91 -r 23b2ad94503e lang/python35/patches/patch-Include_py__curses.h
--- a/lang/python35/patches/patch-Include_py__curses.h  Wed Nov 01 19:29:30 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-Include_py__curses.h,v 1.1 2015/12/05 17:12:13 adam Exp $
-
-* On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-  against multiple definition of wchar_t and wint_t.
-http://bugs.python.org/issue21457
-
---- Include/py_curses.h.orig   2009-09-06 21:26:46.000000000 +0000
-+++ Include/py_curses.h
-@@ -44,6 +44,21 @@
- #endif
- #endif
- 
-+#ifdef __NetBSD__
-+/*
-+** On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-+** against multiple definition of wchar_t and wint_t.
-+*/
-+#ifdef        _XOPEN_SOURCE_EXTENDED
-+#ifndef _WCHAR_T
-+#define _WCHAR_T
-+#endif
-+#ifndef _WINT_T
-+#define _WINT_T
-+#endif
-+#endif
-+#endif
-+
- #ifdef HAVE_NCURSES_H
- #include <ncurses.h>
- #else
diff -r 0d4310d3ed91 -r 23b2ad94503e lang/python36/distinfo
--- a/lang/python36/distinfo    Wed Nov 01 19:29:30 2017 +0000
+++ b/lang/python36/distinfo    Wed Nov 01 21:51:21 2017 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.14 2017/10/05 08:17:25 adam Exp $
+$NetBSD: distinfo,v 1.15 2017/11/01 21:51:22 wiz Exp $
 
 SHA1 (Python-3.6.3.tar.xz) = 6c71b14bdbc4d8aa0cfd59d4b6dc356d46abfdf5
 RMD160 (Python-3.6.3.tar.xz) = b29962b7233c74149670d8b83284d4265de5e769
 SHA512 (Python-3.6.3.tar.xz) = 32f24a3adcb7880003c7ecdc5e53e838e774adda76b308961d8215e28db630b2fa2828097817924c76afa4212b2df3362eb64d4e10f37c0147f512ec5aa8662b
 Size (Python-3.6.3.tar.xz) = 16974296 bytes
-SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
 SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341
 SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
 SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9
diff -r 0d4310d3ed91 -r 23b2ad94503e lang/python36/patches/patch-Include_py__curses.h
--- a/lang/python36/patches/patch-Include_py__curses.h  Wed Nov 01 19:29:30 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-Include_py__curses.h,v 1.1 2017/01/01 14:34:27 adam Exp $
-
-* On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-  against multiple definition of wchar_t and wint_t.
-http://bugs.python.org/issue21457
-
---- Include/py_curses.h.orig   2009-09-06 21:26:46.000000000 +0000
-+++ Include/py_curses.h
-@@ -44,6 +44,21 @@
- #endif
- #endif
- 
-+#ifdef __NetBSD__
-+/*
-+** On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-+** against multiple definition of wchar_t and wint_t.
-+*/
-+#ifdef        _XOPEN_SOURCE_EXTENDED
-+#ifndef _WCHAR_T
-+#define _WCHAR_T
-+#endif
-+#ifndef _WINT_T
-+#define _WINT_T
-+#endif
-+#endif
-+#endif
-+
- #ifdef HAVE_NCURSES_H
- #include <ncurses.h>
- #else
Prev by Date: [pkgsrc/trunk]: pkgsrc/security/yara security/yara: Needs OpenSSL to build
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/idutils/patches patch fflush.c and fseeko.c so t...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/security/yara security/yara: Needs OpenSSL to build
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/idutils/patches patch fflush.c and fseeko.c so t...
Indexes:
Home | Main Index | Thread Index | Old Index