<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9440b738d26c6e23d03e73ef453e50e4dec47de0">https://github.com/macports/macports-ports/commit/9440b738d26c6e23d03e73ef453e50e4dec47de0</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 9440b738d26 fastfetch: minor fix for legacy macOS (no revbump)
</span>9440b738d26 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9440b738d26c6e23d03e73ef453e50e4dec47de0
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Sep 7 18:13:29 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> fastfetch: minor fix for legacy macOS (no revbump)
</span>---
sysutils/fastfetch/Portfile | 5 +++--
...akeLists-do-not-use-Linux-ldflag-on-macOS.patch | 22 ++++++++++++++++++++++
...Tiger-specific-adjustments-to-CMakeLists.patch} | 17 +++++++++++++----
3 files changed, 38 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/Portfile b/sysutils/fastfetch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f87661a5c05..44df6e7745f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +95,8 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> 0017-Fix-compatibility-with-10.4.patch \
0018-Revert-some-breakages.patch \
0019-CMakeLists-adjust-for-legacy-macOS.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0020-swap_fat_arch_64-does-not-exist-in-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0020-swap_fat_arch_64-does-not-exist-in-10.6.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0021-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch
</span>
# Leopard needs this at least due to physicaldisk_apple module,
# which uses definitions from storage/IOStorageDeviceCharacteristics.h (IOKit framework);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +104,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> # that SDK version, or otherwise disable physicaldisk_apple (see the patch).
if {${os.major} < 10} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0021-Tiger-specific-adjustments-to-CMakeLists.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0022-Tiger-specific-adjustments-to-CMakeLists.patch
</span> }
# To make sure OpenCL is not accidentally enabled.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0021-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch b/sysutils/fastfetch/files/0021-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e268ce24d4b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0021-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 01a73b6ce087eb402daa238dab5e5c61aab4f8c5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 7 Sep 2024 18:06:12 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] CMakeLists: do not use Linux ldflag on macOS
</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;'>+ CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6b2a2bcf..f8fd30bd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,7 +136,7 @@ if(ENABLE_ASAN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG} -fstack-protector-all -fno-delete-null-pointer-checks")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT WIN32 AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic")
</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;color:#808080;'>diff --git a/sysutils/fastfetch/files/0021-Tiger-specific-adjustments-to-CMakeLists.patch b/sysutils/fastfetch/files/0022-Tiger-specific-adjustments-to-CMakeLists.patch
</span>similarity index 77%
rename from sysutils/fastfetch/files/0021-Tiger-specific-adjustments-to-CMakeLists.patch
rename to sysutils/fastfetch/files/0022-Tiger-specific-adjustments-to-CMakeLists.patch
<span style='display:block; white-space:pre;color:#808080;'>index 49d4c72fd5d..e1d867fb214 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0021-Tiger-specific-adjustments-to-CMakeLists.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0022-Tiger-specific-adjustments-to-CMakeLists.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ Date: Tue, 27 Aug 2024 16:08:42 +0800
</span> Subject: [PATCH] Tiger-specific adjustments to CMakeLists
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CMakeLists.txt | 5 ++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 7 +++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 4 deletions(-)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6b2a2bcf..ff70a643 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6b2a2bcf..b607fabf 100644
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -632,7 +632,7 @@ elseif(APPLE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,15 @@ index 6b2a2bcf..ff70a643 100644
</span> src/detection/physicalmemory/physicalmemory_nosupport.c
src/detection/diskio/diskio_apple.c
src/detection/displayserver/displayserver_apple.c
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -689,7 +689,7 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/util/apple/cf_helpers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/util/apple/osascript.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/util/platform/FFPlatform_unix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- src/util/binary_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ src/util/binary_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND LIBFASTFETCH_SRC
</span> @@ -1108,7 +1108,6 @@ elseif(APPLE)
PRIVATE "-framework Cocoa"
PRIVATE "-framework CoreFoundation"
</pre><pre style='margin:0'>
</pre>