<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/fff32109541d6fd94bae0d5f0abeb9726c1e00ef">https://github.com/macports/macports-ports/commit/fff32109541d6fd94bae0d5f0abeb9726c1e00ef</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 fff32109541 py-psutil: Update to 5.9.8 and fix build on old macOS
</span>fff32109541 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit fff32109541d6fd94bae0d5f0abeb9726c1e00ef
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jan 29 01:29:58 2024 -0600

<span style='display:block; white-space:pre;color:#404040;'>    py-psutil: Update to 5.9.8 and fix build on old macOS
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/69180
</span>---
 python/py-psutil/Portfile                   | 11 +++++++----
 python/py-psutil/files/CoreFoundation.patch | 14 ++++++++++++++
 python/py-psutil/files/u_char.patch         | 27 +++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-psutil/Portfile b/python/py-psutil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b40b7e7d32a..1d28d7de78f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-psutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-psutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,12 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-psutil
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             5.9.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             5.9.8
</span> revision            0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  56bc1435590589efabe427e690ae922ff190b64d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    503247
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories-append   devel sysutils
 license             MIT
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +29,5 @@ long_description    psutil is a module providing an interface for retrieving \
</span> 
 homepage            https://github.com/giampaolo/psutil
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  b484207704227ad959b304e0c0c130562eb160ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  3f02134e82cfb5d089fddf20bb2e03fd5cd52395321d1c8458a9e58500ff417c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    498429
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          CoreFoundation.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    u_char.patch
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-psutil/files/CoreFoundation.patch b/python/py-psutil/files/CoreFoundation.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ba6ab1c841a
</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-psutil/files/CoreFoundation.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Include the CoreFoundation header because on old systems IOPowerSources.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+neglects to do so.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/giampaolo/psutil/issues/2362
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- psutil/arch/osx/sensors.c.orig 2023-06-01 11:41:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ psutil/arch/osx/sensors.c      2024-01-29 01:26:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // https://github.com/giampaolo/psutil/commit/e0df5da
</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;'>++#include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOKit/ps/IOPowerSources.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOKit/ps/IOPSKeys.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-psutil/files/u_char.patch b/python/py-psutil/files/u_char.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f78887f2178
</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-psutil/files/u_char.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;'>+Include net/if.h before net/if_dl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In old versions of macOS, net/if_dl.h neglects to include sys/types.h,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which results in build failure:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: unknown type name 'u_char'; did you mean 'char'?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Including net/if.h first works around the problem because net/if.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+includes sys/types.h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/giampaolo/psutil/issues/2360
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/giampaolo/psutil/commit/494d8b84f601a19f4f298ffbb3b47a647384d521
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- psutil/arch/osx/net.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ psutil/arch/osx/net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,11 +9,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // https://github.com/giampaolo/psutil/blame/efd7ed3/psutil/_psutil_osx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Python.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <net/if.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <net/if_dl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <net/route.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <net/if.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../../_psutil_common.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>