Merge pull request #426 from LinusDierheimer/dev

Release: 1.10.2
fastfetch-cli · Feb 22, 2023 · 4f4860e · 4f4860e
2 parents 74b1871 + 695e3cc
commit 4f4860e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git 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
@@ -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"

diff --git 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/sound/sound_apple.c b/src/detection/sound/sound_apple.c
@@ -2,6 +2,11 @@
 #include "util/apple/cf_helpers.h"
 
 #include <CoreAudio/CoreAudio.h>
+#include <AvailabilityMacros.h>
+
+#ifndef MAC_OS_VERSION_12_0
+#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
+#endif
 
 const char* ffDetectSound(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* devices /* List of FFSoundDevice */)
 {

diff --git 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";