From 6bfd17e75c8bf751126577d9fb9aca039c274ec1 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 13 Feb 2017 16:10:16 +0200 Subject: [PATCH 1/2] python: remove setupterm() redefinition It's not 100% aligned with the ncurses' definition. Reported-by: Arturo Rinaldi Signed-off-by: Alexandru Ardelean --- .../patches/011-remove-setupterm-definition.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 lang/python/patches/011-remove-setupterm-definition.patch diff --git a/lang/python/patches/011-remove-setupterm-definition.patch b/lang/python/patches/011-remove-setupterm-definition.patch new file mode 100644 index 000000000..e55d70818 --- /dev/null +++ b/lang/python/patches/011-remove-setupterm-definition.patch @@ -0,0 +1,12 @@ +diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c +index e478a57..eb297b4 100644 +--- a/Modules/_cursesmodule.c ++++ b/Modules/_cursesmodule.c +@@ -117,7 +117,6 @@ 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 + #include + #endif From 5d53a642db043e91039b6bf3a382d07e62126d84 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 13 Feb 2017 16:12:39 +0200 Subject: [PATCH 2/2] python3: fix ncursesw definition collisions setup.py seems to add the host's /usr/include/ncursesw header. Reported-by: Arturo Rinaldi Signed-off-by: Alexandru Ardelean --- ...11-fix-ncursesw-definition-colisions.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 lang/python3/patches/011-fix-ncursesw-definition-colisions.patch diff --git a/lang/python3/patches/011-fix-ncursesw-definition-colisions.patch b/lang/python3/patches/011-fix-ncursesw-definition-colisions.patch new file mode 100644 index 000000000..0df72c745 --- /dev/null +++ b/lang/python3/patches/011-fix-ncursesw-definition-colisions.patch @@ -0,0 +1,24 @@ +diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c +index 3bf2ca7..c156964 100644 +--- a/Modules/_cursesmodule.c ++++ b/Modules/_cursesmodule.c +@@ -116,7 +116,6 @@ 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 + #include + #endif +diff --git a/setup.py b/setup.py +index af9a414..ee19ecd 100644 +--- a/setup.py ++++ b/setup.py +@@ -1349,7 +1349,6 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw'