From c16f9a9e209c38c530b7ba3053a8b6d05ccf10fe Mon Sep 17 00:00:00 2001 From: Nanda H Krishna Date: Wed, 22 Feb 2023 00:22:37 -0500 Subject: [PATCH 1/3] sound_apple.c: handle `kAudioObjectPropertyElementMain` for macOS < 12 --- src/detection/sound/sound_apple.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/detection/sound/sound_apple.c b/src/detection/sound/sound_apple.c index a9ec04703..e34920969 100644 --- a/src/detection/sound/sound_apple.c +++ b/src/detection/sound/sound_apple.c @@ -2,6 +2,11 @@ #include "util/apple/cf_helpers.h" #include +#include + +#ifndef MAC_OS_VERSION_12_0 +#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster +#endif const char* ffDetectSound(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* devices /* List of FFSoundDevice */) { From e05d9da231fde924a9b8efa2f385e8bdcd643529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 22 Feb 2023 15:12:37 +0800 Subject: [PATCH 2/3] Battery / Wifi: fix missing `NULL` for ffProcessAppendStdOut --- src/detection/battery/battery_android.c | 3 ++- src/detection/wifi/wifi_android.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c index c80e5cf6b..1a783e595 100644 --- a/src/detection/battery/battery_android.c +++ b/src/detection/battery/battery_android.c @@ -14,7 +14,8 @@ const char* ffDetectBatteryImpl(FF_MAYBE_UNUSED FFinstance* instance, FFlist* re if(ffProcessAppendStdOut(&buffer, (char* const[]){ FF_TERMUX_API_PATH, - FF_TERMUX_API_PARAM + FF_TERMUX_API_PARAM, + NULL })) return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed"; diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c index e7278407e..8e6e2b072 100644 --- a/src/detection/wifi/wifi_android.c +++ b/src/detection/wifi/wifi_android.c @@ -13,7 +13,8 @@ const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* res if(ffProcessAppendStdOut(&buffer, (char* const[]){ FF_TERMUX_API_PATH, - FF_TERMUX_API_PARAM + FF_TERMUX_API_PARAM, + NULL })) return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed"; From 695e3cc6928283d13343f74d819b5365aec886cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 22 Feb 2023 15:16:54 +0800 Subject: [PATCH 3/3] Release: 1.10.2 --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dcb35548..a90abc86e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.10.2 + +Bugfixes: +* Handle `kAudioObjectPropertyElementMain` for macOS **SDK** < 12 (#425, @nandahkrishna) +* Add missing `NULL` for `ffProcessAppendStdOut` (#421) + # 1.10.1 New release for debugging #421 diff --git a/CMakeLists.txt b/CMakeLists.txt index bda2635cb..0d1e28152 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url project(fastfetch - VERSION 1.10.1 + VERSION 1.10.2 LANGUAGES C DESCRIPTION "Fast system information tool" HOMEPAGE_URL "https://github.com/LinusDierheimer/fastfetch"