<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/fad1d5059c92db671cd8ea3624584ba29be1e823">https://github.com/macports/macports-ports/commit/fad1d5059c92db671cd8ea3624584ba29be1e823</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fad1d5059c92db671cd8ea3624584ba29be1e823
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Tue Sep 24 16:35:11 2024 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-greenlet: update to 3.1.1
</span>---
python/py-greenlet/Portfile | 14 +++-------
...1-switch_ppc_macosx.h-fix-wrong-assembler.patch | 32 ----------------------
.../0002-switch_ppc_unix.h-fix-the-same-bug.patch | 31 ---------------------
...tformselect.h-fix-PowerPC-macro-for-Apple.patch | 22 ---------------
4 files changed, 4 insertions(+), 95 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-greenlet/Portfile b/python/py-greenlet/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a8da578054..b333ade9fb8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-greenlet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-greenlet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup python 1.0
name py-greenlet
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.1
</span> categories-append devel
license MIT PSF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +44,9 @@ long_description The \"greenlet\" package is a spin-off of \
</span>
homepage https://github.com/python-greenlet/greenlet
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8907d2515e20dcedca9e7a2c5c9815faada9edfc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 182013
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 25d00933b37ab10ea7e95723689125f27ab953b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 186022
</span>
if {${name} ne ${subport}} {
if {${python.version} < 37} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,12 +60,6 @@ if {${name} ne ${subport}} {
</span> python.pep517 no
depends_build-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/python-greenlet/greenlet/pull/419
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Drop once merged to upstream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append 0001-switch_ppc_macosx.h-fix-wrong-assembler.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-switch_ppc_unix.h-fix-the-same-bug.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-slp_platformselect.h-fix-PowerPC-macro-for-Apple.patch
</span> }
# cc1plus: error: unrecognized command line option "-std=gnu++11"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-greenlet/files/0001-switch_ppc_macosx.h-fix-wrong-assembler.patch b/python/py-greenlet/files/0001-switch_ppc_macosx.h-fix-wrong-assembler.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f7fe4f6333a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-greenlet/files/0001-switch_ppc_macosx.h-fix-wrong-assembler.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From fd27352ba171d49b709db30d5e5a0e460a31ab8c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 28 Aug 2024 23:18:42 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/3] switch_ppc_macosx.h: fix wrong assembler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes: https://github.com/python-greenlet/greenlet/issues/418
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/greenlet/platform/switch_ppc_macosx.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/greenlet/platform/switch_ppc_macosx.h src/greenlet/platform/switch_ppc_macosx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d6e5a03..bd414c6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/greenlet/platform/switch_ppc_macosx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/greenlet/platform/switch_ppc_macosx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@ slp_switch(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int *stackref, stsizediff;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm__ volatile ("" : : : REGS_TO_SAVE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- __asm__ ("; asm block 2\n\tmr %0, r1" : "=g" (stackref) : );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("; asm block 2\n\tmr %0, r1" : "=r" (stackref) : );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SLP_SAVE_STATE(stackref, stsizediff);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm__ volatile (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@ slp_switch(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\tadd r1, r1, r11\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\tadd r30, r30, r11\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : /* no outputs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- : "g" (stsizediff)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "r" (stsizediff)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : "r11"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SLP_RESTORE_STATE();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-greenlet/files/0002-switch_ppc_unix.h-fix-the-same-bug.patch b/python/py-greenlet/files/0002-switch_ppc_unix.h-fix-the-same-bug.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index da6f9334e2c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-greenlet/files/0002-switch_ppc_unix.h-fix-the-same-bug.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 4d38954377e91d30c213fb198b5cf2fcae403ba3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 28 Aug 2024 23:26:30 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/3] switch_ppc_unix.h: fix the same bug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/greenlet/platform/switch_ppc_unix.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/greenlet/platform/switch_ppc_unix.h src/greenlet/platform/switch_ppc_unix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ca590a5..bb18808 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/greenlet/platform/switch_ppc_unix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/greenlet/platform/switch_ppc_unix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,7 @@ slp_switch(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int *stackref, stsizediff;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm__ volatile ("" : : : REGS_TO_SAVE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- __asm__ ("mr %0, 1" : "=g" (stackref) : );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("mr %0, 1" : "=r" (stackref) : );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SLP_SAVE_STATE(stackref, stsizediff);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm__ volatile (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@ slp_switch(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "add 1, 1, 11\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "add 30, 30, 11\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : /* no outputs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- : "g" (stsizediff)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "r" (stsizediff)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : "11"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SLP_RESTORE_STATE();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-greenlet/files/0003-slp_platformselect.h-fix-PowerPC-macro-for-Apple.patch b/python/py-greenlet/files/0003-slp_platformselect.h-fix-PowerPC-macro-for-Apple.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f1e31267286..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-greenlet/files/0003-slp_platformselect.h-fix-PowerPC-macro-for-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ff0d5973d89dd86b17a48f1fb847a57df28db914 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 28 Aug 2024 23:29:10 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/3] slp_platformselect.h: fix PowerPC macro for Apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/greenlet/slp_platformselect.h | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/greenlet/slp_platformselect.h src/greenlet/slp_platformselect.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c959f0f..22330ee 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/greenlet/slp_platformselect.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/greenlet/slp_platformselect.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "platform/switch_ppc64_linux.h" /* gcc on PowerPC 64-bit */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__GNUC__) && defined(__PPC__) && (defined(__linux__) || defined(__FreeBSD__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "platform/switch_ppc_linux.h" /* gcc on PowerPC */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__GNUC__) && defined(__ppc__) && defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__GNUC__) && defined(__POWERPC__) && defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "platform/switch_ppc_macosx.h" /* Apple MacOS X on PowerPC */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__GNUC__) && defined(__powerpc64__) && defined(_AIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "platform/switch_ppc64_aix.h" /* gcc on AIX/PowerPC 64-bit */
</span></pre><pre style='margin:0'>
</pre>