<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/14eb6eb508037f116f5c5edc5992361416f179ac">https://github.com/macports/macports-ports/commit/14eb6eb508037f116f5c5edc5992361416f179ac</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 14eb6eb5080 fastfetch: update to 2.21.3 for legacy systems
</span>14eb6eb5080 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 14eb6eb508037f116f5c5edc5992361416f179ac
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Aug 16 00:18:59 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> fastfetch: update to 2.21.3 for legacy systems
</span>---
sysutils/fastfetch/Portfile | 58 +++---
...> 0001-Support-hostinfo-for-PowerPC-Macs.patch} | 10 +-
...version.c-add-a-missing-macro-for-powerpc.patch | 25 +++
.../files/0003-Support-PowerPC-CPU-detection.patch | 70 +++++++
...ch => 0004-gpu_apple.m-unbreak-for-10.11.patch} | 10 +-
...atch => 0005-memory_apple-fix-for-32-bit.patch} | 10 +-
.../0005-monitor_apple.m-no-HDR-before-10.11.patch | 54 ------
...atch => 0006-opengl_apple.c-fix-for-10.7.patch} | 10 +-
...patch => 0007-sound_apple.c-fix-for-10.8.patch} | 10 +-
... => 0008-gpu_apple.c-fix-for-old-systems.patch} | 10 +-
... => 0009-camera_apple.m-unbreak-for-10.7.patch} | 10 +-
...brightness_apple.c-add-a-missing-include.patch} | 10 +-
...11-os_apple.m-etc.-fix-syntax-for-plists.patch} | 38 ++--
.../fastfetch/files/0012-Fix-PowerPC-macros.patch | 39 ----
...tax.patch => 0012-osascript.m-fix-syntax.patch} | 10 +-
...13-disk_bsd-no-support-for-creation-time.patch} | 10 +-
.../files/0014-yyjson-PowerPC-macros.patch | 25 +++
.../files/0015-Support-PowerPC-CPU-detection.patch | 55 ------
.../0015-monitor_apple.m-no-HDR-before-10.11.patch | 46 +++++
...ools.patch => 0016-Fix-autorelease-pools.patch} | 212 ++++++++-------------
... 0017-CMakeLists-adjust-for-legacy-macOS.patch} | 26 +--
.../files/0018-Fix-compatibility-with-10.4.patch | 38 ++--
...ages.patch => 0019-Revert-some-breakages.patch} | 154 +++++++--------
...Tiger-specific-adjustments-to-CMakeLists.patch} | 9 +-
24 files changed, 451 insertions(+), 498 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 30436d5eb9f..93e4003fa37 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;'>@@ -51,44 +51,50 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> # but since rebasing may be non-trivial,
# we keep a dedicated case for older OS
# to avoid potential breakages on every update.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup fastfetch-cli fastfetch 2.21.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup fastfetch-cli fastfetch 2.21.3
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 a9567e0c0773714b049e04783d2ba3cc4a179417 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 21d085a612b6bd9ab0f4e7bffe2632e313e6f67d432251cfd5a7f877b7194733 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1086262
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 db69b939835aeb5a2ff0caf1548495f903a1d16d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cec1f126ade7a5ef971901b1cdbe79f5864523d7a0a92732991619485d13e2e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1093534
</span>
maintainers-append \
{@barracuda156 gmail.com:vital.had}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Every update is tested on 10.6 for ppc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 2.21.0 has also been tested on 10.4–10.5.
</span>
# https://github.com/fastfetch-cli/fastfetch/issues/942
# https://github.com/fastfetch-cli/fastfetch/issues/943
# https://github.com/fastfetch-cli/fastfetch/issues/944
# https://github.com/fastfetch-cli/fastfetch/issues/1148
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args-replace -p0 -p1
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-gpu_apple.m-unbreak-for-10.11.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-memory_apple-fix-for-32-bit.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-opengl_apple.c-fix-for-10.7.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-sound_apple.c-fix-for-10.8.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0005-monitor_apple.m-no-HDR-before-10.11.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0006-gpu_apple.c-fix-for-old-systems.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0007-camera_apple.m-unbreak-for-10.7.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0008-brightness_apple.c-add-a-missing-include.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0009-CMakeLists-adjust-for-legacy-macOS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0010-os_apple.m-etc.-fix-syntax-for-plists.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0011-osascript.m-fix-syntax.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0012-Fix-PowerPC-macros.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0013-Fix-autorelease-pools.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0014-disk_bsd-no-support-for-creation-time.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0015-Support-PowerPC-CPU-detection.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0016-Support-hostinfo-for-PowerPC-Macs.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0017-Revert-some-breakages.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0018-Fix-compatibility-with-10.4.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 2.21.0 has been tested on Tiger. Leopard may not need this patch,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # but we rather disable an extra module than have this broken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-Support-hostinfo-for-PowerPC-Macs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-version.c-add-a-missing-macro-for-powerpc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Support-PowerPC-CPU-detection.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-gpu_apple.m-unbreak-for-10.11.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-memory_apple-fix-for-32-bit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-opengl_apple.c-fix-for-10.7.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-sound_apple.c-fix-for-10.8.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0008-gpu_apple.c-fix-for-old-systems.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0009-camera_apple.m-unbreak-for-10.7.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0010-brightness_apple.c-add-a-missing-include.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0011-os_apple.m-etc.-fix-syntax-for-plists.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0012-osascript.m-fix-syntax.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0013-disk_bsd-no-support-for-creation-time.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0014-yyjson-PowerPC-macros.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0015-monitor_apple.m-no-HDR-before-10.11.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0016-Fix-autorelease-pools.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0017-CMakeLists-adjust-for-legacy-macOS.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;'>+ 0019-Revert-some-breakages.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Leopard needs this at least due to physicaldisk_apple module,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which uses definitions from storage/IOStorageDeviceCharacteristics.h (IOKit framework);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # those only appear in 10A222 build of 10.6. When building on 10.6, please use at least
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # that SDK version, or otherwise disable physicaldisk_apple (see the patch).
</span> if {${os.major} < 10} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0019-Tiger-specific-adjustments-to-CMakeLists.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0020-Tiger-specific-adjustments-to-CMakeLists.patch
</span> }
# To make sure OpenCL is not accidentally enabled.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0016-Support-hostinfo-for-PowerPC-Macs.patch b/sysutils/fastfetch/files/0001-Support-hostinfo-for-PowerPC-Macs.patch
</span>similarity index 93%
rename from sysutils/fastfetch/files/0016-Support-hostinfo-for-PowerPC-Macs.patch
rename to sysutils/fastfetch/files/0001-Support-hostinfo-for-PowerPC-Macs.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4735bf43b04..9690ff34bd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0016-Support-hostinfo-for-PowerPC-Macs.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0001-Support-hostinfo-for-PowerPC-Macs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c12d5784603bc222f48fb1866b1ef37352207aed Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b861e7a46b54fda9af20f7d9661cda551c50824b Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <vital.had@gmail.com>
Date: Tue, 6 Aug 2024 01:28:18 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 16/19] Support hostinfo for PowerPC Macs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 01/19] Support hostinfo for PowerPC Macs
</span>
---
src/detection/host/host_apple.c | 54 +++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/host/host_apple.c src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/host/host_apple.c b/src/detection/host/host_apple.c
</span> index 61a14e64..efc15ab5 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/host/host_apple.c
</span> @@ -166,6 +166,60 @@ static const char* getProductNameWithHwModel(const FFstrbuf* hwModel)
if(ffStrEquals(version, "10,1")) return "iMac (27/21.5-inch, Late 2009)";
if(ffStrEquals(version, "9,1")) return "iMac (24/20-inch, Early 2009)";
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0002-version.c-add-a-missing-macro-for-powerpc.patch b/sysutils/fastfetch/files/0002-version.c-add-a-missing-macro-for-powerpc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..89a74bec81d
</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/0002-version.c-add-a-missing-macro-for-powerpc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9a5cf92cda83165b69493290b941e829ace74cb6 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 09:31:41 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 02/19] version.c: add a missing macro for powerpc
</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/version/version.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/version/version.c b/src/detection/version/version.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5c1fb0ae..b745b45d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/version/version.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/version/version.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FF_ARCHITECTURE "arm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__mips__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FF_ARCHITECTURE "mips"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__powerpc__) || defined(__powerpc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__powerpc__) || defined(__powerpc) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FF_ARCHITECTURE "powerpc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__riscv__) || defined(__riscv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FF_ARCHITECTURE "riscv"
</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/0003-Support-PowerPC-CPU-detection.patch b/sysutils/fastfetch/files/0003-Support-PowerPC-CPU-detection.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..20adf15608b
</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/0003-Support-PowerPC-CPU-detection.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,70 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b50bb19f3ad6bc9b315b0229404b21d959b7e6f4 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: Sun, 4 Aug 2024 21:05:10 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 03/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 | 11 +++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/cpu/cpu.h | 1 +
</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;'>+ 3 files changed, 23 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/cpu/cpu.c b/src/detection/cpu/cpu.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 68d23ac8..e9590344 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/cpu/cpu.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/cpu/cpu.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,3 +39,14 @@ const char* ffCPUAppleCodeToName(uint32_t code)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default: return "Apple Silicon";
</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;'>++const char* ffCPUApplePPCCodeToName(int cpuSubType)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ switch (cpuSubType)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case 10: return "PowerPC 7400";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case 11: return "PowerPC 7450";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case 100: return "PowerPC 970";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default: return "PowerPC";
</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 a/src/detection/cpu/cpu.h b/src/detection/cpu/cpu.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e27a437a..753d5294 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/cpu/cpu.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/cpu/cpu.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,3 +30,4 @@ typedef struct FFCPUResult
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* ffCPUAppleCodeToName(uint32_t code);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++const char* ffCPUApplePPCCodeToName(int cpuSubType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index efdad950..6608c11b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/cpu/cpu_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/cpu/cpu_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,12 +100,23 @@ static const char* detectCoreCount(FFCPUResult* cpu)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __POWERPC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int cpuSubType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t size = sizeof(cpuSubType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sysctlbyname("hw.cpusubtype", &cpuSubType, &size, NULL, 0) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *cpuName = ffCPUApplePPCCodeToName(cpuSubType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ffStrbufAppendS(&cpu->name, cpuName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return "sysctlbyname(hw.cpusubtype) failed";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ffSysctlGetString("machdep.cpu.brand_string", &cpu->name) != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "sysctlbyname(machdep.cpu.brand_string) failed";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffSysctlGetString("machdep.cpu.vendor", &cpu->vendor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cpu->vendor.length == 0 && ffStrbufStartsWithS(&cpu->name, "Apple "))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffStrbufAppendS(&cpu->vendor, "Apple");
</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;'>+ cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.physicalcpu_max", 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(cpu->coresPhysical == 1)
</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/0001-gpu_apple.m-unbreak-for-10.11.patch b/sysutils/fastfetch/files/0004-gpu_apple.m-unbreak-for-10.11.patch
</span>similarity index 77%
rename from sysutils/fastfetch/files/0001-gpu_apple.m-unbreak-for-10.11.patch
rename to sysutils/fastfetch/files/0004-gpu_apple.m-unbreak-for-10.11.patch
<span style='display:block; white-space:pre;color:#808080;'>index f237abab6a2..742fd451f9f 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/0004-gpu_apple.m-unbreak-for-10.11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c33d7772762850674e7fea4b75d64982b7e72bae Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b193ad96b5bfd18c8207c2f120a9b185a50bcd64 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 01/19] gpu_apple.m: unbreak for < 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 04/19] gpu_apple.m: unbreak for < 10.11
</span>
---
src/detection/gpu/gpu_apple.m | 5 +++++
1 file changed, 5 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/gpu/gpu_apple.m src/detection/gpu/gpu_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/gpu/gpu_apple.m b/src/detection/gpu/gpu_apple.m
</span> index e5b6bebf..314f83a3 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/gpu/gpu_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/gpu/gpu_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/gpu/gpu_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/gpu/gpu_apple.m
</span> @@ -1,5 +1,7 @@
+#include <AvailabilityMacros.h>
#include "gpu.h"
<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/0005-memory_apple-fix-for-32-bit.patch
</span>similarity index 85%
rename from sysutils/fastfetch/files/0002-memory_apple-fix-for-32-bit.patch
rename to sysutils/fastfetch/files/0005-memory_apple-fix-for-32-bit.patch
<span style='display:block; white-space:pre;color:#808080;'>index d3ed4602346..dae7a6d6328 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/0005-memory_apple-fix-for-32-bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 3d53d9e329075cd81cd760c2e6cdc645784b527a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c6d2b4351450a5deabe86716fcf2fb62fd9bd628 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 02/19] memory_apple: fix for 32-bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 05/19] memory_apple: fix for 32-bit
</span>
---
src/detection/memory/memory_apple.c | 10 ++++++++++
1 file changed, 10 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/memory/memory_apple.c src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/memory/memory_apple.c b/src/detection/memory/memory_apple.c
</span> index cabdab26..cdfdee12 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/memory/memory_apple.c
</span> @@ -4,6 +4,7 @@
#include <mach/mach.h>
#include <sys/sysctl.h>
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8d3efd15026..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,54 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d3df0d80b4a121553ee52dbd280a2fd8addcbe4e 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 00:59:49 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 05/19] monitor_apple.m: no HDR before 10.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/monitor/monitor_apple.m | 14 ++++++++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 10 insertions(+), 4 deletions(-)
</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_apple.m src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2c4a1e3c..c0169c29 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;'>-@@ -3,20 +3,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "util/apple/cf_helpers.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "util/edidHelper.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <AppKit/NSScreen.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <Foundation/Foundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <CoreGraphics/CoreGraphics.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AppKit/NSScreen.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Foundation/Foundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreGraphics/CoreGraphics.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID display) __attribute__((weak_import));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <IOKit/graphics/IOGraphicsLib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <IOKit/graphics/IOGraphicsLib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define CoreDisplay_IODisplayCreateInfoDictionary IODisplayCreateInfoDictionary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern CFDictionaryRef CoreDisplay_IODisplayCreateInfoDictionary(io_service_t framebuffer, IOOptionBits options) __attribute__((weak_import));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool detectHdrSupportWithNSScreen(FFDisplayResult* display)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSScreen* mainScreen = NSScreen.mainScreen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (display->primary)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +46,7 @@ static bool detectHdrSupportWithNSScreen(FFDisplayResult* display)
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</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;'>-2.46.0
</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/0003-opengl_apple.c-fix-for-10.7.patch b/sysutils/fastfetch/files/0006-opengl_apple.c-fix-for-10.7.patch
</span>similarity index 72%
rename from sysutils/fastfetch/files/0003-opengl_apple.c-fix-for-10.7.patch
rename to sysutils/fastfetch/files/0006-opengl_apple.c-fix-for-10.7.patch
<span style='display:block; white-space:pre;color:#808080;'>index 709c0c2476a..c3a24f3f835 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/0006-opengl_apple.c-fix-for-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From cc76fa5e9bb52596c4aaf7752143c2e0a254f3db Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4847acc6347c77802a8a6728557f2746b450d307 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 03/19] opengl_apple.c: fix for < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 06/19] opengl_apple.c: fix for < 10.7
</span>
---
src/detection/opengl/opengl_apple.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/opengl/opengl_apple.c src/detection/opengl/opengl_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/opengl/opengl_apple.c b/src/detection/opengl/opengl_apple.c
</span> index c6b56f07..8c97eeda 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/opengl/opengl_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/opengl/opengl_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/opengl/opengl_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/opengl/opengl_apple.c
</span> @@ -1,4 +1,4 @@
-
+#include <AvailabilityMacros.h>
<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/0007-sound_apple.c-fix-for-10.8.patch
</span>similarity index 68%
rename from sysutils/fastfetch/files/0004-sound_apple.c-fix-for-10.8.patch
rename to sysutils/fastfetch/files/0007-sound_apple.c-fix-for-10.8.patch
<span style='display:block; white-space:pre;color:#808080;'>index 8746d7ab620..e9594cacb03 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/0007-sound_apple.c-fix-for-10.8.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 83818345c165fdec465c9b847fb899e8b79b166b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b346305ac72841c4c71dc5ba574e981538e4576b 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 04/19] sound_apple.c: fix for < 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 07/19] sound_apple.c: fix for < 10.8
</span>
---
src/detection/sound/sound_apple.c | 5 +++++
1 file changed, 5 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/sound/sound_apple.c src/detection/sound/sound_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/sound/sound_apple.c b/src/detection/sound/sound_apple.c
</span> index 22ecec2a..10646206 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/sound/sound_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/sound/sound_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/sound/sound_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/sound/sound_apple.c
</span> @@ -4,6 +4,11 @@
#include <CoreAudio/CoreAudio.h>
#include <AvailabilityMacros.h>
<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/0008-gpu_apple.c-fix-for-old-systems.patch
</span>similarity index 79%
rename from sysutils/fastfetch/files/0006-gpu_apple.c-fix-for-old-systems.patch
rename to sysutils/fastfetch/files/0008-gpu_apple.c-fix-for-old-systems.patch
<span style='display:block; white-space:pre;color:#808080;'>index c174225783b..9dc7a2c2e15 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/0008-gpu_apple.c-fix-for-old-systems.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8daf1a861814da455d6bb8b4e4d4b4963f0fa11c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7588bdb60d3e014bd2d591cf93f46c43fabf72b2 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 06/19] gpu_apple.c: fix for old systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 08/19] gpu_apple.c: fix for old systems
</span>
---
src/detection/gpu/gpu_apple.c | 3 +++
1 file changed, 3 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/gpu/gpu_apple.c src/detection/gpu/gpu_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/gpu/gpu_apple.c b/src/detection/gpu/gpu_apple.c
</span> index 1190a636..b6fb2721 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/gpu/gpu_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/gpu/gpu_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/gpu/gpu_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/gpu/gpu_apple.c
</span> @@ -4,6 +4,7 @@
#include "detection/temps/temps_apple.h"
#include "util/apple/cf_helpers.h"
<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/0009-camera_apple.m-unbreak-for-10.7.patch
</span>similarity index 65%
rename from sysutils/fastfetch/files/0007-camera_apple.m-unbreak-for-10.7.patch
rename to sysutils/fastfetch/files/0009-camera_apple.m-unbreak-for-10.7.patch
<span style='display:block; white-space:pre;color:#808080;'>index d3d3c7e49c5..6b0d1038012 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/0009-camera_apple.m-unbreak-for-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a86599b498e28357abedb68756dbb10573e62ba5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e1fc41a094b5755b457e54494a8616c070ce5b8b 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 07/19] camera_apple.m: unbreak for < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 09/19] camera_apple.m: unbreak for < 10.7
</span>
---
src/detection/camera/camera_apple.m | 4 ++++
1 file changed, 4 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/camera/camera_apple.m src/detection/camera/camera_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/camera/camera_apple.m b/src/detection/camera/camera_apple.m
</span> index ab15fb99..d30c4259 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/camera/camera_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/camera/camera_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/camera/camera_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/camera/camera_apple.m
</span> @@ -1,7 +1,11 @@
#include "camera.h"
#include "common/io/io.h"
<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/0010-brightness_apple.c-add-a-missing-include.patch
</span>similarity index 76%
rename from sysutils/fastfetch/files/0008-brightness_apple.c-add-a-missing-include.patch
rename to sysutils/fastfetch/files/0010-brightness_apple.c-add-a-missing-include.patch
<span style='display:block; white-space:pre;color:#808080;'>index 1396266ce4d..566a0840a6d 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/0010-brightness_apple.c-add-a-missing-include.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 61e7ee31cbc02725a0645f4133be23770d062864 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c0c5bec2ff12cee50d24757503240e41be45ddb7 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 08/19] brightness_apple.c: add a missing include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 10/19] brightness_apple.c: add a missing include
</span>
---
src/detection/brightness/brightness_apple.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/brightness/brightness_apple.c src/detection/brightness/brightness_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/brightness/brightness_apple.c b/src/detection/brightness/brightness_apple.c
</span> index a9f8daf0..688e1f1a 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/brightness/brightness_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/brightness/brightness_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/brightness/brightness_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/brightness/brightness_apple.c
</span> @@ -14,10 +14,11 @@ extern IOReturn IOAVServiceCopyEDID(IOAVServiceRef service, CFDataRef* x2) __att
extern IOReturn IOAVServiceReadI2C(IOAVServiceRef service, uint32_t chipAddress, uint32_t offset, void* outputBuffer, uint32_t outputBufferSize) __attribute__((weak_import));
extern IOReturn IOAVServiceWriteI2C(IOAVServiceRef service, uint32_t chipAddress, uint32_t dataAddress, void* inputBuffer, uint32_t inputBufferSize) __attribute__((weak_import));
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0010-os_apple.m-etc.-fix-syntax-for-plists.patch b/sysutils/fastfetch/files/0011-os_apple.m-etc.-fix-syntax-for-plists.patch
</span>similarity index 87%
rename from sysutils/fastfetch/files/0010-os_apple.m-etc.-fix-syntax-for-plists.patch
rename to sysutils/fastfetch/files/0011-os_apple.m-etc.-fix-syntax-for-plists.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4bdfe0e6e8d..2bbb930829b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0010-os_apple.m-etc.-fix-syntax-for-plists.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0011-os_apple.m-etc.-fix-syntax-for-plists.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2d57a60f6bb0b8349febf13f183e208d8e1c83ee Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 93eda631525d26392d6e86a19886724c45d935e7 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 10/19] os_apple.m etc.: fix syntax for plists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 11/19] os_apple.m etc.: fix syntax for plists
</span>
---
CMakeLists.txt | 2 +-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@ Subject: [PATCH 10/19] os_apple.m etc.: fix syntax for plists
</span> src/detection/wmtheme/wmtheme_apple.m | 10 +------
5 files changed, 18 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f673977c..9789682b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -638,7 +638,7 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e403b237..38cbb216 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -641,7 +641,7 @@ elseif(APPLE)
</span> src/detection/cpu/cpu_apple.c
src/detection/cpucache/cpucache_apple.c
src/detection/cpuusage/cpuusage_apple.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,10 +24,10 @@ index f673977c..9789682b 100644
</span> src/detection/disk/disk_bsd.c
src/detection/dns/dns_linux.c
src/detection/physicaldisk/physicaldisk_apple.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/cursor/cursor_apple.m src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/cursor/cursor_apple.m b/src/detection/cursor/cursor_apple.m
</span> index 40d4b90c..c71c440a 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/cursor/cursor_apple.m
</span> @@ -19,15 +19,7 @@ static void appendColor(FFstrbuf* str, NSDictionary* color)
void ffDetectCursor(FFCursorResult* result)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +45,10 @@ index 40d4b90c..c71c440a 100644
</span>
NSDictionary* color;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/os/os_apple.m src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/os/os_apple.m b/src/detection/os/os_apple.m
</span> index 5a8ef621..dc606c92 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/os/os_apple.m
</span> @@ -6,25 +6,21 @@
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,10 +84,10 @@ index 5a8ef621..dc606c92 100644
</span> }
static bool detectOSCodeName(FFOSResult* os)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/terminalfont/terminalfont_apple.m src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/terminalfont/terminalfont_apple.m b/src/detection/terminalfont/terminalfont_apple.m
</span> index 7d6aca28..96917199 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/terminalfont/terminalfont_apple.m
</span> @@ -16,19 +16,11 @@ static void detectIterm2(FFTerminalFontResult* terminalFont)
return;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,10 +145,10 @@ index 7d6aca28..96917199 100644
</span>
NSString* fontName = [dict valueForKey:@"FontName"];
if(!fontName)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/wmtheme/wmtheme_apple.m src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/wmtheme/wmtheme_apple.m b/src/detection/wmtheme/wmtheme_apple.m
</span> index 08810b6c..b78acac0 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/wmtheme/wmtheme_apple.m
</span> @@ -5,15 +5,7 @@
bool ffDetectWmTheme(FFstrbuf* themeOrError)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0012-Fix-PowerPC-macros.patch b/sysutils/fastfetch/files/0012-Fix-PowerPC-macros.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 79fb9f9b09d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0012-Fix-PowerPC-macros.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e5105c4879d68a83ec80e2534275f549ac136b30 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 10:12:44 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 12/19] Fix PowerPC macros
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/3rdparty/yyjson/yyjson.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/version/version.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/3rdparty/yyjson/yyjson.c src/3rdparty/yyjson/yyjson.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 16ecbacf..298a56c0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/yyjson/yyjson.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/yyjson/yyjson.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -236,7 +236,7 @@ uint32_t yyjson_version(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif (defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ == 1) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- defined(__or1k__) || defined(__OR1K__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ defined(__or1k__) || defined(__OR1K__) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define YYJSON_ENDIAN YYJSON_BIG_ENDIAN
</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;'>-diff --git src/detection/version/version.c src/detection/version/version.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b6d6e7d7..7d456313 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/version/version.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/version/version.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FF_ARCHITECTURE "arm"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__mips__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FF_ARCHITECTURE "mips"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__powerpc__) || defined(__powerpc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__powerpc__) || defined(__powerpc) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FF_ARCHITECTURE "powerpc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__riscv__) || defined(__riscv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FF_ARCHITECTURE "riscv"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.46.0
</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/0011-osascript.m-fix-syntax.patch b/sysutils/fastfetch/files/0012-osascript.m-fix-syntax.patch
</span>similarity index 82%
rename from sysutils/fastfetch/files/0011-osascript.m-fix-syntax.patch
rename to sysutils/fastfetch/files/0012-osascript.m-fix-syntax.patch
<span style='display:block; white-space:pre;color:#808080;'>index 52212562b54..13a5a226974 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0011-osascript.m-fix-syntax.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0012-osascript.m-fix-syntax.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2c46701fc1b29539a27d515fc5bcf5791c450638 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7f04a76faf643a7ffd06325c6b9f21718113db31 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 11/19] osascript.m: fix syntax
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 12/19] osascript.m: fix syntax
</span>
---
src/util/apple/osascript.m | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/util/apple/osascript.m src/util/apple/osascript.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/util/apple/osascript.m b/src/util/apple/osascript.m
</span> index 8b01ba06..ddef3407 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util/apple/osascript.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util/apple/osascript.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/util/apple/osascript.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/util/apple/osascript.m
</span> @@ -1,17 +1,17 @@
#include "osascript.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0014-disk_bsd-no-support-for-creation-time.patch b/sysutils/fastfetch/files/0013-disk_bsd-no-support-for-creation-time.patch
</span>similarity index 77%
rename from sysutils/fastfetch/files/0014-disk_bsd-no-support-for-creation-time.patch
rename to sysutils/fastfetch/files/0013-disk_bsd-no-support-for-creation-time.patch
<span style='display:block; white-space:pre;color:#808080;'>index acd1f3feca6..4896210c273 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0014-disk_bsd-no-support-for-creation-time.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0013-disk_bsd-no-support-for-creation-time.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 826c21bbe178607e269ead70b4e31bfcb800b265 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ac9f83ff7700436f1f7e30511da0584199fa2063 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 14/19] disk_bsd: no support for creation time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 13/19] disk_bsd: no support for creation time
</span>
---
src/detection/disk/disk_bsd.c | 3 +++
1 file changed, 3 insertions(+)
<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:#e0ffe0;'>+diff --git a/src/detection/disk/disk_bsd.c b/src/detection/disk/disk_bsd.c
</span> index 81be9c83..4c35f50c 100644
<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:#e0ffe0;'>+--- a/src/detection/disk/disk_bsd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/disk/disk_bsd.c
</span> @@ -65,6 +65,7 @@ static void detectFsInfo(struct statfs* fs, FFDisk* disk)
#include <sys/attr.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0014-yyjson-PowerPC-macros.patch b/sysutils/fastfetch/files/0014-yyjson-PowerPC-macros.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0f7c99bd16b
</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/0014-yyjson-PowerPC-macros.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 222160322993ce0ee4498e3692531027a90571c5 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: Thu, 15 Aug 2024 22:15:15 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 14/19] yyjson: 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;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/3rdparty/yyjson/yyjson.c b/src/3rdparty/yyjson/yyjson.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 16ecbacf..298a56c0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/3rdparty/yyjson/yyjson.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/3rdparty/yyjson/yyjson.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,7 +236,7 @@ uint32_t yyjson_version(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif (defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ == 1) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- defined(__or1k__) || defined(__OR1K__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defined(__or1k__) || defined(__OR1K__) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define YYJSON_ENDIAN YYJSON_BIG_ENDIAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+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-Support-PowerPC-CPU-detection.patch b/sysutils/fastfetch/files/0015-Support-PowerPC-CPU-detection.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 89fd997c08a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0015-Support-PowerPC-CPU-detection.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b00b8558a516d3a4eaf1cf07fccbc3e05f8e86e9 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 21:05:10 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 15/19] Support PowerPC CPU detection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/cpu/cpu.c | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/cpu/cpu_apple.c | 11 +++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 14 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/cpu/cpu.c src/detection/cpu/cpu.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 68d23ac8..b491d3c7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/cpu/cpu.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/cpu/cpu.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,9 @@ const char* ffCPUAppleCodeToName(uint32_t code)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // https://github.com/AsahiLinux/docs/wiki/Codenames
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (code)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case 10: return "PowerPC 7400";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case 11: return "PowerPC 7450";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case 100: return "PowerPC 970";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 8103: return "Apple M1";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 6000: return "Apple M1 Pro";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 6001: return "Apple M1 Max";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/cpu/cpu_apple.c src/detection/cpu/cpu_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index efdad950..6ec776f6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/cpu/cpu_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/cpu/cpu_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,12 +100,23 @@ static const char* detectCoreCount(FFCPUResult* cpu)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __POWERPC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int cpuSubType;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t size = sizeof(cpuSubType);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sysctlbyname("hw.cpusubtype", &cpuSubType, &size, NULL, 0) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *cpuName = ffCPUAppleCodeToName(cpuSubType);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ffStrbufAppendS(&cpu->name, cpuName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "sysctlbyname(hw.cpusubtype) failed";
</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;'>- if (ffSysctlGetString("machdep.cpu.brand_string", &cpu->name) != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "sysctlbyname(machdep.cpu.brand_string) failed";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffSysctlGetString("machdep.cpu.vendor", &cpu->vendor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (cpu->vendor.length == 0 && ffStrbufStartsWithS(&cpu->name, "Apple "))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffStrbufAppendS(&cpu->vendor, "Apple");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.physicalcpu_max", 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(cpu->coresPhysical == 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.46.0
</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/0015-monitor_apple.m-no-HDR-before-10.11.patch b/sysutils/fastfetch/files/0015-monitor_apple.m-no-HDR-before-10.11.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..08aafabafbe
</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/0015-monitor_apple.m-no-HDR-before-10.11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ba129af0b281149f5a211e46ca0a294aaa1c7229 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: Thu, 15 Aug 2024 22:19:23 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 15/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 | 7 +++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/monitor/monitor_apple.m b/src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 70d71eeb..009577c9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,15 +7,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <Foundation/Foundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <CoreGraphics/CoreGraphics.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ #ifdef MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID display) __attribute__((weak_import));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOKit/graphics/IOGraphicsLib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CoreDisplay_IODisplayCreateInfoDictionary IODisplayCreateInfoDictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ static bool detectHdrSupportWithNSScreen(FFDisplayResult* display)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSScreen* mainScreen = NSScreen.mainScreen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (display->primary)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +46,7 @@ static bool detectHdrSupportWithNSScreen(FFDisplayResult* display)
</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;'>+ return false;
</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/0013-Fix-autorelease-pools.patch b/sysutils/fastfetch/files/0016-Fix-autorelease-pools.patch
</span>similarity index 52%
rename from sysutils/fastfetch/files/0013-Fix-autorelease-pools.patch
rename to sysutils/fastfetch/files/0016-Fix-autorelease-pools.patch
<span style='display:block; white-space:pre;color:#808080;'>index 84345c1b8f5..b126c34f072 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0013-Fix-autorelease-pools.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0016-Fix-autorelease-pools.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9f4858efed755fd870b1750b89059038743e4edb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0f8dce5a9b69a92148404d8619ccfc0cd0ea93f2 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 10:56:00 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 13/19] Fix autorelease pools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 15 Aug 2024 22:41:23 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 16/19] Fix autorelease pools
</span>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/bluetooth/bluetooth_apple.m | 14 ++++++++++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/camera/camera_apple.m | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/cursor/cursor_apple.m | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/font/font_apple.m | 14 ++++++++++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/gpu/gpu_apple.m | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/monitor/monitor_apple.m | 14 ++++++++++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/os/os_apple.m | 12 +++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/wmtheme/wmtheme_apple.m | 11 +++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/bluetooth/bluetooth_apple.m | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/cursor/cursor_apple.m | 12 ++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/font/font_apple.m | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/monitor/monitor_apple.m | 13 ++++++++++++-
</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 | 12 ++++++++++++
</span> src/util/apple/osascript.h | 10 ++++++++++
src/util/apple/osascript.m | 2 ++
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 10 files changed, 93 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8 files changed, 84 insertions(+), 3 deletions(-)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/bluetooth/bluetooth_apple.m src/detection/bluetooth/bluetooth_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index abd31a0c..f983e46b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/bluetooth/bluetooth_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/bluetooth/bluetooth_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,9 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "bluetooth.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/bluetooth/bluetooth_apple.m b/src/detection/bluetooth/bluetooth_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index abd31a0c..d5e83094 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/bluetooth/bluetooth_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/bluetooth/bluetooth_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,8 +2,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <IOBluetooth/IOBluetooth.h>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <IOBluetooth/IOBluetooth.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <IOBluetooth/IOBluetooth.h>
</span> +#include <AvailabilityMacros.h>
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,14 +31,14 @@ index abd31a0c..f983e46b 100644
</span> +#define POOLSTART
+#define POOLEND
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
{
+ POOLSTART
NSArray<IOBluetoothDevice*>* ioDevices = IOBluetoothDevice.pairedDevices;
if(!ioDevices)
return "IOBluetoothDevice.pairedDevices failed";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,6 +97,6 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,6 +98,6 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
</span> ffStrbufTrimRight(&device->type, ',');
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,28 +46,14 @@ index abd31a0c..f983e46b 100644
</span> + POOLEND
return NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/camera/camera_apple.m src/detection/camera/camera_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d30c4259..66330c5f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/camera/camera_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/camera/camera_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/cursor/cursor_apple.m b/src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c71c440a..c0cbbd1f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,6 +2,16 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <AVFoundation/AVCaptureDevice.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AVFoundation/AVCaptureDevice.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // warning: 'AVCaptureDeviceTypeExternalUnknown' is deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/cursor/cursor_apple.m src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c71c440a..1a152d82 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/cursor/cursor_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "cursor.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <Foundation/Foundation.h>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <Foundation/Foundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Foundation/Foundation.h>
</span> +#include <AvailabilityMacros.h>
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,10 +63,11 @@ index c71c440a..1a152d82 100644
</span> +#define POOLSTART
+#define POOLEND
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> static void appendColor(FFstrbuf* str, NSDictionary* color)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +28,7 @@ static void appendColor(FFstrbuf* str, NSDictionary* color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int r = (int) (((NSNumber*) [color valueForKey:@"red"]).doubleValue * 255);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +29,7 @@ static void appendColor(FFstrbuf* str, NSDictionary* color)
</span>
void ffDetectCursor(FFCursorResult* result)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,22 +75,20 @@ index c71c440a..1a152d82 100644
</span> NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:[NSHomeDirectory() stringByAppendingPathComponent:@"/Library/Preferences/com.apple.universalaccess.plist"]];
NSDictionary* color;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,4 +51,5 @@ void ffDetectCursor(FFCursorResult* result)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,4 +52,5 @@ void ffDetectCursor(FFCursorResult* result)
</span> ffStrbufAppendF(&result->size, "%d", (int) (mouseDriverCursorSize.doubleValue * 32));
else
ffStrbufAppendS(&result->size, "32");
+ POOLEND
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/font/font_apple.m src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 683acad0..618d1287 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "common/io/io.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "font.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/font/font_apple.m b/src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 683acad0..a2c9fb74 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,6 +4,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <AppKit/NSFont.h>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <AppKit/NSFont.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AppKit/NSFont.h>
</span> +#include <AvailabilityMacros.h>
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,10 +98,11 @@ index 683acad0..618d1287 100644
</span> +#define POOLSTART
+#define POOLEND
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> static void generateString(FFFontResult* font)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +32,7 @@ static void generateString(FFFontResult* font)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(font->fonts[0].length > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +33,7 @@ static void generateString(FFFontResult* font)
</span>
const char* ffDetectFontImpl(FFFontResult* result)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +110,7 @@ index 683acad0..618d1287 100644
</span> ffStrbufAppendS(&result->fonts[0], [NSFont systemFontOfSize:12].familyName.UTF8String);
ffStrbufAppendS(&result->fonts[1], [NSFont userFontOfSize:12].familyName.UTF8String);
#ifdef MAC_OS_X_VERSION_10_15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +42,6 @@ const char* ffDetectFontImpl(FFFontResult* result)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +43,6 @@ const char* ffDetectFontImpl(FFFontResult* result)
</span> #endif
ffStrbufAppendS(&result->fonts[3], [NSFont userFixedPitchFontOfSize:12].familyName.UTF8String);
generateString(result);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,11 +118,11 @@ index 683acad0..618d1287 100644
</span> + POOLEND
return NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/gpu/gpu_apple.m src/detection/gpu/gpu_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 314f83a3..b72c289c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/gpu/gpu_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/gpu/gpu_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,11 +13,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/monitor/monitor_apple.m b/src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 009577c9..c72c7f55 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,8 +18,17 @@ extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID
</span> #endif
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,52 +134,13 @@ index 314f83a3..b72c289c 100644
</span> +#define POOLEND
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* ffGpuDetectMetal(FFlist* gpus)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.13, *))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POOLSTART
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (id<MTLDevice> device in MTLCopyAllDevices())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFGPUResult* gpu = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +58,7 @@ const char* ffGpuDetectMetal(FFlist* gpus)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gpu->type = device.hasUnifiedMemory ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POOLEND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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..da9f41f4 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;'>-@@ -8,6 +8,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreGraphics/CoreGraphics.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLSTART NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLEND [pool release];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLSTART
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLEND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID display) __attribute__((weak_import));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +28,7 @@ extern CFDictionaryRef CoreDisplay_IODisplayCreateInfoDictionary(io_service_t fr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> static bool detectHdrSupportWithNSScreen(FFDisplayResult* display)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSScreen* mainScreen = NSScreen.mainScreen;
</span> + POOLSTART
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSScreen* mainScreen = NSScreen.mainScreen;
</span> #if MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
if (display->primary)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,11 +55,13 @@ static bool detectHdrSupportWithNSScreen(FFDisplayResult* display)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,6 +56,7 @@ static bool detectHdrSupportWithNSScreen(FFDisplayResult* display)
</span> }
}
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,13 +148,15 @@ index c0169c29..da9f41f4 100644
</span> return false;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* ffDetectMonitor(FFlist* results)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POOLSTART
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +65,7 @@ const char* ffDetectMonitor(FFlist* results)
</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;'>-@@ -127,6 +137,6 @@ const char* ffDetectMonitor(FFlist* results)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POOLSTART
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const FFDisplayServerResult* displayServer = ffConnectDisplayServer();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_LIST_FOR_EACH(FFDisplayResult, display, displayServer->displays)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,6 +138,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;'>@@ -218,14 +164,14 @@ index c0169c29..da9f41f4 100644
</span> + POOLEND
return NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/os/os_apple.m src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dc606c92..5af33bdd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,9 +7,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/os/os_apple.m b/src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index dc606c92..803bed1c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/os/os_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,8 +8,19 @@
</span> #include <string.h>
#include <Foundation/Foundation.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +#include <AvailabilityMacros.h>
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -235,14 +181,14 @@ index dc606c92..5af33bdd 100644
</span> +#define POOLSTART
+#define POOLEND
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> static void parseSystemVersion(FFOSResult* os)
{
+ POOLSTART
NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:
@"/System/Library/CoreServices/SystemVersion.plist"];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +31,7 @@ static void parseSystemVersion(FFOSResult* os)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +32,7 @@ static void parseSystemVersion(FFOSResult* os)
</span> ffStrbufInitS(&os->version, [value UTF8String]);
if ((value = [dict objectForKey:@"ProductBuildVersion"]))
ffStrbufInitS(&os->buildID, [value UTF8String]);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,22 +196,14 @@ index dc606c92..5af33bdd 100644
</span> }
static bool detectOSCodeName(FFOSResult* os)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,7 +76,6 @@ static bool detectOSCodeName(FFOSResult* os)
</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;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</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;'>-diff --git src/detection/wmtheme/wmtheme_apple.m src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b78acac0..e90f225f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,9 +2,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "wmtheme.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/wmtheme/wmtheme_apple.m b/src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b78acac0..904dacbd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/wmtheme/wmtheme_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,8 +3,19 @@
</span>
#import <Foundation/Foundation.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +#include <AvailabilityMacros.h>
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,24 +213,24 @@ index b78acac0..e90f225f 100644
</span> +#define POOLSTART
+#define POOLEND
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> bool ffDetectWmTheme(FFstrbuf* themeOrError)
{
+ POOLSTART
NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:[NSHomeDirectory() stringByAppendingPathComponent:@"/Library/Preferences/.GlobalPreferences.plist"]];
NSNumber* wmThemeColor = [dict valueForKey:@"AppleAccentColor"];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,5 +38,6 @@ bool ffDetectWmTheme(FFstrbuf* themeOrError)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,5 +39,6 @@ bool ffDetectWmTheme(FFstrbuf* themeOrError)
</span>
NSString* wmTheme = [dict valueForKey:@"AppleInterfaceStyle"];
ffStrbufAppendF(themeOrError, " (%s)", wmTheme ? wmTheme.UTF8String : "Light");
+ POOLEND
return true;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/util/apple/osascript.h src/util/apple/osascript.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/util/apple/osascript.h b/src/util/apple/osascript.h
</span> index 2c9fe830..f7c0b27b 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util/apple/osascript.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util/apple/osascript.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/util/apple/osascript.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/util/apple/osascript.h
</span> @@ -8,3 +8,13 @@
bool ffOsascript(const char* input, FFstrbuf* result);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,10 +245,10 @@ index 2c9fe830..f7c0b27b 100644
</span> +#define POOLSTART
+#define POOLEND
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/util/apple/osascript.m src/util/apple/osascript.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/util/apple/osascript.m b/src/util/apple/osascript.m
</span> index ddef3407..ebe9ae8e 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util/apple/osascript.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util/apple/osascript.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/util/apple/osascript.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/util/apple/osascript.m
</span> @@ -5,6 +5,7 @@
#include <CoreData/CoreData.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0009-CMakeLists-adjust-for-legacy-macOS.patch b/sysutils/fastfetch/files/0017-CMakeLists-adjust-for-legacy-macOS.patch
</span>similarity index 90%
rename from sysutils/fastfetch/files/0009-CMakeLists-adjust-for-legacy-macOS.patch
rename to sysutils/fastfetch/files/0017-CMakeLists-adjust-for-legacy-macOS.patch
<span style='display:block; white-space:pre;color:#808080;'>index 1c4c66a2420..6c492b7b019 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0009-CMakeLists-adjust-for-legacy-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0017-CMakeLists-adjust-for-legacy-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d7413bac81ddce800ebb706e9e5ab76a15ce8d7c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dd64fcef9a97059c5655f8bf8e4fcf6eaaedde8c 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 09/19] CMakeLists: adjust for legacy macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 17/19] CMakeLists: adjust for legacy macOS
</span>
---
CMakeLists.txt | 36 ++++++++++++++----------------------
1 file changed, 14 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 713ec814..f673977c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,10 +111,10 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 38cbb216..43e2a6e3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,10 +112,10 @@ else()
</span> message(STATUS "Threads type: disabled")
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ index 713ec814..f673977c 100644
</span>
if(WIN32 OR ENABLE_DIRECTX_HEADERS)
enable_language(CXX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -629,11 +629,11 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -632,11 +632,11 @@ elseif(APPLE)
</span> src/common/sysctl.c
src/detection/battery/battery_apple.c
src/detection/bios/bios_apple.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ index 713ec814..f673977c 100644
</span> src/detection/chassis/chassis_nosupport.c
src/detection/cpu/cpu_apple.c
src/detection/cpucache/cpucache_apple.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -642,7 +642,7 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -645,7 +645,7 @@ elseif(APPLE)
</span> src/detection/disk/disk_bsd.c
src/detection/dns/dns_linux.c
src/detection/physicaldisk/physicaldisk_apple.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ index 713ec814..f673977c 100644
</span> src/detection/diskio/diskio_apple.c
src/detection/displayserver/displayserver_apple.c
src/detection/font/font_apple.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -656,15 +656,15 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -659,15 +659,15 @@ elseif(APPLE)
</span> src/detection/libc/libc_apple.c
src/detection/locale/locale_linux.c
src/detection/localip/localip_linux.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ index 713ec814..f673977c 100644
</span> src/detection/processes/processes_bsd.c
src/detection/sound/sound_apple.c
src/detection/swap/swap_apple.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -675,8 +675,8 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -678,8 +678,8 @@ elseif(APPLE)
</span> src/detection/theme/theme_nosupport.c
src/detection/uptime/uptime_bsd.c
src/detection/users/users_linux.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@ index 713ec814..f673977c 100644
</span> src/detection/wm/wm_apple.c
src/detection/de/de_nosupport.c
src/detection/wmtheme/wmtheme_apple.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -877,7 +877,7 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -881,7 +881,7 @@ else()
</span> # Used for dlopen finding dylibs installed by homebrew
# `/opt/homebrew/lib` is not on in dlopen search path by default
if(APPLE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +87,7 @@ index 713ec814..f673977c 100644
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1093,25 +1093,17 @@ if(LINUX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1101,25 +1101,17 @@ if(LINUX)
</span> )
elseif(APPLE)
target_link_libraries(libfastfetch
<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><span style='display:block; white-space:pre;color:#808080;'>index 374f5e49518..efddeb841f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0018-Fix-compatibility-with-10.4.patch
</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;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b1b50f6a1ab1349b0a19ddf2b70f9a48345fab0c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8a48b63538dc759ca2cf06f295e3733599d484d2 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Tue, 6 Aug 2024 03:52:56 +0800
Subject: [PATCH 18/19] Fix compatibility with 10.4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ Subject: [PATCH 18/19] Fix compatibility with 10.4
</span> src/util/platform/FFPlatform_unix.c | 5 ++++-
6 files changed, 22 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/common/processing_linux.c src/common/processing_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/common/processing_linux.c b/src/common/processing_linux.c
</span> index af3f4ebf..b2b1d6fa 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/common/processing_linux.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/common/processing_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/common/processing_linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/common/processing_linux.c
</span> @@ -19,7 +19,10 @@
#include <sys/sysctl.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +45,10 @@ index af3f4ebf..b2b1d6fa 100644
</span> #elif defined(__FreeBSD__)
size_t size = ARG_MAX;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/host/host_apple.c src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/host/host_apple.c b/src/detection/host/host_apple.c
</span> index efc15ab5..10fd867c 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/host/host_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/host/host_apple.c
</span> @@ -4,6 +4,7 @@
#include "util/stringUtils.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,10 +74,10 @@ index efc15ab5..10fd867c 100644
</span> return NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/memory/memory_apple.c src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/memory/memory_apple.c b/src/detection/memory/memory_apple.c
</span> index cdfdee12..23ce20dc 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/memory/memory_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/memory/memory_apple.c
</span> @@ -28,7 +28,9 @@ const char* ffDetectMemory(FFMemoryResult* ram)
ram->bytesUsed = ((uint64_t)
+ vmstat.active_count
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,10 +88,10 @@ index cdfdee12..23ce20dc 100644
</span> + vmstat.wire_count
#if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) && !defined(__ppc__)
+ vmstat.compressor_page_count
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/temps/temps_apple.c src/detection/temps/temps_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/temps/temps_apple.c b/src/detection/temps/temps_apple.c
</span> index c4cef782..0fea5a84 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/temps/temps_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/temps/temps_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/temps/temps_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/temps/temps_apple.c
</span> @@ -5,6 +5,7 @@
#include <stdint.h>
#include <math.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,10 +110,10 @@ index c4cef782..0fea5a84 100644
</span> return "IOConnectCallStructMethod(conn) failed";
return NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/terminalfont/terminalfont_apple.m src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/terminalfont/terminalfont_apple.m b/src/detection/terminalfont/terminalfont_apple.m
</span> index 96917199..b3f50ffa 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/terminalfont/terminalfont_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/terminalfont/terminalfont_apple.m
</span> @@ -5,7 +5,8 @@
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,10 +140,10 @@ index 96917199..b3f50ffa 100644
</span>
ffStrbufAppendF(&terminalFont->error, "find profile `%s` bookmark failed", profile);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/util/platform/FFPlatform_unix.c src/util/platform/FFPlatform_unix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/util/platform/FFPlatform_unix.c b/src/util/platform/FFPlatform_unix.c
</span> index b442eed5..8cac81f2 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util/platform/FFPlatform_unix.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util/platform/FFPlatform_unix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/util/platform/FFPlatform_unix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/util/platform/FFPlatform_unix.c
</span> @@ -10,7 +10,10 @@
#include <paths.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0017-Revert-some-breakages.patch b/sysutils/fastfetch/files/0019-Revert-some-breakages.patch
</span>similarity index 81%
rename from sysutils/fastfetch/files/0017-Revert-some-breakages.patch
rename to sysutils/fastfetch/files/0019-Revert-some-breakages.patch
<span style='display:block; white-space:pre;color:#808080;'>index 1ad1111e052..e88d6728fcd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0017-Revert-some-breakages.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0019-Revert-some-breakages.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 26ed419ce4220362012b9f6d39c9f45142154955 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9da42dd266dbdcc32c92c59354455521935a9513 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: Tue, 6 Aug 2024 03:26:01 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 17/19] Revert some breakages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 15 Aug 2024 23:00:10 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 19/19] Revert some breakages
</span>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/displayserver/displayserver.c | 36 +++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/displayserver/displayserver.h | 15 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .../displayserver/displayserver_apple.c | 139 +++++++-----------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/font/font_apple.m | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/displayserver/displayserver.c | 35 +++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/displayserver/displayserver.h | 14 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../displayserver/displayserver_apple.c | 136 +++++++-----------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/font/font_apple.m | 3 +-
</span> src/detection/monitor/monitor.h | 1 -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/monitor/monitor_apple.m | 18 +--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/modules/display/display.c | 64 ++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/monitor/monitor_apple.m | 19 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/modules/display/display.c | 60 ++------
</span> src/modules/monitor/monitor.c | 8 +-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8 files changed, 98 insertions(+), 184 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8 files changed, 98 insertions(+), 178 deletions(-)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/displayserver/displayserver.c src/detection/displayserver/displayserver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 73f1cd0c..20a36623 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/displayserver/displayserver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/displayserver/displayserver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/displayserver/displayserver.c b/src/detection/displayserver/displayserver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ddc97396..20a36623 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/displayserver/displayserver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/displayserver/displayserver.c
</span> @@ -1,6 +1,24 @@
#include "displayserver.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@ index 73f1cd0c..20a36623 100644
</span>
FFDisplayResult* display = ffListAdd(&result->displays);
display->width = width;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,16 +43,10 @@ FFDisplayResult* ffdsAppendDisplay(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,15 +43,10 @@ FFDisplayResult* ffdsAppendDisplay(
</span> display->rotation = rotation;
ffStrbufInitMove(&display->name, name);
display->type = type;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,18 +71,17 @@ index 73f1cd0c..20a36623 100644
</span>
- display->bitDepth = 0;
- display->hdrEnabled = false;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- display->wcgEnabled = false;
</span> -
- return display;
+ return true;
}
void ffConnectDisplayServerImpl(FFDisplayServerResult* ds);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/displayserver/displayserver.h src/detection/displayserver/displayserver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index aa0bd900..ffe46466 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/displayserver/displayserver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/displayserver/displayserver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,13 +58,8 @@ typedef struct FFDisplayResult
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/displayserver/displayserver.h b/src/detection/displayserver/displayserver.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 127dbc5f..ffe46466 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/displayserver/displayserver.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/displayserver/displayserver.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,12 +58,8 @@ typedef struct FFDisplayResult
</span> FFstrbuf name;
FFDisplayType type;
uint32_t rotation;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,12 +91,11 @@ index aa0bd900..ffe46466 100644
</span> bool primary;
- uint8_t bitDepth;
- bool hdrEnabled;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool wcgEnabled;
</span> + uint64_t id; // platform dependent
} FFDisplayResult;
typedef struct FFDisplayServerResult
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,7 +74,9 @@ typedef struct FFDisplayServerResult
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +74,9 @@ typedef struct FFDisplayServerResult
</span>
const FFDisplayServerResult* ffConnectDisplayServer();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +106,7 @@ index aa0bd900..ffe46466 100644
</span> FFDisplayServerResult* result,
uint32_t width,
uint32_t height,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,6 +87,4 @@ FFDisplayResult* ffdsAppendDisplay(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,6 +87,4 @@ FFDisplayResult* ffdsAppendDisplay(
</span> FFstrbuf* name,
FFDisplayType type,
bool primary,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,11 +114,11 @@ index aa0bd900..ffe46466 100644
</span> - uint32_t physicalWidth,
- uint32_t physicalHeight);
+ uint64_t id);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/displayserver/displayserver_apple.c src/detection/displayserver/displayserver_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d2e87ecf..7402ea1a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/displayserver/displayserver_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/displayserver/displayserver_apple.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,111 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/displayserver/displayserver_apple.c b/src/detection/displayserver/displayserver_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d05eb8b1..4b6b6fe4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/displayserver/displayserver_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/displayserver/displayserver_apple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,109 +1,77 @@
</span> #include "displayserver.h"
#include "util/apple/cf_helpers.h"
-#include "util/stringUtils.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,10 +133,11 @@ index d2e87ecf..7402ea1a 100644
</span> +#include <ApplicationServices/ApplicationServices.h>
+#include <AvailabilityMacros.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef MAC_OS_X_VERSION_10_15
</span> -extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID display) __attribute__((weak_import));
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <IOKit/graphics/IOGraphicsLib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern CFDictionaryRef CoreDisplay_IODisplayCreateInfoDictionary(io_service_t framebuffer, IOOptionBits options) __attribute__((weak_import));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern Boolean CoreDisplay_Display_IsHDRModeEnabled(CGDirectDisplayID display) __attribute__((weak_import));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <IOKit/graphics/IOGraphicsLib.h>
</span> -#endif
+typedef union
+{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,30 +199,22 @@ index d2e87ecf..7402ea1a 100644
</span> - }
-
- FF_STRBUF_AUTO_DESTROY name = ffStrbufCreate();
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = NULL;
</span> - #ifdef MAC_OS_X_VERSION_10_15
- if(CoreDisplay_DisplayCreateInfoDictionary)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_DisplayCreateInfoDictionary(screen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(displayInfo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFDictionaryRef productNames;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(!ffCfDictGetDict(displayInfo, CFSTR(kDisplayProductName), &productNames))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ffCfDictGetString(productNames, CFSTR("en_US"), &name);
</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:#e0ffe0;'>+- displayInfo = CoreDisplay_DisplayCreateInfoDictionary(screen);
</span> - #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CoreDisplay_IODisplayCreateInfoDictionary)
</span> - {
- io_service_t servicePort = CGDisplayIOServicePort(screen);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(displayInfo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFDictionaryRef productNames;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(!ffCfDictGetDict(displayInfo, CFSTR(kDisplayProductName), &productNames))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ffCfDictGetString(productNames, CFSTR("en_US"), &name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- displayInfo = IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
</span> - }
- #endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(displayInfo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFDictionaryRef productNames;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(!ffCfDictGetDict(displayInfo, CFSTR(kDisplayProductName), &productNames))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ffCfDictGetString(productNames, CFSTR("en_US"), &name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span> -
- CGSize size = CGDisplayScreenSize(screen);
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,6 +243,11 @@ index d2e87ecf..7402ea1a 100644
</span> - ffCfDictGetInt(dict, kCGDisplayBitsPerSample, &bitDepth);
- display->bitDepth = (uint8_t) bitDepth;
- }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (CoreDisplay_Display_IsHDRModeEnabled)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- display->hdrEnabled = CoreDisplay_Display_IsHDRModeEnabled(screen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span> - }
- CGDisplayModeRelease(mode);
- }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,7 +266,6 @@ index d2e87ecf..7402ea1a 100644
</span> + 0
+ );
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> + free(screens);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,22 +280,24 @@ index d2e87ecf..7402ea1a 100644
</span> if (port)
{
ffStrbufSetStatic(&ds->wmProcessName, "WindowServer");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/detection/font/font_apple.m src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 618d1287..06920e31 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,6 +2,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/font/font_apple.m b/src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a2c9fb74..80874ced 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/font/font_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,7 +2,8 @@
</span> #include "common/io/io.h"
#include "font.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#import <AppKit/NSFont.h>
</span> +#include <Foundation/Foundation.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AppKit/NSFont.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;'>+
</span> #include <AvailabilityMacros.h>
<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:#e0ffe0;'>+diff --git a/src/detection/monitor/monitor.h b/src/detection/monitor/monitor.h
</span> index 4066f117..a6150e5d 100644
<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:#e0ffe0;'>+--- a/src/detection/monitor/monitor.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/monitor/monitor.h
</span> @@ -5,7 +5,6 @@ typedef struct FFMonitorResult
FFstrbuf name;
uint32_t width; // native / maximum resolution, in pixels
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,16 +306,16 @@ index 4066f117..a6150e5d 100644
</span> uint32_t physicalWidth; // in mm
uint32_t physicalHeight; // in mm
bool hdrCompatible;
<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 da9f41f4..3e4c9f36 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;'>-@@ -116,22 +116,10 @@ const char* ffDetectMonitor(FFlist* results)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detection/monitor/monitor_apple.m b/src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c72c7f55..5c6cdb0d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/detection/monitor/monitor_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,22 +117,9 @@ 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - FF_CFTYPE_AUTO_RELEASE CFArrayRef modes = CGDisplayCopyAllDisplayModes((CGDirectDisplayID) display->id, NULL);
- double maxRefreshRate = 0;
- for (uint32_t j = 0; j < CFArrayGetCount(modes); ++j)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,17 +336,17 @@ index da9f41f4..3e4c9f36 100644
</span> if (ffCfDictGetInt64(displayInfo, CFSTR("DisplayYearManufacture"), &year) == NULL)
monitor->manufactureYear = (uint16_t) year;
if (ffCfDictGetInt64(displayInfo, CFSTR("DisplayWeekManufacture"), &week) == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/modules/display/display.c src/modules/display/display.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d89a042a..7e18c0c9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/modules/display/display.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/modules/display/display.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/modules/display/display.c b/src/modules/display/display.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8d73a67c..b2f25897 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/modules/display/display.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/modules/display/display.c
</span> @@ -4,9 +4,7 @@
#include "modules/display/display.h"
#include "util/stringUtils.h"
-#include <math.h>
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FF_DISPLAY_NUM_FORMAT_ARGS 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define FF_DISPLAY_NUM_FORMAT_ARGS 15
</span> +#define FF_DISPLAY_NUM_FORMAT_ARGS 9
static int sortByNameAsc(FFDisplayResult* a, FFDisplayResult* b)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -409,7 +406,7 @@ index d89a042a..7e18c0c9 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 +136,6 @@ void ffPrintDisplay(FFDisplayOptions* options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,12 +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;'>@@ -419,11 +416,10 @@ index d89a042a..7e18c0c9 100644
</span> - {FF_FORMAT_ARG_TYPE_DOUBLE, &ppi, "ppi"},
- {FF_FORMAT_ARG_TYPE_UINT8, &result->bitDepth, "bit-depth"},
- {FF_FORMAT_ARG_TYPE_BOOL, &result->hdrEnabled, "hdr-enabled"},
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- {FF_FORMAT_ARG_TYPE_BOOL, &result->wcgEnabled, "wcg-enabled"},
</span> }));
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,27 +285,15 @@ void ffGenerateDisplayJsonResult(FF_MAYBE_UNUSED FFDisplayOptions* options, yyjs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,26 +285,16 @@ 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;'>@@ -432,7 +428,7 @@ index d89a042a..7e18c0c9 100644
</span> yyjson_mut_obj_add_uint(doc, obj, "id", item->id);
yyjson_mut_obj_add_strbuf(doc, obj, "name", &item->name);
yyjson_mut_obj_add_bool(doc, obj, "primary", item->primary);
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - yyjson_mut_val* output = yyjson_mut_obj_add_obj(doc, obj, "output");
- yyjson_mut_obj_add_uint(doc, output, "width", item->width);
- yyjson_mut_obj_add_uint(doc, output, "height", item->height);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -449,13 +445,12 @@ index d89a042a..7e18c0c9 100644
</span> yyjson_mut_obj_add_uint(doc, obj, "rotation", item->rotation);
- yyjson_mut_obj_add_uint(doc, obj, "bitDepth", item->bitDepth);
- yyjson_mut_obj_add_bool(doc, obj, "hdrEnabled", item->hdrEnabled);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- yyjson_mut_obj_add_bool(doc, obj, "wcgEnabled", item->wcgEnabled);
</span> + yyjson_mut_obj_add_uint(doc, obj, "scaledHeight", item->scaledHeight);
+ yyjson_mut_obj_add_uint(doc, obj, "scaledWidth", item->scaledWidth);
switch (item->type)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -355,13 +322,6 @@ void ffPrintDisplayHelpFormat(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -353,12 +323,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;'>@@ -465,14 +460,13 @@ index d89a042a..7e18c0c9 100644
</span> - "Pixels per inch (PPI) - ppi",
- "Bits per color channel - bit-depth",
- "True if high dynamic range (HDR) is enabled - hdr-enabled",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "True if wide color gamut (WCG) is enabled - wcg-enabled",
</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:#e0ffe0;'>+diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c
</span> index 6fdd53eb..27d31cca 100644
<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:#e0ffe0;'>+--- a/src/modules/monitor/monitor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/modules/monitor/monitor.c
</span> @@ -6,7 +6,7 @@
#include <math.h>
<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/0020-Tiger-specific-adjustments-to-CMakeLists.patch
</span>similarity index 92%
rename from sysutils/fastfetch/files/0019-Tiger-specific-adjustments-to-CMakeLists.patch
rename to sysutils/fastfetch/files/0020-Tiger-specific-adjustments-to-CMakeLists.patch
<span style='display:block; white-space:pre;color:#808080;'>index ac3edc78468..79fc3aec7bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0019-Tiger-specific-adjustments-to-CMakeLists.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0020-Tiger-specific-adjustments-to-CMakeLists.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From fbd8a8e7a561b541c645402a8bc438e0d1b7fecb Mon Sep 17 00:00:00 2001
From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Tue, 6 Aug 2024 05:54:30 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 19/19] Tiger-specific adjustments to CMakeLists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Tiger-specific adjustments to CMakeLists
</span>
---
CMakeLists.txt | 5 ++---
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@ Subject: [PATCH 19/19] Tiger-specific adjustments to CMakeLists
</span>
diff --git CMakeLists.txt CMakeLists.txt
index 9789682b..7ec8ff75 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span> @@ -627,7 +627,7 @@ elseif(APPLE)
src/common/networking_linux.c
src/common/processing_linux.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +37,3 @@ index 9789682b..7ec8ff75 100644
</span> PRIVATE "-framework CoreVideo"
PRIVATE "-framework IOBluetooth"
PRIVATE "-framework IOKit"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.46.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>