<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/c338199ad1fcf0328a7fce5572d856388930aee3">https://github.com/macports/macports-ports/commit/c338199ad1fcf0328a7fce5572d856388930aee3</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 c338199ad1f py-gnureadline: Fix build when Python's readline module uses editline
</span>c338199ad1f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c338199ad1fcf0328a7fce5572d856388930aee3
</span>Author: Mark Mentovai <mark@mentovai.com>
AuthorDate: Fri Sep 29 10:53:14 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-gnureadline: Fix build when Python's readline module uses editline
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/68265
</span>---
 python/py-gnureadline/Portfile                     |  1 +
 .../files/patch-readline_not_editline.diff         | 49 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gnureadline/Portfile b/python/py-gnureadline/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b724864df27..43e114b45d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gnureadline/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gnureadline/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,7 @@ if {${name} ne ${subport}} {
</span>     depends_lib-append  port:ncurses
 
     patchfiles          build.sh.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-readline_not_editline.diff \
</span>                         setup.py.patch
 
     post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gnureadline/files/patch-readline_not_editline.diff b/python/py-gnureadline/files/patch-readline_not_editline.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5ef5037e7c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gnureadline/files/patch-readline_not_editline.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c980529c281ad67b9f08348f1dc3446d015a2590 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Mark Mentovai <mark@mentovai.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 29 Sep 2023 10:55:53 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] =?UTF-8?q?3.x:=20don=E2=80=99t=20include=20editline/readl?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?ine.h,=20use=20the=20embedded=20readline?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+When building for a Python whose own readline module has been configured
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to use editline, WITH_EDITLINE will be defined during the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python-gnureadline build, by virtue of its inclusion of "pyconfig.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(via "Python.h"). This macro being defined caused python-gnureadline to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+a problem because python-gnureadline is expecting and has configured
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+itself to use its own embedded copy of GNU readline.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This removes the HAVE_EDITLINE branch to allow the expected readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+headers to be included.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://trac.macports.org/ticket/68265.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Modules/3.x/readline.c | 10 +++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Modules/3.x/readline.c Modules/3.x/readline.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fa8cf6f32b10..f35ce10c2406 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/3.x/readline.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/3.x/readline.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,14 +28,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #  define RESTORE_LOCALE(sl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef WITH_EDITLINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#  include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* GNU readline definitions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#  undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#  include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#  include <readline/history.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <readline/history.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_RL_COMPLETION_MATCHES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define completion_matches(x, y) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>

</pre>