<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/70c96cffca87944b5e8625b38069a7dd9a72ea77">https://github.com/macports/macports-ports/commit/70c96cffca87944b5e8625b38069a7dd9a72ea77</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 70c96cffca8 fastfetch: rebase patches after update, support 10.4
</span>70c96cffca8 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 70c96cffca87944b5e8625b38069a7dd9a72ea77
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Tue Aug 6 07:11:54 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    fastfetch: rebase patches after update, support 10.4
</span>---
 sysutils/fastfetch/Portfile                        |  54 +++++--
 .../files/0001-gpu_apple.m-unbreak-for-10.11.patch |  11 +-
 .../files/0002-memory_apple-fix-for-32-bit.patch   |  11 +-
 .../files/0003-opengl_apple.c-fix-for-10.7.patch   |  11 +-
 .../files/0004-sound_apple.c-fix-for-10.8.patch    |  11 +-
 .../0005-monitor_apple.m-no-HDR-before-10.11.patch |  11 +-
 .../0006-gpu_apple.c-fix-for-old-systems.patch     |  11 +-
 .../0007-camera_apple.m-unbreak-for-10.7.patch     |  11 +-
 ...-brightness_apple.c-add-a-missing-include.patch |  11 +-
 ... 0009-CMakeLists-adjust-for-legacy-macOS.patch} |  10 +-
 ...t-refresh-rate-detection-commit-for-macOS.patch |  88 -----------
 ...nor-fix-for-a-type-fixes-calculation-of-d.patch |  19 ---
 ...10-os_apple.m-etc.-fix-syntax-for-plists.patch} |  17 ++-
 ...tax.patch => 0011-osascript.m-fix-syntax.patch} |  11 +-
 ...-macros.patch => 0012-Fix-PowerPC-macros.patch} |  12 +-
 ...ools.patch => 0013-Fix-autorelease-pools.patch} |  24 ++-
 ...14-disk_bsd-no-support-for-creation-time.patch} |  11 +-
 ...ch => 0015-Support-PowerPC-CPU-detection.patch} |  12 +-
 .../0016-Support-hostinfo-for-PowerPC-Macs.patch   |  77 ++++++++++
 ...ages.patch => 0017-Revert-some-breakages.patch} | 170 +++++++++++++++------
 .../files/0018-Fix-compatibility-with-10.4.patch   | 169 ++++++++++++++++++++
 ...-Tiger-specific-adjustments-to-CMakeLists.patch |  42 +++++
 22 files changed, 601 insertions(+), 203 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 00be1bb878e..c4cf188ab5d 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;'>@@ -46,11 +46,24 @@ configure.args-append \
</span> compiler.c_standard     2011
 compiler.cxx_standard   2017
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/fastfetch-cli/fastfetch/issues/942
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/fastfetch-cli/fastfetch/issues/943
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/fastfetch-cli/fastfetch/issues/944
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/fastfetch-cli/fastfetch/issues/1148
</span> if {${os.platform} eq "darwin" && ${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # As of now, it is intended to get updated,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # but since rebasing may be non-trivial,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # we keep a dedicated case for older OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # to avoid potential breakages on every update.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup    fastfetch-cli fastfetch 2.21.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160  a9567e0c0773714b049e04783d2ba3cc4a179417 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  21d085a612b6bd9ab0f4e7bffe2632e313e6f67d432251cfd5a7f877b7194733 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    1086262
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    maintainers-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    {@barracuda156 gmail.com:vital.had}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://github.com/fastfetch-cli/fastfetch/issues/942
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://github.com/fastfetch-cli/fastfetch/issues/943
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://github.com/fastfetch-cli/fastfetch/issues/944
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://github.com/fastfetch-cli/fastfetch/issues/1148
</span>     patchfiles-append \
                     0001-gpu_apple.m-unbreak-for-10.11.patch \
                     0002-memory_apple-fix-for-32-bit.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,21 +73,30 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span>                     0006-gpu_apple.c-fix-for-old-systems.patch \
                     0007-camera_apple.m-unbreak-for-10.7.patch \
                     0008-brightness_apple.c-add-a-missing-include.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0009-Revert-refresh-rate-detection-commit-for-macOS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0010-disk_bsd-minor-fix-for-a-type-fixes-calculation-of-d.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0011-CMakeLists-adjust-for-legacy-macOS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0012-os_apple.m-etc.-fix-syntax-for-plists.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0013-osascript.m-fix-syntax.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0014-Revert-some-display-related-breakages.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0015-Fix-PowerPC-macros.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0016-Fix-autorelease-pools.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0017-disk_bsd-no-support-for-creation-time.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0018-Support-PowerPC-CPU-detection.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0009-CMakeLists-adjust-for-legacy-macOS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0010-os_apple.m-etc.-fix-syntax-for-plists.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0011-osascript.m-fix-syntax.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0012-Fix-PowerPC-macros.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0013-Fix-autorelease-pools.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0014-disk_bsd-no-support-for-creation-time.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0015-Support-PowerPC-CPU-detection.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0016-Support-hostinfo-for-PowerPC-Macs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0017-Revert-some-breakages.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0018-Fix-compatibility-with-10.4.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # 2.21.0 has been tested on Tiger. Leopard may not need this patch,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # but we rather disable an extra module than have this broken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0019-Tiger-specific-adjustments-to-CMakeLists.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # To make sure OpenCL is not accidentally enabled.
</span>     configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DENABLE_LTO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DENABLE_LTO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DENABLE_OPENCL=OFF
</span> 
     # https://trac.macports.org/ticket/59917
     configure.cflags-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -F/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -F/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0001-gpu_apple.m-unbreak-for-10.11.patch b/sysutils/fastfetch/files/0001-gpu_apple.m-unbreak-for-10.11.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 89e66146b1e..f237abab6a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0001-gpu_apple.m-unbreak-for-10.11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0001-gpu_apple.m-unbreak-for-10.11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From cfe53c77d31534fca3a1b3a8b1d055542c6dcfa3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c33d7772762850674e7fea4b75d64982b7e72bae Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 00:54:02 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] gpu_apple.m: unbreak for < 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 01/19] gpu_apple.m: unbreak for < 10.11
</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;'>+ src/detection/gpu/gpu_apple.m | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span> 
 diff --git src/detection/gpu/gpu_apple.m src/detection/gpu/gpu_apple.m
 index e5b6bebf..314f83a3 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,3 +38,6 @@ index e5b6bebf..314f83a3 100644
</span> +#endif
      return "Metal API is not supported by this macOS version";
  }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0002-memory_apple-fix-for-32-bit.patch b/sysutils/fastfetch/files/0002-memory_apple-fix-for-32-bit.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index cbcaa6abeb5..d3ed4602346 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0002-memory_apple-fix-for-32-bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0002-memory_apple-fix-for-32-bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 27aef35a2f139b04e740c9c6472d847d3e34b27b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3d53d9e329075cd81cd760c2e6cdc645784b527a Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 00:58:05 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] memory_apple: fix for 32-bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 02/19] memory_apple: fix for 32-bit
</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;'>+ src/detection/memory/memory_apple.c | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 10 insertions(+)
</span> 
 diff --git src/detection/memory/memory_apple.c src/detection/memory/memory_apple.c
 index cabdab26..cdfdee12 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,3 +49,6 @@ index cabdab26..cdfdee12 100644
</span>      ) * instance.state.platform.sysinfo.pageSize;
  
      return NULL;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0003-opengl_apple.c-fix-for-10.7.patch b/sysutils/fastfetch/files/0003-opengl_apple.c-fix-for-10.7.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8aad6e4d5ff..709c0c2476a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0003-opengl_apple.c-fix-for-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0003-opengl_apple.c-fix-for-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 4c21619da789f9b83af7e3e5011635d9773b732d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cc76fa5e9bb52596c4aaf7752143c2e0a254f3db Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 01:01:30 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] opengl_apple.c: fix for < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 03/19] opengl_apple.c: fix for < 10.7
</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;'>+ src/detection/opengl/opengl_apple.c | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+), 1 deletion(-)
</span> 
 diff --git src/detection/opengl/opengl_apple.c src/detection/opengl/opengl_apple.c
 index c6b56f07..8c97eeda 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,3 +29,6 @@ index c6b56f07..8c97eeda 100644
</span>  void ffOpenGLHandleResult(FFOpenGLResult* result, __typeof__(&glGetString) ffglGetString);
  
  static const char* cglHandleContext(FFOpenGLResult* result, CGLContextObj context)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0004-sound_apple.c-fix-for-10.8.patch b/sysutils/fastfetch/files/0004-sound_apple.c-fix-for-10.8.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 237b362eb3e..8746d7ab620 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0004-sound_apple.c-fix-for-10.8.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0004-sound_apple.c-fix-for-10.8.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 051a65a36dabbb3eed29c72935056754a15e6f5f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 83818345c165fdec465c9b847fb899e8b79b166b Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 01:03:05 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] sound_apple.c: fix for < 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 04/19] sound_apple.c: fix for < 10.8
</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;'>+ src/detection/sound/sound_apple.c | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span> 
 diff --git src/detection/sound/sound_apple.c src/detection/sound/sound_apple.c
 index 22ecec2a..10646206 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,3 +23,6 @@ index 22ecec2a..10646206 100644
</span>  #ifndef MAC_OS_VERSION_12_0
  #define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
  #endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0005-monitor_apple.m-no-HDR-before-10.11.patch b/sysutils/fastfetch/files/0005-monitor_apple.m-no-HDR-before-10.11.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fecdb6b729..8d3efd15026 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0005-monitor_apple.m-no-HDR-before-10.11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0005-monitor_apple.m-no-HDR-before-10.11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 48d0ac753d8ce3a7c558ee1dd96a75c3d7c27665 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d3df0d80b4a121553ee52dbd280a2fd8addcbe4e Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 00:59:49 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] monitor_apple.m: no HDR before 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 05/19] monitor_apple.m: no HDR before 10.11
</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;'>+ src/detection/monitor/monitor_apple.m | 14 ++++++++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 10 insertions(+), 4 deletions(-)
</span> 
 diff --git src/detection/monitor/monitor_apple.m src/detection/monitor/monitor_apple.m
 index 2c4a1e3c..c0169c29 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,3 +49,6 @@ index 2c4a1e3c..c0169c29 100644
</span>      return false;
  }
  
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0006-gpu_apple.c-fix-for-old-systems.patch b/sysutils/fastfetch/files/0006-gpu_apple.c-fix-for-old-systems.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fd3ea42327f..c174225783b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0006-gpu_apple.c-fix-for-old-systems.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0006-gpu_apple.c-fix-for-old-systems.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d374667cfa14899533c4390839a77fa2e2cab725 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8daf1a861814da455d6bb8b4e4d4b4963f0fa11c Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 01:09:46 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] gpu_apple.c: fix for old systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 06/19] gpu_apple.c: fix for old systems
</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;'>+ src/detection/gpu/gpu_apple.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+)
</span> 
 diff --git src/detection/gpu/gpu_apple.c src/detection/gpu/gpu_apple.c
 index 1190a636..b6fb2721 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,3 +29,6 @@ index 1190a636..b6fb2721 100644
</span>          ffStrbufInitStatic(&gpu->platformApi, "Metal");
  
          ffStrbufInit(&gpu->driver); // Ok for both Apple and Intel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0007-camera_apple.m-unbreak-for-10.7.patch b/sysutils/fastfetch/files/0007-camera_apple.m-unbreak-for-10.7.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 83201157b49..d3d3c7e49c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0007-camera_apple.m-unbreak-for-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0007-camera_apple.m-unbreak-for-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9c1cb4a2055b6eb627b435c4a0a2579a1339334d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a86599b498e28357abedb68756dbb10573e62ba5 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 01:11:58 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] camera_apple.m: unbreak for < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 07/19] camera_apple.m: unbreak for < 10.7
</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;'>+ src/detection/camera/camera_apple.m | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span> 
 diff --git src/detection/camera/camera_apple.m src/detection/camera/camera_apple.m
 index ab15fb99..d30c4259 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,3 +23,6 @@ index ab15fb99..d30c4259 100644
</span>  
  // warning: 'AVCaptureDeviceTypeExternalUnknown' is deprecated
  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0008-brightness_apple.c-add-a-missing-include.patch b/sysutils/fastfetch/files/0008-brightness_apple.c-add-a-missing-include.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index bc9a8a6f07c..1396266ce4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0008-brightness_apple.c-add-a-missing-include.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0008-brightness_apple.c-add-a-missing-include.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 457aef63aec7f6bbf39fe7d8a420fec1573093e5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 61e7ee31cbc02725a0645f4133be23770d062864 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 01:24:23 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] brightness_apple.c: add a missing include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 08/19] brightness_apple.c: add a missing include
</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;'>+ src/detection/brightness/brightness_apple.c | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 1 deletion(-)
</span> 
 diff --git src/detection/brightness/brightness_apple.c src/detection/brightness/brightness_apple.c
 index a9f8daf0..688e1f1a 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,3 +24,6 @@ index a9f8daf0..688e1f1a 100644
</span>  extern void CGSServiceForDisplayNumber(CGDirectDisplayID display, io_service_t* service) __attribute__((weak_import));
  #endif
  
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0011-CMakeLists-adjust-for-legacy-macOS.patch b/sysutils/fastfetch/files/0009-CMakeLists-adjust-for-legacy-macOS.patch
</span>similarity index 93%
rename from sysutils/fastfetch/files/0011-CMakeLists-adjust-for-legacy-macOS.patch
rename to sysutils/fastfetch/files/0009-CMakeLists-adjust-for-legacy-macOS.patch
<span style='display:block; white-space:pre;color:#808080;'>index 61b30268072..1c4c66a2420 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0011-CMakeLists-adjust-for-legacy-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0009-CMakeLists-adjust-for-legacy-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 513f8b439cfd38a4d0bec246723a769c02d12e22 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d7413bac81ddce800ebb706e9e5ab76a15ce8d7c Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 01:36:58 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 11/15] CMakeLists: adjust for legacy macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 09/19] CMakeLists: adjust for legacy macOS
</span> 
 ---
  CMakeLists.txt | 36 ++++++++++++++----------------------
  1 file changed, 14 insertions(+), 22 deletions(-)
 
 diff --git CMakeLists.txt CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index db96fd6c..1d75f646 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 713ec814..f673977c 100644
</span> --- CMakeLists.txt
 +++ CMakeLists.txt
 @@ -111,10 +111,10 @@ else()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,12 +24,14 @@ index db96fd6c..1d75f646 100644
</span>  
  if(WIN32 OR ENABLE_DIRECTX_HEADERS)
      enable_language(CXX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -629,10 +629,10 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -629,11 +629,11 @@ elseif(APPLE)
</span>          src/common/sysctl.c
          src/detection/battery/battery_apple.c
          src/detection/bios/bios_apple.c
 -        src/detection/bluetooth/bluetooth_apple.m
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-        src/detection/bluetoothradio/bluetoothradio_apple.m
</span> +        src/detection/bluetooth/bluetooth_nosupport.c
<span style='display:block; white-space:pre;background:#e0ffe0;'>++        src/detection/bluetoothradio/bluetoothradio_nosupport.c
</span>          src/detection/board/board_apple.c
          src/detection/bootmgr/bootmgr_apple.c
 -        src/detection/brightness/brightness_apple.c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0009-Revert-refresh-rate-detection-commit-for-macOS.patch b/sysutils/fastfetch/files/0009-Revert-refresh-rate-detection-commit-for-macOS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 80c0cb17970..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0009-Revert-refresh-rate-detection-commit-for-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,88 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c45838ef0fe86afc70a787af52fdac67332e5136 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: Sun, 4 Aug 2024 02:32:59 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Revert refresh rate detection commit for macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/monitor/monitor.h src/detection/monitor/monitor.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4066f117..a6150e5d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/monitor/monitor.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/monitor/monitor.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,6 @@ typedef struct FFMonitorResult
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     FFstrbuf name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     uint32_t width; // native / maximum resolution, in pixels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     uint32_t height; // native / maximum resolution, in pixels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    double refreshRate;// maximum refresh rate in native resolution, in Hz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     uint32_t physicalWidth; // in mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     uint32_t physicalHeight; // in mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     bool hdrCompatible;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/monitor/monitor_apple.m src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c0169c29..c6219fe5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,19 +108,6 @@ const char* ffDetectMonitor(FFlist* results)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             detectHdrSupportWithNSScreen(display);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         monitor->serial = CGDisplaySerialNumber((CGDirectDisplayID) display->id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        FF_CFTYPE_AUTO_RELEASE CFArrayRef modes = CGDisplayCopyAllDisplayModes((CGDirectDisplayID) display->id, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        double maxRefreshRate = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        for (uint32_t j = 0; j < CFArrayGetCount(modes); ++j)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            CGDisplayModeRef mode = (CGDisplayModeRef) CFArrayGetValueAtIndex(modes, j);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            if (CGDisplayModeGetWidth(mode) == (uint32_t) width && CGDisplayModeGetHeight(mode) == (uint32_t) height)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                double refreshRate = CGDisplayModeGetRefreshRate(mode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                if (refreshRate > maxRefreshRate) maxRefreshRate = refreshRate;
</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;'>--        monitor->refreshRate = maxRefreshRate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         int64_t year, week;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if (ffCfDictGetInt64(displayInfo, CFSTR("DisplayYearManufacture"), &year) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             monitor->manufactureYear = (uint16_t) year;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/modules/monitor/monitor.c src/modules/monitor/monitor.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d83e3431..27d31cca 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/modules/monitor/monitor.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/modules/monitor/monitor.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FF_MONITOR_NUM_FORMAT_ARGS 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FF_MONITOR_NUM_FORMAT_ARGS 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void ffPrintMonitor(FFMonitorOptions* options)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,8 +53,6 @@ void ffPrintMonitor(FFMonitorOptions* options)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             printf("%ux%u px", display->width, display->height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            if (display->refreshRate > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                printf(" @ %.3f Hz", display->refreshRate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             if (inch > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 printf(" - %ux%u mm (%.2f inches, %.2f ppi)\n", display->physicalWidth, display->physicalHeight, inch, ppi);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,7 +80,6 @@ void ffPrintMonitor(FFMonitorOptions* options)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 {FF_FORMAT_ARG_TYPE_UINT16, &display->manufactureYear, "manufacture-year"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 {FF_FORMAT_ARG_TYPE_UINT16, &display->manufactureWeek, "manufacture-week"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 {FF_FORMAT_ARG_TYPE_STRING, buf, "serial"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                {FF_FORMAT_ARG_TYPE_DOUBLE, buf, "refresh-rate"},
</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;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,8 +154,6 @@ void ffGenerateMonitorJsonResult(FF_MAYBE_UNUSED FFMonitorOptions* options, yyjs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             yyjson_mut_obj_add_uint(doc, physical, "height", item->physicalHeight);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             yyjson_mut_obj_add_uint(doc, physical, "width", item->physicalWidth);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            yyjson_mut_obj_add_real(doc, obj, "refreshRate", item->refreshRate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             if (item->manufactureYear)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 yyjson_mut_val* manufactureDate = yyjson_mut_obj_add_obj(doc, obj, "manufactureDate");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -196,7 +191,6 @@ void ffPrintMonitorHelpFormat(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "Year of manufacturing - manufacture-year",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "Nth week of manufacturing in the year - manufacture-week",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "Serial number - serial",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        "Maximum refresh rate in Hz - refresh-rate",
</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;'>- 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0010-disk_bsd-minor-fix-for-a-type-fixes-calculation-of-d.patch b/sysutils/fastfetch/files/0010-disk_bsd-minor-fix-for-a-type-fixes-calculation-of-d.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cd4d2f97661..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0010-disk_bsd-minor-fix-for-a-type-fixes-calculation-of-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 73f4ce4e98799b4b882473f856fa4457717ef35b 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: Sun, 4 Aug 2024 19:51:30 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] disk_bsd: minor fix for a type, fixes calculation of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- disk usage on 32-bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/disk/disk_bsd.c src/detection/disk/disk_bsd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3046a357..81be9c83 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/disk/disk_bsd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/disk/disk_bsd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,7 +123,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         FFDisk* disk = ffListAdd(disks);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        disk->bytesTotal = fs->f_blocks * fs->f_bsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        disk->bytesTotal = (uint64_t)fs->f_blocks * fs->f_bsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         disk->bytesFree = (uint64_t)fs->f_bfree * fs->f_bsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         disk->bytesAvailable = (uint64_t)fs->f_bavail * fs->f_bsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         disk->bytesUsed = 0; // To be filled in ./disk.c
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0012-os_apple.m-etc.-fix-syntax-for-plists.patch b/sysutils/fastfetch/files/0010-os_apple.m-etc.-fix-syntax-for-plists.patch
</span>similarity index 93%
rename from sysutils/fastfetch/files/0012-os_apple.m-etc.-fix-syntax-for-plists.patch
rename to sysutils/fastfetch/files/0010-os_apple.m-etc.-fix-syntax-for-plists.patch
<span style='display:block; white-space:pre;color:#808080;'>index 9ccb1022921..4bdfe0e6e8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0012-os_apple.m-etc.-fix-syntax-for-plists.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0010-os_apple.m-etc.-fix-syntax-for-plists.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 85671c268f8fe64db8e6c199da57ca8d5ee81b32 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2d57a60f6bb0b8349febf13f183e208d8e1c83ee Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 01:39:51 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] os_apple.m etc.: fix syntax for plists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 10/19] os_apple.m etc.: fix syntax for plists
</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;'>+ src/detection/cursor/cursor_apple.m           | 10 +------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/os/os_apple.m                   | 22 ++++++---------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../terminalfont/terminalfont_apple.m         | 28 ++++---------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/wmtheme/wmtheme_apple.m         | 10 +------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 18 insertions(+), 54 deletions(-)
</span> 
 diff --git CMakeLists.txt CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1d75f646..2cda6f53 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f673977c..9789682b 100644
</span> --- CMakeLists.txt
 +++ CMakeLists.txt
 @@ -638,7 +638,7 @@ elseif(APPLE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,3 +166,6 @@ index 08810b6c..b78acac0 100644
</span>  
      NSNumber* wmThemeColor = [dict valueForKey:@"AppleAccentColor"];
      if(!wmThemeColor)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0013-osascript.m-fix-syntax.patch b/sysutils/fastfetch/files/0011-osascript.m-fix-syntax.patch
</span>similarity index 83%
rename from sysutils/fastfetch/files/0013-osascript.m-fix-syntax.patch
rename to sysutils/fastfetch/files/0011-osascript.m-fix-syntax.patch
<span style='display:block; white-space:pre;color:#808080;'>index 3900a6db8b3..52212562b54 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0013-osascript.m-fix-syntax.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0011-osascript.m-fix-syntax.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d5f0c1f2b2ff7583ef8748daf9f0f419aa558958 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2c46701fc1b29539a27d515fc5bcf5791c450638 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 01:38:18 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] osascript.m: fix syntax
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 11/19] osascript.m: fix syntax
</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;'>+ src/util/apple/osascript.m | 14 +++++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 7 insertions(+), 7 deletions(-)
</span> 
 diff --git src/util/apple/osascript.m src/util/apple/osascript.m
 index 8b01ba06..ddef3407 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,3 +36,6 @@ index 8b01ba06..ddef3407 100644
</span> +    ffStrbufSetS(result, [[descriptor stringValue] cStringUsingEncoding:NSUTF8StringEncoding]);
      return true;
  }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0015-Fix-PowerPC-macros.patch b/sysutils/fastfetch/files/0012-Fix-PowerPC-macros.patch
</span>similarity index 82%
rename from sysutils/fastfetch/files/0015-Fix-PowerPC-macros.patch
rename to sysutils/fastfetch/files/0012-Fix-PowerPC-macros.patch
<span style='display:block; white-space:pre;color:#808080;'>index b2ae049be87..79fb9f9b09d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0015-Fix-PowerPC-macros.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0012-Fix-PowerPC-macros.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 623bcc5045ee78e8759dd34a672d5702c8dc30c4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e5105c4879d68a83ec80e2534275f549ac136b30 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 10:12:44 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix PowerPC macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 12/19] Fix PowerPC macros
</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;'>+ src/3rdparty/yyjson/yyjson.c    | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/version/version.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 2 insertions(+), 2 deletions(-)
</span> 
 diff --git src/3rdparty/yyjson/yyjson.c src/3rdparty/yyjson/yyjson.c
 index 16ecbacf..298a56c0 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,3 +34,6 @@ index b6d6e7d7..7d456313 100644
</span>      #define FF_ARCHITECTURE "powerpc"
  #elif defined(__riscv__) || defined(__riscv)
      #define FF_ARCHITECTURE "riscv"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0016-Fix-autorelease-pools.patch b/sysutils/fastfetch/files/0013-Fix-autorelease-pools.patch
</span>similarity index 91%
rename from sysutils/fastfetch/files/0016-Fix-autorelease-pools.patch
rename to sysutils/fastfetch/files/0013-Fix-autorelease-pools.patch
<span style='display:block; white-space:pre;color:#808080;'>index ec762a50ba1..84345c1b8f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0016-Fix-autorelease-pools.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0013-Fix-autorelease-pools.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c64f0ca14193f2b2dae5a153637ed83008deafbc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9f4858efed755fd870b1750b89059038743e4edb Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 10:56:00 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix autorelease pools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 13/19] Fix autorelease pools
</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;'>+ src/detection/bluetooth/bluetooth_apple.m | 14 ++++++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/camera/camera_apple.m       |  2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/cursor/cursor_apple.m       | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/font/font_apple.m           | 14 ++++++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/gpu/gpu_apple.m             | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/monitor/monitor_apple.m     | 14 ++++++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/os/os_apple.m               | 12 +++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/wmtheme/wmtheme_apple.m     | 11 +++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/util/apple/osascript.h                | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/util/apple/osascript.m                |  2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10 files changed, 93 insertions(+), 9 deletions(-)
</span> 
 diff --git src/detection/bluetooth/bluetooth_apple.m src/detection/bluetooth/bluetooth_apple.m
 index abd31a0c..f983e46b 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,7 +169,7 @@ index 314f83a3..b72c289c 100644
</span>      }
  #endif
 diff --git src/detection/monitor/monitor_apple.m src/detection/monitor/monitor_apple.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f2bd2245..3e4c9f36 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c0169c29..da9f41f4 100644
</span> --- src/detection/monitor/monitor_apple.m
 +++ src/detection/monitor/monitor_apple.m
 @@ -8,6 +8,14 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,7 +210,7 @@ index f2bd2245..3e4c9f36 100644
</span>      #ifdef MAC_OS_X_VERSION_10_15
      if(!CoreDisplay_DisplayCreateInfoDictionary) return "CoreDisplay_DisplayCreateInfoDictionary is not available";
      #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -115,6 +125,6 @@ const char* ffDetectMonitor(FFlist* results)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,6 +137,6 @@ const char* ffDetectMonitor(FFlist* results)
</span>          if (ffCfDictGetInt64(displayInfo, CFSTR("DisplayWeekManufacture"), &week) == NULL)
              monitor->manufactureWeek = (uint16_t) week;
      }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,3 +326,6 @@ index ddef3407..ebe9ae8e 100644
</span> +    POOLEND
      return true;
  }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0017-disk_bsd-no-support-for-creation-time.patch b/sysutils/fastfetch/files/0014-disk_bsd-no-support-for-creation-time.patch
</span>similarity index 81%
rename from sysutils/fastfetch/files/0017-disk_bsd-no-support-for-creation-time.patch
rename to sysutils/fastfetch/files/0014-disk_bsd-no-support-for-creation-time.patch
<span style='display:block; white-space:pre;color:#808080;'>index 18514276454..acd1f3feca6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0017-disk_bsd-no-support-for-creation-time.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0014-disk_bsd-no-support-for-creation-time.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b425aae0e3f0c1211a267432018e1cfb58481911 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 826c21bbe178607e269ead70b4e31bfcb800b265 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 19:58:34 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] disk_bsd: no support for creation time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 14/19] disk_bsd: no support for creation time
</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;'>+ src/detection/disk/disk_bsd.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+)
</span> 
 diff --git src/detection/disk/disk_bsd.c src/detection/disk/disk_bsd.c
 index 81be9c83..4c35f50c 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,3 +31,6 @@ index 81be9c83..4c35f50c 100644
</span>      }
  
      return NULL;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0018-Support-PowerPC-CPU-detection.patch b/sysutils/fastfetch/files/0015-Support-PowerPC-CPU-detection.patch
</span>similarity index 87%
rename from sysutils/fastfetch/files/0018-Support-PowerPC-CPU-detection.patch
rename to sysutils/fastfetch/files/0015-Support-PowerPC-CPU-detection.patch
<span style='display:block; white-space:pre;color:#808080;'>index 8a3302b9040..89fd997c08a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0018-Support-PowerPC-CPU-detection.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0015-Support-PowerPC-CPU-detection.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 795f8322794e1d7b3765e24fee44539c56e8fe12 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b00b8558a516d3a4eaf1cf07fccbc3e05f8e86e9 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
 Date: Sun, 4 Aug 2024 21:05:10 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Support PowerPC CPU detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 15/19] Support PowerPC CPU detection
</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;'>+ src/detection/cpu/cpu.c       |  3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/cpu/cpu_apple.c | 11 +++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 14 insertions(+)
</span> 
 diff --git src/detection/cpu/cpu.c src/detection/cpu/cpu.c
 index 68d23ac8..b491d3c7 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,3 +50,6 @@ index efdad950..6ec776f6 100644
</span>  
      cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.physicalcpu_max", 1);
      if(cpu->coresPhysical == 1)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0016-Support-hostinfo-for-PowerPC-Macs.patch b/sysutils/fastfetch/files/0016-Support-hostinfo-for-PowerPC-Macs.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4735bf43b04
</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/0016-Support-hostinfo-for-PowerPC-Macs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,77 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c12d5784603bc222f48fb1866b1ef37352207aed Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 6 Aug 2024 01:28:18 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 16/19] Support hostinfo for PowerPC Macs
</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;'>+ src/detection/host/host_apple.c | 54 +++++++++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 54 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/detection/host/host_apple.c src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 61a14e64..efc15ab5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,6 +166,60 @@ static const char* getProductNameWithHwModel(const FFstrbuf* hwModel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if(ffStrEquals(version, "10,1"))        return "iMac (27/21.5-inch, Late 2009)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if(ffStrEquals(version, "9,1"))         return "iMac (24/20-inch, Early 2009)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    else if(ffStrbufStartsWithS(hwModel, "PowerBook"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        const char* version = hwModel->chars + strlen("PowerBook");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "3,2"))         return "PowerBook G4 (Original - Ti)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "3,3"))         return "PowerBook G4 (Gigabit - Ti)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "3,4"))         return "PowerBook G4 (DVI - Ti)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "3,5"))         return "PowerBook G4 (Ti)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "4,1") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "4,2") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "4,3"))         return "iBook G3";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "5,1") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "5,3") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "5,4") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "5,5") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "5,6") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "5,7") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "6,1") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "6,4") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "6,8"))         return "PowerBook G4 (17/15/12-inch, Al)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "5,2"))         return "PowerBook G4 (15-inch, FW800 - Al)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "5,8") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "5,9"))         return "PowerBook G4 (17/15-inch, DLSD/HR - Al)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "6,2"))         return "PowerBook G4 (12-inch, DVI - Al)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "6,3") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "6,5") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "6,7"))         return "iBook G4 (14/12-inch)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    else if(ffStrbufStartsWithS(hwModel, "PowerMac"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        const char* version = hwModel->chars + strlen("PowerMac");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "1,1"))         return "Power Macintosh G3 (Blue & White)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "1,2"))         return "Power Macintosh G4 (PCI)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "2,1") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "2,2") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "4,1"))         return "iMac G3";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "3,1"))         return "Power Macintosh G4 (AGP)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "3,3"))         return "Power Macintosh G4 (Gigabit)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "3,4"))         return "Power Macintosh G4 (Digital Audio)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "3,5"))         return "Power Macintosh G4 (Quicksilver)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "3,6"))         return "Power Macintosh G4 (MDD/FW800)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "4,2"))         return "iMac G4 (Flat Panel)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "4,4") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "6,4"))         return "eMac G4";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "4,5") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "6,1"))         return "iMac G4 (17-inch, Flat Panel)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "5,1"))         return "Power Macintosh G4 Cube";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "6,3"))         return "iMac G4 (20/17/15-inch, USB 2.0)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "7,2") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           ffStrEquals(version, "7,3"))         return "Power Macintosh G5 (PCI/PCI-X)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "8,1"))         return "iMac G5 (20/17-inch)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "8,2"))         return "iMac G5 (20/17-inch, ALS)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "11,2"))        return "Power Macintosh G5";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(ffStrEquals(version, "12,1"))        return "iMac G5 (20/17-inch, iSight)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     return NULL;
</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;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0014-Revert-some-display-related-breakages.patch b/sysutils/fastfetch/files/0017-Revert-some-breakages.patch
</span>similarity index 75%
rename from sysutils/fastfetch/files/0014-Revert-some-display-related-breakages.patch
rename to sysutils/fastfetch/files/0017-Revert-some-breakages.patch
<span style='display:block; white-space:pre;color:#808080;'>index f12af408e95..1ad1111e052 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0014-Revert-some-display-related-breakages.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0017-Revert-some-breakages.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f6061f58992f50e0897edcbe7a405482f952b3f4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 26ed419ce4220362012b9f6d39c9f45142154955 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 4 Aug 2024 05:41:15 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Revert some display-related breakages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 6 Aug 2024 03:26:01 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 17/19] Revert some breakages
</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;'>+ src/detection/displayserver/displayserver.c   |  36 +++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/displayserver/displayserver.h   |  15 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../displayserver/displayserver_apple.c       | 139 +++++++-----------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/font/font_apple.m               |   1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/monitor/monitor.h               |   1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/monitor/monitor_apple.m         |  18 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/modules/display/display.c                 |  64 ++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/modules/monitor/monitor.c                 |   8 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8 files changed, 98 insertions(+), 184 deletions(-)
</span> 
 diff --git src/detection/displayserver/displayserver.c src/detection/displayserver/displayserver.c
 index 73f1cd0c..20a36623 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,9 +118,9 @@ index aa0bd900..ffe46466 100644
</span> +    uint64_t id);
 diff --git src/detection/displayserver/displayserver_apple.c src/detection/displayserver/displayserver_apple.c
 index d2e87ecf..7402ea1a 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/displayserver/displayserver_apple.c.orig      2024-07-26 10:27:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/displayserver/displayserver_apple.c      2024-08-04 11:11:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,117 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/detection/displayserver/displayserver_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/detection/displayserver/displayserver_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,111 +1,78 @@
</span>  #include "displayserver.h"
  #include "util/apple/cf_helpers.h"
 -#include "util/stringUtils.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,7 +182,11 @@ index d2e87ecf..7402ea1a 100644
</span> -        {
 -            //https://github.com/glfw/glfw/commit/aab08712dd8142b642e2042e7b7ba563acd07a45
 -            double refreshRate = CGDisplayModeGetRefreshRate(mode);
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        int modeID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        CGSGetCurrentDisplayMode(screens[i], &modeID);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        modes_D4 mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        CGSGetDisplayModeDescriptionOfLength(screens[i], modeID, &mode, 0xD4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span> -            if (refreshRate == 0)
 -            {
 -                CVDisplayLinkRef link;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +194,7 @@ index d2e87ecf..7402ea1a 100644
</span> -                {
 -                    const CVTime time = CVDisplayLinkGetNominalOutputVideoRefreshPeriod(link);
 -                    if (!(time.flags & kCVTimeIsIndefinite))
<span style='display:block; white-space:pre;background:#ffe0e0;'>--                        refreshRate = time.timeScale / (double) time.timeValue + 0.5; //59.97...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                        refreshRate = time.timeScale / (double) time.timeValue; //59.97...
</span> -                    CVDisplayLinkRelease(link);
 -                }
 -            }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -228,30 +243,19 @@ index d2e87ecf..7402ea1a 100644
</span> -            );
 -            if (display)
 -            {
<span style='display:block; white-space:pre;background:#ffe0e0;'>--                // Shitty code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                uint8_t bitDepth = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                FF_CFTYPE_AUTO_RELEASE CFStringRef desc = CFCopyDescription(mode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                CFRange start = CFStringFind(desc, CFSTR("BitsPerSample = "), 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                if (start.location != kCFNotFound)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                // https://stackoverflow.com/a/33519316/9976392
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                // Also shitty, but better than parsing `CFCopyDescription(mode)`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                CFDictionaryRef dict = (CFDictionaryRef) *((int64_t *)mode + 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                if (CFGetTypeID(dict) == CFDictionaryGetTypeID())
</span> -                {
<span style='display:block; white-space:pre;background:#ffe0e0;'>--                    for (CFIndex idx = start.location + start.length; idx < CFStringGetLength(desc); ++idx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        UniChar ch = CFStringGetCharacterAtIndex(desc, idx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        if (!ffCharIsDigit((char) ch))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                            break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        bitDepth = (uint8_t) (bitDepth * 10 + (ch - '0'));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    int32_t bitDepth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    ffCfDictGetInt(dict, kCGDisplayBitsPerSample, &bitDepth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    display->bitDepth = (uint8_t) bitDepth;
</span> -                }
<span style='display:block; white-space:pre;background:#ffe0e0;'>--                display->bitDepth = bitDepth;
</span> -            }
 -            CGDisplayModeRelease(mode);
 -        }
 -        CGDisplayRelease(screen);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+        int modeID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        CGSGetCurrentDisplayMode(screens[i], &modeID);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        modes_D4 mode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        CGSGetDisplayModeDescriptionOfLength(screens[i], modeID, &mode, 0xD4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +        double refreshRate = ffdsParseRefreshRate(mode.derived.freq);
 +        ffdsAppendDisplay(ds,
 +            mode.derived.width,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,17 +285,53 @@ index d2e87ecf..7402ea1a 100644
</span>          if (port)
          {
              ffStrbufSetStatic(&ds->wmProcessName, "WindowServer");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/detection/font/font_apple.m src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 618d1287..06920e31 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,6 +2,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "common/io/io.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "font.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Foundation/Foundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AppKit/NSFont.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;'>+diff --git src/detection/monitor/monitor.h src/detection/monitor/monitor.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4066f117..a6150e5d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/detection/monitor/monitor.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/detection/monitor/monitor.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,6 @@ typedef struct FFMonitorResult
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     FFstrbuf name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     uint32_t width; // native / maximum resolution, in pixels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     uint32_t height; // native / maximum resolution, in pixels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    double refreshRate;// maximum refresh rate in native resolution, in Hz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     uint32_t physicalWidth; // in mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     uint32_t physicalHeight; // in mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     bool hdrCompatible;
</span> diff --git src/detection/monitor/monitor_apple.m src/detection/monitor/monitor_apple.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c6219fe5..f2bd2245 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index da9f41f4..3e4c9f36 100644
</span> --- src/detection/monitor/monitor_apple.m
 +++ src/detection/monitor/monitor_apple.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,9 +106,10 @@ const char* ffDetectMonitor(FFlist* results)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,22 +116,10 @@ const char* ffDetectMonitor(FFlist* results)
</span>          monitor->physicalHeight = (uint32_t) (size.height + 0.5);
          monitor->hdrCompatible = CFDictionaryContainsKey(displayInfo, CFSTR("ReferencePeakHDRLuminance")) ||
              detectHdrSupportWithNSScreen(display);
 -        monitor->serial = CGDisplaySerialNumber((CGDirectDisplayID) display->id);
  
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-        FF_CFTYPE_AUTO_RELEASE CFArrayRef modes = CGDisplayCopyAllDisplayModes((CGDirectDisplayID) display->id, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        double maxRefreshRate = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        for (uint32_t j = 0; j < CFArrayGetCount(modes); ++j)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            CGDisplayModeRef mode = (CGDisplayModeRef) CFArrayGetValueAtIndex(modes, j);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            if (CGDisplayModeGetWidth(mode) == (uint32_t) width && CGDisplayModeGetHeight(mode) == (uint32_t) height)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                double refreshRate = CGDisplayModeGetRefreshRate(mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                if (refreshRate > maxRefreshRate) maxRefreshRate = refreshRate;
</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;'>+-        monitor->refreshRate = maxRefreshRate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -        int64_t year, week;
 +        int64_t serial, year, week;
 +        if (ffCfDictGetInt64(displayInfo, CFSTR("DisplaySerialNumber"), &serial) == NULL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,7 +340,7 @@ index c6219fe5..f2bd2245 100644
</span>              monitor->manufactureYear = (uint16_t) year;
          if (ffCfDictGetInt64(displayInfo, CFSTR("DisplayWeekManufacture"), &week) == NULL)
 diff --git src/modules/display/display.c src/modules/display/display.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d89a042a..008f4ce6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d89a042a..7e18c0c9 100644
</span> --- src/modules/display/display.c
 +++ src/modules/display/display.c
 @@ -4,9 +4,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,16 +354,7 @@ index d89a042a..008f4ce6 100644
</span>  
  static int sortByNameAsc(FFDisplayResult* a, FFDisplayResult* b)
  {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,55 +89,42 @@ void ffPrintDisplay(FFDisplayOptions* options)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 4, ((FFformatarg[]){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 {FF_FORMAT_ARG_TYPE_UINT, &moduleIndex, "index"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 {FF_FORMAT_ARG_TYPE_STRBUF, &result->name, "name"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 {FF_FORMAT_ARG_TYPE_STRING, displayType, "type"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,47 +97,35 @@ void ffPrintDisplay(FFDisplayOptions* options)
</span>              }));
          }
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -378,7 +409,7 @@ index d89a042a..008f4ce6 100644
</span>              FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISPLAY_NUM_FORMAT_ARGS, ((FFformatarg[]) {
                  {FF_FORMAT_ARG_TYPE_UINT, &result->width, "width"},
                  {FF_FORMAT_ARG_TYPE_UINT, &result->height, "height"},
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -150,13 +135,6 @@ void ffPrintDisplay(FFDisplayOptions* options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,13 +136,6 @@ void ffPrintDisplay(FFDisplayOptions* options)
</span>                  {FF_FORMAT_ARG_TYPE_STRING, displayType, "type"},
                  {FF_FORMAT_ARG_TYPE_UINT, &result->rotation, "rotation"},
                  {FF_FORMAT_ARG_TYPE_BOOL, &result->primary, "is-primary"},
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -392,7 +423,7 @@ index d89a042a..008f4ce6 100644
</span>              }));
          }
      }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,28 +284,15 @@ void ffGenerateDisplayJsonResult(FF_MAYBE_UNUSED FFDisplayOptions* options, yyjs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,27 +285,15 @@ void ffGenerateDisplayJsonResult(FF_MAYBE_UNUSED FFDisplayOptions* options, yyjs
</span>      FF_LIST_FOR_EACH(FFDisplayResult, item, dsResult->displays)
      {
          yyjson_mut_val* obj = yyjson_mut_arr_add_obj(doc, arr);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -419,13 +450,12 @@ index d89a042a..008f4ce6 100644
</span> -        yyjson_mut_obj_add_uint(doc, obj, "bitDepth", item->bitDepth);
 -        yyjson_mut_obj_add_bool(doc, obj, "hdrEnabled", item->hdrEnabled);
 -        yyjson_mut_obj_add_bool(doc, obj, "wcgEnabled", item->wcgEnabled);
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span> +        yyjson_mut_obj_add_uint(doc, obj, "scaledHeight", item->scaledHeight);
 +        yyjson_mut_obj_add_uint(doc, obj, "scaledWidth", item->scaledWidth);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span>          switch (item->type)
          {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-             case FF_DISPLAY_TYPE_BUILTIN:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -355,13 +320,6 @@ void ffPrintDisplayHelpFormat(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -355,13 +322,6 @@ void ffPrintDisplayHelpFormat(void)
</span>          "Screen type (builtin, external or unknown) - type",
          "Screen rotation (in degrees) - rotation",
          "True if being the primary screen - is-primary",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -439,3 +469,53 @@ index d89a042a..008f4ce6 100644
</span>      }));
  }
  
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/modules/monitor/monitor.c src/modules/monitor/monitor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6fdd53eb..27d31cca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/monitor/monitor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/monitor/monitor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define FF_MONITOR_NUM_FORMAT_ARGS 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FF_MONITOR_NUM_FORMAT_ARGS 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void ffPrintMonitor(FFMonitorOptions* options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,8 +53,6 @@ void ffPrintMonitor(FFMonitorOptions* options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             printf("%ux%u px", display->width, display->height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            if (display->refreshRate > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                printf(" @ %g Hz", ((int) (display->refreshRate * 1000 + 0.5)) / 1000.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             if (inch > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 printf(" - %ux%u mm (%.2f inches, %.2f ppi)\n", display->physicalWidth, display->physicalHeight, inch, ppi);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +80,6 @@ void ffPrintMonitor(FFMonitorOptions* options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 {FF_FORMAT_ARG_TYPE_UINT16, &display->manufactureYear, "manufacture-year"},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 {FF_FORMAT_ARG_TYPE_UINT16, &display->manufactureWeek, "manufacture-week"},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 {FF_FORMAT_ARG_TYPE_STRING, buf, "serial"},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                {FF_FORMAT_ARG_TYPE_DOUBLE, buf, "refresh-rate"},
</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;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,8 +154,6 @@ void ffGenerateMonitorJsonResult(FF_MAYBE_UNUSED FFMonitorOptions* options, yyjs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             yyjson_mut_obj_add_uint(doc, physical, "height", item->physicalHeight);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             yyjson_mut_obj_add_uint(doc, physical, "width", item->physicalWidth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            yyjson_mut_obj_add_real(doc, obj, "refreshRate", item->refreshRate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             if (item->manufactureYear)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 yyjson_mut_val* manufactureDate = yyjson_mut_obj_add_obj(doc, obj, "manufactureDate");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,7 +191,6 @@ void ffPrintMonitorHelpFormat(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "Year of manufacturing - manufacture-year",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "Nth week of manufacturing in the year - manufacture-week",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "Serial number - serial",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        "Maximum refresh rate in Hz - refresh-rate",
</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;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0018-Fix-compatibility-with-10.4.patch b/sysutils/fastfetch/files/0018-Fix-compatibility-with-10.4.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..374f5e49518
</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/0018-Fix-compatibility-with-10.4.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,169 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b1b50f6a1ab1349b0a19ddf2b70f9a48345fab0c 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: Tue, 6 Aug 2024 03:52:56 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 18/19] Fix compatibility with 10.4
</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;'>+ src/common/processing_linux.c                   | 8 ++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/host/host_apple.c                 | 4 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/memory/memory_apple.c             | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/temps/temps_apple.c               | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/terminalfont/terminalfont_apple.m | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/util/platform/FFPlatform_unix.c             | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6 files changed, 22 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/common/processing_linux.c src/common/processing_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af3f4ebf..b2b1d6fa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/common/processing_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/common/processing_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    #include <libproc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      #include <libproc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__sun)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #include <procfs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,6 +188,7 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ffStrbufSetS(exe, arg0);
</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;'>++    #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 // No proc_pidpath on 10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ffStrbufEnsureFixedLengthFree(exe, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,7 +200,7 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 ffStrbufSet(exePath, exe);
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #elif defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     size_t size = ARG_MAX;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/detection/host/host_apple.c src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index efc15ab5..10fd867c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,6 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "util/stringUtils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOKit/IOKitLib.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;'>+ static const char* getProductNameWithHwModel(const FFstrbuf* hwModel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,6 +239,7 @@ const char* getProductNameWithIokit(FFstrbuf* result)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* getOthersByIokit(FFHostResult* host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t registryEntry = IOServiceGetMatchingService(MACH_PORT_NULL, IOServiceMatching("IOPlatformExpertDevice"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (!registryEntry)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return "IOServiceGetMatchingService() failed";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,7 +255,7 @@ const char* getOthersByIokit(FFHostResult* host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     FF_CFTYPE_AUTO_RELEASE CFStringRef manufacturer = IORegistryEntryCreateCFProperty(registryEntry, CFSTR("manufacturer"), kCFAllocatorDefault, kNilOptions);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (manufacturer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ffCfStrGetString(manufacturer, &host->vendor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     return NULL;
</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;'>+diff --git src/detection/memory/memory_apple.c src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cdfdee12..23ce20dc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,9 @@ const char* ffDetectMemory(FFMemoryResult* ram)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ram->bytesUsed = ((uint64_t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         + vmstat.active_count
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         + vmstat.inactive_count
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         + vmstat.speculative_count
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         + vmstat.wire_count
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         + vmstat.compressor_page_count
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/detection/temps/temps_apple.c src/detection/temps/temps_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c4cef782..0fea5a84 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/detection/temps/temps_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/detection/temps/temps_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOKit/IOKitLib.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;'>+ static const char kSmcCmdReadBytes = 5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char kSmcCmdReadKeyInfo = 9;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +88,9 @@ static const char *smcCall(io_connect_t conn, uint32_t selector, SmcKeyData_t *i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     size_t size = sizeof(SmcKeyData_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (IOConnectCallStructMethod(conn, selector, inputStructure, size, outputStructure, &size) != kIOReturnSuccess)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return "IOConnectCallStructMethod(conn) failed";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/detection/terminalfont/terminalfont_apple.m src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 96917199..b3f50ffa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#import <Foundation/Foundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Foundation/Foundation.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;'>+ static void detectIterm2(FFTerminalFontResult* terminalFont)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,6 +19,7 @@ static void detectIterm2(FFTerminalFontResult* terminalFont)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:[NSHomeDirectory() stringByAppendingPathComponent:@"/Library/Preferences/com.googlecode.iterm2.plist"]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 // This chunk of code breaks linkage on 10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     for(NSDictionary* bookmark in [dict valueForKey:@"New Bookmarks"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if(![[bookmark valueForKey:@"Name"] isEqualToString:[NSString stringWithUTF8String:profile]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +42,7 @@ static void detectIterm2(FFTerminalFontResult* terminalFont)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</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;background:#e0ffe0;'>+     ffStrbufAppendF(&terminalFont->error, "find profile `%s` bookmark failed", profile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/util/platform/FFPlatform_unix.c src/util/platform/FFPlatform_unix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b442eed5..8cac81f2 100644
</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/platform/FFPlatform_unix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <paths.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #include <libproc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +25,7 @@ static void getExePath(FFPlatform* platform)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #ifdef __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ssize_t exePathLen = readlink("/proc/self/exe", exePath, sizeof(exePath) - 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         exePath[exePathLen] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         int exePathLen = proc_pidpath((int) getpid(), exePath, sizeof(exePath));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #elif defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         size_t exePathLen = sizeof(exePath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</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/0019-Tiger-specific-adjustments-to-CMakeLists.patch b/sysutils/fastfetch/files/0019-Tiger-specific-adjustments-to-CMakeLists.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ac3edc78468
</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/0019-Tiger-specific-adjustments-to-CMakeLists.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From fbd8a8e7a561b541c645402a8bc438e0d1b7fecb 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: Tue, 6 Aug 2024 05:54:30 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 19/19] Tiger-specific adjustments to CMakeLists
</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 | 5 ++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 9789682b..7ec8ff75 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -627,7 +627,7 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/common/networking_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/common/processing_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/common/sysctl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        src/detection/battery/battery_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        src/detection/battery/battery_nosupport.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/detection/bios/bios_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/detection/bluetooth/bluetooth_nosupport.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/detection/bluetoothradio/bluetoothradio_nosupport.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -641,7 +641,7 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/detection/cursor/cursor_nosupport.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/detection/disk/disk_bsd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/detection/dns/dns_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        src/detection/physicaldisk/physicaldisk_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        src/detection/physicaldisk/physicaldisk_nosupport.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/detection/physicalmemory/physicalmemory_nosupport.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/detection/diskio/diskio_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         src/detection/displayserver/displayserver_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1096,7 +1096,6 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         PRIVATE "-framework Cocoa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         PRIVATE "-framework CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         PRIVATE "-framework CoreAudio"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE "-framework CoreMedia"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         PRIVATE "-framework CoreVideo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         PRIVATE "-framework IOBluetooth"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         PRIVATE "-framework IOKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>

</pre>