<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2474cbba0de0fc44601b5b4a1d0c67226af5d0db">https://github.com/macports/macports-ports/commit/2474cbba0de0fc44601b5b4a1d0c67226af5d0db</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 2474cbba0de albafetch: fix build on macOS <10.9, refactor patch
</span>2474cbba0de is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2474cbba0de0fc44601b5b4a1d0c67226af5d0db
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Sun Jul 7 06:57:44 2024 +0300
<span style='display:block; white-space:pre;color:#404040;'> albafetch: fix build on macOS <10.9, refactor patch
</span>---
sysutils/albafetch/Portfile | 4 ++--
...86-and-ppc.patch => 0001-fix-macos_infos.patch} | 27 ++++++++++++----------
2 files changed, 17 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/albafetch/Portfile b/sysutils/albafetch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13bc1f296f0..ac717f66ce6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/albafetch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/albafetch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup makefile 1.0
</span> legacysupport.newest_darwin_requires_legacy 14
github.setup alba4k albafetch 4.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
description Faster neofetch alternative, written in C
long_description ${name} is a simple and fast program to display \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ checksums rmd160 62266e581315914385ecaa1558641f4fb9e9312a \
</span> github.tarball_from archive
# https://github.com/alba4k/albafetch/pull/85
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 0001-macos_infos.c-fix-for-i386-and-ppc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-fix-macos_infos.patch \
</span> 0002-Fix-Makefile.patch
# cc1: error: invalid option argument ‘-Ofast’
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/albafetch/files/0001-macos_infos.c-fix-for-i386-and-ppc.patch b/sysutils/albafetch/files/0001-fix-macos_infos.patch
</span>similarity index 74%
rename from sysutils/albafetch/files/0001-macos_infos.c-fix-for-i386-and-ppc.patch
rename to sysutils/albafetch/files/0001-fix-macos_infos.patch
<span style='display:block; white-space:pre;color:#808080;'>index 9add15a71ca..2d005a889b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/albafetch/files/0001-macos_infos.c-fix-for-i386-and-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/albafetch/files/0001-fix-macos_infos.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6362e1d3538b5aeb61e02d6564802f9b536f81e8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 20 May 2024 13:43:36 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] macos_infos.c: fix for i386 and ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/macos_infos.c src/macos_infos.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a1b4d19..8b90eb0 100644
</span> --- src/macos_infos.c
+++ src/macos_infos.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,22 @@ static vm_size_t page_size(mach_port_t host) {
</span> * Original source:
* https://opensource.apple.com/source/system_cmds/system_cmds-496/vm_stat.tproj/vm_stat.c.auto.html
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +23,7 @@ index a1b4d19..8b90eb0 100644
</span> static int get_stats(struct vm_statistics64 *stat, mach_port_t host) {
int error;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +47,7 @@ static int get_stats(struct vm_statistics64 *stat, mach_port_t host) {
</span>
return 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,11 +31,11 @@ index a1b4d19..8b90eb0 100644
</span>
/* EXPORTS */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +66,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +66,20 @@ bytes_t system_mem_size() {
</span> }
bytes_t used_mem_size() {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__i386__) || defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span> + pages_t active, wired, inactive;
+ mach_port_t host = mach_host_self();
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,9 +52,19 @@ index a1b4d19..8b90eb0 100644
</span> pages_t internal, wired, compressed;
mach_port_t host = mach_host_self();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,4 +92,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,4 +92,5 @@ bytes_t used_mem_size() {
</span> compressed = vm_stat.compressor_page_count;
return (internal + wired + compressed) * page_size(host);
+#endif
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macos_infos.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/macos_infos.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "bsdwrap.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>