<pre style='margin:0'>
Andrey Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/257fdb7ca87f91ed469da5dc9ce0ffca4788e5ab">https://github.com/macports/macports-ports/commit/257fdb7ca87f91ed469da5dc9ce0ffca4788e5ab</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 257fdb7ca87 Update py-gnureadline to 8.2.13; add py313 flavor
</span>257fdb7ca87 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 257fdb7ca87f91ed469da5dc9ce0ffca4788e5ab
</span>Author: Freek Dijkstra <freek@macfreek.nl>
AuthorDate: Wed Feb 19 12:37:07 2025 +0100
<span style='display:block; white-space:pre;color:#404040;'> Update py-gnureadline to 8.2.13; add py313 flavor
</span>---
python/py-gnureadline/Portfile | 13 +++---
.../files/patch-readline_not_editline.diff | 49 ----------------------
python/py-gnureadline/files/setup.py.patch | 2 +-
3 files changed, 7 insertions(+), 57 deletions(-)
<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 b97917d92ab..5c32224b51b 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;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-gnureadline
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.2.13
</span> license GPL-3+ PSF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 37 39 310 311 312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 37 39 310 311 312 313
</span>
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,10 +16,10 @@ long_description {*}${description}
</span>
homepage https://github.com/ludwigschwardt/python-gnureadline
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 28839a3424012f3532213f1717d7e3ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4651fd0cfa6106e0a82b6f3ac2c926a4bead353c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4262a6aa356ab22ef642f43a7f94eb42a72d6f0c532edb4e8c6b933f573056d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3111003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 c3a6b5751fa063d5e75dea0b23786118 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e3f88f251fc08877818334f4928bd999ea8233d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9b9e1e7ba99a80bb50c12027d6ce692574f77a65bf57bc97041cf81c0f49bd1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3224991
</span>
if {${name} ne ${subport}} {
if {${python.version} >= 36} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,6 @@ if {${name} ne ${subport}} {
</span> depends_lib-append port:ncurses
patchfiles build.sh.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5ef5037e7c9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gnureadline/files/patch-readline_not_editline.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c980529c281ad67b9f08348f1dc3446d015a2590 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Mark Mentovai <mark@mentovai.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 29 Sep 2023 10:55:53 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] =?UTF-8?q?3.x:=20don=E2=80=99t=20include=20editline/readl?=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- =?UTF-8?q?ine.h,=20use=20the=20embedded=20readline?=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-When building for a Python whose own readline module has been configured
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to use editline, WITH_EDITLINE will be defined during the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python-gnureadline build, by virtue of its inclusion of "pyconfig.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(via "Python.h"). This macro being defined caused python-gnureadline to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-a problem because python-gnureadline is expecting and has configured
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-itself to use its own embedded copy of GNU readline.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This removes the HAVE_EDITLINE branch to allow the expected readline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-headers to be included.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://trac.macports.org/ticket/68265.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Modules/3.x/readline.c | 10 +++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 3 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Modules/3.x/readline.c Modules/3.x/readline.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fa8cf6f32b10..f35ce10c2406 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/3.x/readline.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/3.x/readline.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,14 +28,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define RESTORE_LOCALE(sl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef WITH_EDITLINE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* GNU readline definitions */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <readline/history.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <readline/history.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_RL_COMPLETION_MATCHES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define completion_matches(x, y) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.42.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gnureadline/files/setup.py.patch b/python/py-gnureadline/files/setup.py.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 30e691daea8..f3f511effae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gnureadline/files/setup.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gnureadline/files/setup.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,6 @@
</span> url="http://github.com/ludwigschwardt/python-gnureadline",
include_package_data=True,
+ extra_path = 'readline',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- py_modules=['readline'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_modules=['readline', 'override_readline'],
</span> cmdclass={'build_ext': build_ext_subclass},
ext_modules=[
</pre><pre style='margin:0'>
</pre>