<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/aa8da1182d1b3559a1ff96494516381bbf3ba200">https://github.com/macports/macports-ports/commit/aa8da1182d1b3559a1ff96494516381bbf3ba200</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 aa8da1182d1 fastfetch: update to 2.24.0 for old systems
</span>aa8da1182d1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aa8da1182d1b3559a1ff96494516381bbf3ba200
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Sep 14 07:56:10 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> fastfetch: update to 2.24.0 for old systems
</span>---
sysutils/fastfetch/Portfile | 8 ++--
.../0001-Support-hostinfo-for-PowerPC-Macs.patch | 4 +-
...version.c-add-a-missing-macro-for-powerpc.patch | 4 +-
.../files/0003-Support-PowerPC-CPU-detection.patch | 28 ++++++------
.../files/0004-gpu_apple.m-unbreak-for-10.11.patch | 4 +-
.../files/0005-memory_apple-fix-for-32-bit.patch | 4 +-
.../files/0006-opengl_apple.c-fix-for-10.7.patch | 6 +--
.../files/0007-sound_apple.c-fix-for-10.8.patch | 4 +-
.../0008-gpu_apple.c-fix-for-old-systems.patch | 4 +-
.../0009-camera_apple.m-unbreak-for-10.7.patch | 4 +-
...-brightness_apple.c-add-a-missing-include.patch | 4 +-
...011-os_apple.m-etc.-fix-syntax-for-plists.patch | 8 ++--
.../files/0012-osascript.m-fix-syntax.patch | 4 +-
...013-disk_bsd-no-support-for-creation-time.patch | 4 +-
.../files/0014-yyjson-PowerPC-macros.patch | 4 +-
.../0015-monitor_apple.m-no-HDR-before-10.11.patch | 4 +-
.../files/0016-Fix-autorelease-pools.patch | 4 +-
.../files/0017-Fix-compatibility-with-10.4.patch | 4 +-
.../files/0018-Revert-some-breakages.patch | 50 +++++++++++-----------
.../0019-CMakeLists-adjust-for-legacy-macOS.patch | 20 ++++-----
...0-swap_fat_arch_64-does-not-exist-in-10.6.patch | 8 ++--
...akeLists-do-not-use-Linux-ldflag-on-macOS.patch | 11 +++--
22 files changed, 100 insertions(+), 95 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 27a899ed5e1..40cd6a034c9 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;'>@@ -60,11 +60,11 @@ 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.23.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup fastfetch-cli fastfetch 2.24.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d4f79a4658738920818ba7e2981cd78e19389ea4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3c92dd2cb15faf55d87846eda8d14456af2d0e0938998434144074c695c57529 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1105725
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 db6ac50591522da349902192146f26cf764882c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 675ac3f9dbe00277416744fa36a28fc9cd1284d17f055a4db339063bfc6a8209 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1104540
</span>
maintainers-append \
{@barracuda156 gmail.com:vital.had}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0001-Support-hostinfo-for-PowerPC-Macs.patch b/sysutils/fastfetch/files/0001-Support-hostinfo-for-PowerPC-Macs.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 60084dfc95d..f33f45dc338 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0001-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c8d52df37ba41829f3040c03f14cd1a75fec2b4a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4ebfcf685018f55d9cb611b65936d7cc0d4929b1 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 01/19] Support hostinfo for PowerPC Macs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 01/21] Support hostinfo for PowerPC Macs
</span>
---
src/detection/host/host_apple.c | 54 +++++++++++++++++++++++++++++++++
<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><span style='display:block; white-space:pre;color:#808080;'>index 1696a673008..49639e71f7e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0002-version.c-add-a-missing-macro-for-powerpc.patch
</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;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7a24689e4e6283f564fc0f726b645d9e13d3bad3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4b421119737dfdc925baafce7b30433f9836010f Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Tue, 6 Aug 2024 09:31:41 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 02/19] version.c: add a missing macro for powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 02/21] version.c: add a missing macro for powerpc
</span>
---
src/detection/version/version.c | 2 +-
<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><span style='display:block; white-space:pre;color:#808080;'>index fb8a27d40d2..58076d9b942 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0003-Support-PowerPC-CPU-detection.patch
</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;'>@@ -1,23 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0e5b27becf205847a52d27548ddc88e72a7e9833 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cc435d56d1b507c949231ea4ce7dd367b5c99a8f 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, 27 Aug 2024 15:01:43 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 03/19] Support PowerPC CPU detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 12 Sep 2024 08:05:15 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 03/21] Support PowerPC CPU detection
</span>
---
src/detection/cpu/cpu.c | 11 +++++++++++
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/detection/cpu/cpu.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detection/cpu/cpu.h | 1 +
</span> src/detection/cpu/cpu_apple.c | 12 +++++++++++-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 23 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 23 insertions(+), 1 deletion(-)
</span>
diff --git a/src/detection/cpu/cpu.c b/src/detection/cpu/cpu.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index dc27da24..13e97f5b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 298eb5bf..a664dad8 100644
</span> --- a/src/detection/cpu/cpu.c
+++ b/src/detection/cpu/cpu.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,3 +40,14 @@ const char* ffCPUAppleCodeToName(uint32_t code)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default: return "Apple Silicon";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +41,17 @@ const char* ffCPUAppleCodeToName(uint32_t code)
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +const char* ffCPUApplePPCCodeToName(int cpuSubType)
+{
+ switch (cpuSubType)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,19 +27,22 @@ index dc27da24..13e97f5b 100644
</span> + default: return "PowerPC";
+ }
+}
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* ffCPUQualcommCodeToName(uint32_t code)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // https://github.com/AsahiLinux/docs/wiki/Codenames
</span> diff --git a/src/detection/cpu/cpu.h b/src/detection/cpu/cpu.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index dd2d178e..bb99c424 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9ddc0030..2ebf1b23 100644
</span> --- a/src/detection/cpu/cpu.h
+++ b/src/detection/cpu/cpu.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,7 @@ typedef struct FFCPUResult
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,7 @@ typedef struct FFCPUResult
</span>
const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu);
const char* ffCPUAppleCodeToName(uint32_t code);
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span> +const char* ffCPUApplePPCCodeToName(int cpuSubType);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* ffCPUQualcommCodeToName(uint32_t code);
</span>
#if defined(__x86_64__) || defined(__i386__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c
index efdad950..cd2cf8ce 100644
--- a/src/detection/cpu/cpu_apple.c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0004-gpu_apple.m-unbreak-for-10.11.patch b/sysutils/fastfetch/files/0004-gpu_apple.m-unbreak-for-10.11.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 129a2d48b2c..1e007a993b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0004-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From fd0c0ffe50dbfa34e36ca4be64e6ebfb42788d47 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 83b36221b2544ff01c2b94839279b715cb1bfe9e 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 04/19] gpu_apple.m: unbreak for < 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 04/21] gpu_apple.m: unbreak for < 10.11
</span>
---
src/detection/gpu/gpu_apple.m | 5 +++++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0005-memory_apple-fix-for-32-bit.patch b/sysutils/fastfetch/files/0005-memory_apple-fix-for-32-bit.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f5ea3e09114..f8c1220699a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0005-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7114ef3b2fbe18049c28af92a00d666f67aef3c5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 368dfe132a4ac8862e6f305787e842d36c1476a7 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 05/19] memory_apple: fix for 32-bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 05/21] memory_apple: fix for 32-bit
</span>
---
src/detection/memory/memory_apple.c | 10 ++++++++++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0006-opengl_apple.c-fix-for-10.7.patch b/sysutils/fastfetch/files/0006-opengl_apple.c-fix-for-10.7.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c0aaa0a7b81..40d5e9d65b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0006-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,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ccdf551ebfe9733f3e6c675c029aa3d1594687bf Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5b22c42f1200b046f981664c1f0fa2c6ef98b3ca 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 06/19] opengl_apple.c: fix for < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 06/21] opengl_apple.c: fix for < 10.7
</span>
---
src/detection/opengl/opengl_apple.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/detection/opengl/opengl_apple.c b/src/detection/opengl/opengl_apple.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c6b56f07..8c97eeda 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 63751d6b..1d1944a5 100644
</span> --- a/src/detection/opengl/opengl_apple.c
+++ b/src/detection/opengl/opengl_apple.c
@@ -1,4 +1,4 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0007-sound_apple.c-fix-for-10.8.patch b/sysutils/fastfetch/files/0007-sound_apple.c-fix-for-10.8.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e9526c85c99..4d2ddec7a23 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0007-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 28e7f3e61629f6242b96afe89c0f0987d8ffbcce Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From edeecd642157ba9cd7389d3602fc2bf9273f1cf9 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 07/19] sound_apple.c: fix for < 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 07/21] sound_apple.c: fix for < 10.8
</span>
---
src/detection/sound/sound_apple.c | 5 +++++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0008-gpu_apple.c-fix-for-old-systems.patch b/sysutils/fastfetch/files/0008-gpu_apple.c-fix-for-old-systems.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 40b2662515d..c5cbd36ae8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0008-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ef56f002f6ea96f5b942912b285c11ad63c26f6c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a75cddf02089f68e77e6ccad6f77d7704b06eb79 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 08/19] gpu_apple.c: fix for old systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 08/21] gpu_apple.c: fix for old systems
</span>
---
src/detection/gpu/gpu_apple.c | 3 +++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0009-camera_apple.m-unbreak-for-10.7.patch b/sysutils/fastfetch/files/0009-camera_apple.m-unbreak-for-10.7.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9bc7131edc1..d1fef6bece5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0009-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1bc11125ef4fddd4a7c0a87a8666755cf8877b0c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From fd63f0979048b7543f216475f36a7af658057c05 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 09/19] camera_apple.m: unbreak for < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 09/21] camera_apple.m: unbreak for < 10.7
</span>
---
src/detection/camera/camera_apple.m | 4 ++++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0010-brightness_apple.c-add-a-missing-include.patch b/sysutils/fastfetch/files/0010-brightness_apple.c-add-a-missing-include.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c993bb5682..129087cda25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0010-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9d47faf725df10720b0174f3870565952752ecb1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1b953f14a52c03f1e3408800e77c2c9c28444222 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 10/19] brightness_apple.c: add a missing include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 10/21] brightness_apple.c: add a missing include
</span>
---
src/detection/brightness/brightness_apple.c | 3 ++-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0011-os_apple.m-etc.-fix-syntax-for-plists.patch b/sysutils/fastfetch/files/0011-os_apple.m-etc.-fix-syntax-for-plists.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 47ad526e099..74669340330 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0011-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 1fb64e94a8220bd3f2813557a3c15f49ce2833a8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From bbdadcca8732bb57749ffda998ab2e22e7fb8035 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 11/19] os_apple.m etc.: fix syntax for plists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 11/21] os_apple.m etc.: fix syntax for plists
</span>
---
CMakeLists.txt | 2 +-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ Subject: [PATCH 11/19] os_apple.m etc.: fix syntax for plists
</span> 5 files changed, 18 insertions(+), 54 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1abe943d..37013992 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7efcfde8..48b09289 100644
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -643,7 +643,7 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -647,7 +647,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;color:#808080;'>diff --git a/sysutils/fastfetch/files/0012-osascript.m-fix-syntax.patch b/sysutils/fastfetch/files/0012-osascript.m-fix-syntax.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e58ac03c084..5d5362c894f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0012-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e42506ec282f89d10b15d5f4430c2001f0e1dfc5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a001fe2c929b53138914ea3289d94ddd97574951 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 12/19] osascript.m: fix syntax
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 12/21] osascript.m: fix syntax
</span>
---
src/util/apple/osascript.m | 14 +++++++-------
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0013-disk_bsd-no-support-for-creation-time.patch b/sysutils/fastfetch/files/0013-disk_bsd-no-support-for-creation-time.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 40c1bfeead7..33115e4ca78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0013-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ba6071276ef71b1d4f02c68c89813183523aac20 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5612e01f8c0e66558bd63c3f97b8fd0e7a68c217 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 13/19] disk_bsd: no support for creation time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 13/21] disk_bsd: no support for creation time
</span>
---
src/detection/disk/disk_bsd.c | 3 +++
<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><span style='display:block; white-space:pre;color:#808080;'>index 00ccf46cae9..d94de059e22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0014-yyjson-PowerPC-macros.patch
</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;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7bb957418770816db84fa0ebe5263d7e9e9b40b6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7baf71981bcdfef363283e8de1fbed98818c4877 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Thu, 15 Aug 2024 22:15:15 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 14/19] yyjson: PowerPC macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 14/21] yyjson: PowerPC macros
</span>
---
src/3rdparty/yyjson/yyjson.c | 2 +-
<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><span style='display:block; white-space:pre;color:#808080;'>index effa8529a2c..6ad00f32ec6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0015-monitor_apple.m-no-HDR-before-10.11.patch
</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;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 41ca98e98e8a099c6144f48f87f374f4f259723a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 730c592561f97748df02ca22510abe2e181e206a Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Thu, 15 Aug 2024 22:19:23 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 15/19] monitor_apple.m: no HDR before 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 15/21] monitor_apple.m: no HDR before 10.11
</span>
---
src/detection/monitor/monitor_apple.m | 7 +++++++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0016-Fix-autorelease-pools.patch b/sysutils/fastfetch/files/0016-Fix-autorelease-pools.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 43f33c14ceb..3656adcdd25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0016-Fix-autorelease-pools.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0016-Fix-autorelease-pools.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 46cdebf1d95b992c677b234e1b63cd1ac703d1ca Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2a92d3c06adedac7b0ee6088865b88fccffcb198 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Thu, 15 Aug 2024 22:41:23 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 16/19] Fix autorelease pools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 16/21] Fix autorelease pools
</span>
---
src/detection/bluetooth/bluetooth_apple.m | 13 ++++++++++++-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0017-Fix-compatibility-with-10.4.patch b/sysutils/fastfetch/files/0017-Fix-compatibility-with-10.4.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ddf19ef1f4..8e1520ef67d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0017-Fix-compatibility-with-10.4.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0017-Fix-compatibility-with-10.4.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 fad2a4dba82d239f2c060b2b3cddb89ccf04ed0b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c064f12df209043cbc47b99c5ccb1aef41d2627b Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Tue, 6 Aug 2024 03:52:56 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 17/19] Fix compatibility with 10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 17/21] Fix compatibility with 10.4
</span>
---
src/common/processing_linux.c | 8 ++++++--
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0018-Revert-some-breakages.patch b/sysutils/fastfetch/files/0018-Revert-some-breakages.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 44ddbf8ff68..81c3d0519cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0018-Revert-some-breakages.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0018-Revert-some-breakages.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 33e8c1d7a6574c8e2a0e892f659e84647c2f0b80 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a7d9d6274e96ef4a269a8dd15d54390795beef67 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, 27 Aug 2024 16:03:55 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 18/19] Revert some breakages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 12 Sep 2024 08:17:48 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 18/21] Revert some breakages
</span>
---
src/detection/displayserver/displayserver.c | 35 +++--
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,9 +10,9 @@ Subject: [PATCH 18/19] Revert some breakages
</span> src/detection/font/font_apple.m | 3 +-
src/detection/monitor/monitor.h | 1 -
src/detection/monitor/monitor_apple.m | 19 +--
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/modules/display/display.c | 60 ++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/modules/display/display.c | 63 ++------
</span> src/modules/monitor/monitor.c | 8 +-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8 files changed, 98 insertions(+), 180 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8 files changed, 98 insertions(+), 183 deletions(-)
</span>
diff --git a/src/detection/displayserver/displayserver.c b/src/detection/displayserver/displayserver.c
index ddc97396..20a36623 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,7 +339,7 @@ index c72c7f55..5c6cdb0d 100644
</span> monitor->manufactureYear = (uint16_t) year;
if (ffCfDictGetInt64(displayInfo, CFSTR("DisplayWeekManufacture"), &week) == NULL)
diff --git a/src/modules/display/display.c b/src/modules/display/display.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c180d338..55c0c8bb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4e3f67eb..277ad49d 100644
</span> --- a/src/modules/display/display.c
+++ b/src/modules/display/display.c
@@ -4,9 +4,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -408,20 +408,20 @@ index c180d338..55c0c8bb 100644
</span> char refreshRate[16];
if(result->refreshRate > 0)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,12 +147,6 @@ void ffPrintDisplay(FFDisplayOptions* options)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {FF_FORMAT_ARG_TYPE_STRING, displayType, "type"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {FF_FORMAT_ARG_TYPE_UINT, &result->rotation, "rotation"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {FF_FORMAT_ARG_TYPE_BOOL, &result->primary, "is-primary"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {FF_FORMAT_ARG_TYPE_UINT, &result->physicalWidth, "physical-width"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {FF_FORMAT_ARG_TYPE_UINT, &result->physicalHeight, "physical-height"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {FF_FORMAT_ARG_TYPE_DOUBLE, &inch, "inch"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {FF_FORMAT_ARG_TYPE_DOUBLE, &ppi, "ppi"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {FF_FORMAT_ARG_TYPE_UINT8, &result->bitDepth, "bit-depth"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {FF_FORMAT_ARG_TYPE_BOOL, &result->hdrEnabled, "hdr-enabled"},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,12 +146,6 @@ void ffPrintDisplay(FFDisplayOptions* options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_FORMAT_ARG(displayType, "type"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_FORMAT_ARG(result->rotation, "rotation"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_FORMAT_ARG(result->primary, "is-primary"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_FORMAT_ARG(result->physicalWidth, "physical-width"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_FORMAT_ARG(result->physicalHeight, "physical-height"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_FORMAT_ARG(inch, "inch"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_FORMAT_ARG(ppi, "ppi"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_FORMAT_ARG(result->bitDepth, "bit-depth"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_FORMAT_ARG(result->hdrEnabled, "hdr-enabled"),
</span> }));
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -316,26 +296,16 @@ void ffGenerateDisplayJsonResult(FF_MAYBE_UNUSED FFDisplayOptions* options, yyjs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,26 +296,14 @@ 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;'>@@ -443,8 +443,8 @@ index c180d338..55c0c8bb 100644
</span> - yyjson_mut_obj_add_uint(doc, physical, "width", item->physicalWidth);
- yyjson_mut_obj_add_uint(doc, physical, "height", item->physicalHeight);
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- yyjson_mut_obj_add_real(doc, obj, "refreshRate", item->refreshRate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yyjson_mut_obj_add_uint(doc, obj, "rotation", item->rotation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- yyjson_mut_obj_add_real(doc, obj, "refreshRate", item->refreshRate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- yyjson_mut_obj_add_uint(doc, obj, "rotation", item->rotation);
</span> - yyjson_mut_obj_add_uint(doc, obj, "bitDepth", item->bitDepth);
- yyjson_mut_obj_add_bool(doc, obj, "hdrEnabled", item->hdrEnabled);
+ yyjson_mut_obj_add_uint(doc, obj, "scaledHeight", item->scaledHeight);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -452,7 +452,7 @@ index c180d338..55c0c8bb 100644
</span>
switch (item->type)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,12 +334,6 @@ void ffPrintDisplayHelpFormat(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,12 +332,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;'>@@ -466,7 +466,7 @@ index c180d338..55c0c8bb 100644
</span> }
diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6fdd53eb..27d31cca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a2d43cff..fd823fb5 100644
</span> --- a/src/modules/monitor/monitor.c
+++ b/src/modules/monitor/monitor.c
@@ -6,7 +6,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -488,10 +488,10 @@ index 6fdd53eb..27d31cca 100644
</span> printf(" - %ux%u mm (%.2f inches, %.2f ppi)\n", display->physicalWidth, display->physicalHeight, inch, ppi);
else
@@ -82,7 +80,6 @@ void ffPrintMonitor(FFMonitorOptions* options)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {FF_FORMAT_ARG_TYPE_UINT16, &display->manufactureYear, "manufacture-year"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {FF_FORMAT_ARG_TYPE_UINT16, &display->manufactureWeek, "manufacture-week"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {FF_FORMAT_ARG_TYPE_STRING, buf, "serial"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {FF_FORMAT_ARG_TYPE_DOUBLE, buf, "refresh-rate"},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_FORMAT_ARG(display->manufactureYear, "manufacture-year"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_FORMAT_ARG(display->manufactureWeek, "manufacture-week"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_FORMAT_ARG(buf, "serial"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_FORMAT_ARG(display->refreshRate, "refresh-rate"),
</span> }));
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0019-CMakeLists-adjust-for-legacy-macOS.patch b/sysutils/fastfetch/files/0019-CMakeLists-adjust-for-legacy-macOS.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 224476e778e..24229fe1310 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0019-CMakeLists-adjust-for-legacy-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0019-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 dd45b3a06ff1f8dd19a47bac7e2bb21140064e05 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dc743cff581b33c468536d4267e555da2a3789de Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Tue, 27 Aug 2024 16:06:55 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 19/19] CMakeLists: adjust for legacy macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 19/21] CMakeLists: adjust for legacy macOS
</span>
---
CMakeLists.txt | 36 ++++++++++++++----------------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 37013992..6b2a2bcf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 48b09289..0b88ab15 100644
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,10 +112,10 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,10 +113,10 @@ else()
</span> message(STATUS "Threads type: disabled")
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ index 37013992..6b2a2bcf 100644
</span>
if(WIN32 OR ENABLE_DIRECTX_HEADERS)
enable_language(CXX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -634,11 +634,11 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -638,11 +638,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 37013992..6b2a2bcf 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;'>-@@ -647,7 +647,7 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -651,7 +651,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 37013992..6b2a2bcf 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;'>-@@ -661,15 +661,15 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -665,15 +665,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 37013992..6b2a2bcf 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;'>-@@ -680,8 +680,8 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -684,8 +684,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 37013992..6b2a2bcf 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;'>-@@ -885,7 +885,7 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -892,7 +892,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 37013992..6b2a2bcf 100644
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1105,25 +1105,17 @@ if(LINUX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1131,25 +1131,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/0020-swap_fat_arch_64-does-not-exist-in-10.6.patch b/sysutils/fastfetch/files/0020-swap_fat_arch_64-does-not-exist-in-10.6.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index be00e3f7d4c..27718d12f91 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0020-swap_fat_arch_64-does-not-exist-in-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0020-swap_fat_arch_64-does-not-exist-in-10.6.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 2839bddf52dad7555e1728818de4b0d5b95dfa1a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c8c6959a0143624772b2837e7b1de54f039e5dba Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Tue, 27 Aug 2024 16:40:51 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 20/20] swap_fat_arch_64 does not exist in 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 20/21] swap_fat_arch_64 does not exist in 10.6
</span>
---
src/util/binary_apple.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/util/binary_apple.c b/src/util/binary_apple.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 940228af..7aad3f6c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6efeb5d5..c3fa3328 100644
</span> --- a/src/util/binary_apple.c
+++ b/src/util/binary_apple.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,13 +141,12 @@ static const char* dumpFatHeader(FILE *objFile, bool (*cb)(const char *str, uint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,13 +142,12 @@ static const char* dumpFatHeader(FILE *objFile, bool (*cb)(const char *str, uint
</span> }
else
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fastfetch/files/0021-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch b/sysutils/fastfetch/files/0021-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e268ce24d4b..971a9b74993 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fastfetch/files/0021-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fastfetch/files/0021-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 01a73b6ce087eb402daa238dab5e5c61aab4f8c5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c0010a09b0b311b67ffeeef089701f0a3ee7caf9 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Sat, 7 Sep 2024 18:06:12 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] CMakeLists: do not use Linux ldflag on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 21/21] CMakeLists: do not use Linux ldflag on macOS
</span>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6b2a2bcf..f8fd30bd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0b88ab15..ed062e61 100644
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,7 +136,7 @@ if(ENABLE_ASAN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +137,7 @@ if(ENABLE_ASAN)
</span> endif()
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG}")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG} -fstack-protector-all -fno-delete-null-pointer-checks")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,3 +20,6 @@ index 6b2a2bcf..f8fd30bd 100644
</span> set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic")
endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>