<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/45445f0a9160d9cdd9f957b4bd90b5e4dd421389">https://github.com/macports/macports-ports/commit/45445f0a9160d9cdd9f957b4bd90b5e4dd421389</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 45445f0a916 python*: fix build with latest libedit
</span>45445f0a916 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 45445f0a9160d9cdd9f957b4bd90b5e4dd421389
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Sep 16 00:42:26 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> python*: fix build with latest libedit
</span>---
lang/python26/Portfile | 3 ++-
lang/python26/files/libedit-types.patch | 27 +++++++++++++++++++++++++++
lang/python27/Portfile | 3 ++-
lang/python27/files/libedit-types.patch | 15 +++++++++++++++
lang/python310/Portfile | 3 ++-
lang/python310/files/libedit-types.patch | 15 +++++++++++++++
lang/python311/Portfile | 3 ++-
lang/python311/files/libedit-types.patch | 15 +++++++++++++++
lang/python32/Portfile | 3 ++-
lang/python32/files/libedit-types.patch | 31 +++++++++++++++++++++++++++++++
lang/python33/Portfile | 3 ++-
lang/python33/files/libedit-types.patch | 15 +++++++++++++++
lang/python34/Portfile | 3 ++-
lang/python34/files/libedit-types.patch | 15 +++++++++++++++
lang/python35/Portfile | 3 ++-
lang/python35/files/libedit-types.patch | 15 +++++++++++++++
lang/python36/Portfile | 3 ++-
lang/python36/files/libedit-types.patch | 15 +++++++++++++++
lang/python37/Portfile | 3 ++-
lang/python37/files/libedit-types.patch | 15 +++++++++++++++
lang/python38/Portfile | 3 ++-
lang/python38/files/libedit-types.patch | 15 +++++++++++++++
lang/python39/Portfile | 3 ++-
lang/python39/files/libedit-types.patch | 15 +++++++++++++++
24 files changed, 232 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python26/Portfile b/lang/python26/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4126017ef51..d374a21f97e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,8 @@ patchfiles patch-Makefile.pre.in.diff \
</span> yosemite.patch \
improve-QuickTime.h-check.patch \
darwin20.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
depends_lib port:gettext-runtime port:zlib \
port:sqlite3 port:db46 port:ncurses \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python26/files/libedit-types.patch b/lang/python26/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a0c3caa2351
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python26/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2023-09-16 00:37:47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-16 00:38:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,12 +237,8 @@ set_completion_display_matches_hook(PyObject *self, Py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -838,9 +834,9 @@ setup_readline(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Set our hook functions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rl_startup_hook = (Function *)on_startup_hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rl_startup_hook = on_startup_hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_RL_PRE_INPUT_HOOK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rl_pre_input_hook = (Function *)on_pre_input_hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rl_pre_input_hook = on_pre_input_hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Set our completion function */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_attempted_completion_function = (rl_completion_func_t *)flex_complete;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/Portfile b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b320147e17f..3b93a552ef7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,8 @@ patchfiles patch-Makefile.pre.in.diff \
</span> darwin20.diff \
arm.patch \
implicit.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl_ver.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl_ver.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} >= 21} {
patchfiles-append patch-getpath.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/files/libedit-types.patch b/lang/python27/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..09c07c6d0fa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2017-09-19 17:32:02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-15 14:46:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,12 +268,8 @@ set_completion_display_matches_hook(PyObject *self, Py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310/Portfile b/lang/python310/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f37d9990499..cb5be6a57ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,8 @@ patchfiles patch-setup.py.diff \
</span> patch-configure.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
patch-configure-xcode4bug.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sysconfig.py.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysconfig.py.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310/files/libedit-types.patch b/lang/python310/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ea7625570b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2023-09-06 07:57:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-10 01:43:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,12 +442,8 @@ readline_set_completion_display_matches_hook_impl(PyOb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readlinestate_global->completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python311/Portfile b/lang/python311/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bac46b682d2..3486596d859 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python311/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python311/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,8 @@ patchfiles patch-setup.py.diff \
</span> patch-Lib-cgi.py.diff \
patch-configure.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sysconfig.py.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysconfig.py.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python311/files/libedit-types.patch b/lang/python311/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ea7625570b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python311/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2023-09-06 07:57:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-10 01:43:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,12 +442,8 @@ readline_set_completion_display_matches_hook_impl(PyOb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readlinestate_global->completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python32/Portfile b/lang/python32/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7573178bd80..7ac18e4438e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python32/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python32/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,8 @@ patchfiles patch-setup.py.diff \
</span> patch-Lib-site.py-omit_local_site_packages.diff \
patch-Include-pyport.h.diff \
uuid-64bit.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin20.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin20.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
# https://bugs.python.org/issue21811
patchfiles-append patch-configure_configure.ac-yosemite_configure_fixes.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python32/files/libedit-types.patch b/lang/python32/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1c71331b9c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python32/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2014-10-12 17:52:03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-15 16:12:33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,12 +264,8 @@ set_completion_display_matches_hook(PyObject *self, Py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -912,12 +908,12 @@ setup_readline(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Set our hook functions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rl_startup_hook = (Function *)on_startup_hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rl_startup_hook = on_startup_hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_RL_PRE_INPUT_HOOK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rl_pre_input_hook = (Function *)on_pre_input_hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rl_pre_input_hook = on_pre_input_hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Set our completion function */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rl_attempted_completion_function = (CPPFunction *)flex_complete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rl_attempted_completion_function = flex_complete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Set Python word break characters */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completer_word_break_characters =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python33/Portfile b/lang/python33/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 820a7a63cc8..cee0721e5b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,8 @@ patchfiles patch-setup.py.diff \
</span> omit-local-site-packages.patch \
patch-Include-pyport.h.diff \
uuid-64bit.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin20.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin20.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
# https://bugs.python.org/issue21811
patchfiles-append yosemite-configure-fixes.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python33/files/libedit-types.patch b/lang/python33/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..09c07c6d0fa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python33/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2017-09-19 17:32:02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-15 14:46:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,12 +268,8 @@ set_completion_display_matches_hook(PyObject *self, Py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/Portfile b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be44fca26a1..ac4d04fd2e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,8 @@ patchfiles patch-setup.py.diff \
</span> uuid-64bit.patch \
patch-_osx_support.py.diff \
darwin20.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sysconfig.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysconfig.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/files/libedit-types.patch b/lang/python34/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ea7625570b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2023-09-06 07:57:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-10 01:43:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,12 +442,8 @@ readline_set_completion_display_matches_hook_impl(PyOb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readlinestate_global->completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python35/Portfile b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b4a01a54a24..6313181cb61 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,8 @@ patchfiles patch-setup.py.diff \
</span> darwin20.diff \
implicit.patch \
sysconfig.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- multiarch.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ multiarch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python35/files/libedit-types.patch b/lang/python35/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ea7625570b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python35/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2023-09-06 07:57:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-10 01:43:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,12 +442,8 @@ readline_set_completion_display_matches_hook_impl(PyOb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readlinestate_global->completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/Portfile b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 66bf52129d8..31b6f7894fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,8 @@ patchfiles patch-setup.py.diff \
</span> darwin20.diff \
implicit.patch \
sysconfig.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- multiarch.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ multiarch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/files/libedit-types.patch b/lang/python36/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ea7625570b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2023-09-06 07:57:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-10 01:43:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,12 +442,8 @@ readline_set_completion_display_matches_hook_impl(PyOb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readlinestate_global->completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python37/Portfile b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c8c8b85ba92..f5ff42b2df4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,8 @@ patchfiles patch-setup.py.diff \
</span> implicit.patch \
sysconfig.py.diff \
distutils_spawn.py.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macos11.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macos11.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python37/files/libedit-types.patch b/lang/python37/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ea7625570b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2023-09-06 07:57:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-10 01:43:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,12 +442,8 @@ readline_set_completion_display_matches_hook_impl(PyOb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readlinestate_global->completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/Portfile b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49027ce83f3..5c5f0ca6994 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,8 @@ patchfiles patch-setup.py.diff \
</span> patch-libedit.diff \
patch-configure-xcode4bug.diff \
sysconfig.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distutils_spawn.py.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distutils_spawn.py.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/files/libedit-types.patch b/lang/python38/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ea7625570b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2023-09-06 07:57:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-10 01:43:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,12 +442,8 @@ readline_set_completion_display_matches_hook_impl(PyOb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readlinestate_global->completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/Portfile b/lang/python39/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 195311645d9..f733a37282f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,8 @@ patchfiles patch-setup.py.diff \
</span> patch-Lib-ctypes-macholib-dyld.py.diff \
patch-libedit.diff \
patch-configure-xcode4bug.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sysconfig.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysconfig.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/files/libedit-types.patch b/lang/python39/files/libedit-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ea7625570b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2023-09-06 07:57:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2023-09-10 01:43:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,12 +442,8 @@ readline_set_completion_display_matches_hook_impl(PyOb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default completion display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readlinestate_global->completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>