Skip to content

Commit 01dbd0c

Browse files
committed
macOS: completely drop libplist dependency
1 parent 11f3dc3 commit 01dbd0c

File tree

8 files changed

+1
-13
lines changed

8 files changed

+1
-13
lines changed

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
uses: actions/checkout@v3
6565

6666
- name: install required packages
67-
run: brew install vulkan-loader libplist
67+
run: brew install vulkan-loader molten-vk
6868

6969
- name: Initialize CodeQL
7070
uses: github/codeql-action/init@v2

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ cmake_dependent_option(ENABLE_EGL "Enable egl" ON "LINUX OR BSD" OFF)
4646
cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX OR BSD" OFF)
4747
cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX OR BSD" OFF)
4848
cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX OR BSD" OFF)
49-
cmake_dependent_option(ENABLE_LIBPLIST "Enable libplist" ON "APPLE" OFF)
5049
cmake_dependent_option(ENABLE_LIBCJSON "Enable libcjson" ON "LINUX" OFF)
5150
cmake_dependent_option(ENABLE_FREETYPE "Enable freetype" ON "ANDROID" OFF)
5251

@@ -396,7 +395,6 @@ ff_lib_enable(EGL egl)
396395
ff_lib_enable(GLX glx)
397396
ff_lib_enable(OSMESA osmesa)
398397
ff_lib_enable(OPENCL OpenCL)
399-
ff_lib_enable(LIBPLIST libplist-2.0)
400398
ff_lib_enable(LIBCJSON libcjson)
401399
ff_lib_enable(FREETYPE freetype2)
402400

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ The following libraries are used if present at runtime:
4444
* [`libXFConf`](https://gitlab.xfce.org/xfce/xfconf): Needed for XFWM theme and XFCE Terminal font.
4545
* [`libsqlite3`](https://www.sqlite.org/index.html): Needed for pkg & rpm package count.
4646
* [`librpm`](http://rpm.org/): Slower fallback for rpm package count. Needed on openSUSE.
47-
* [`libplist`](https://github.com/libimobiledevice/libplist): Binary `plist` file parser ( macOS ). Needed for iTerm2 Terminal font and WM Theme.
4847
* [`libcJSON`](https://github.com/DaveGamble/cJSON): Needed for Windows Terminal font ( WSL ).
4948
* [`freetype`](https://www.freetype.org/): Needed for Termux font detection ( Android ).
5049

src/common/init.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ static void defaultConfig(FFinstance* instance)
219219
ffStrbufInitA(&instance->config.libGLX, 0);
220220
ffStrbufInitA(&instance->config.libOSMesa, 0);
221221
ffStrbufInitA(&instance->config.libOpenCL, 0);
222-
ffStrbufInitA(&instance->config.libplist, 0);
223222
ffStrbufInitA(&instance->config.libcJSON, 0);
224223
ffStrbufInitA(&instance->config.libfreetype, 0);
225224

@@ -482,9 +481,6 @@ void ffListFeatures()
482481
#ifdef FF_HAVE_OPENCL
483482
"opencl\n"
484483
#endif
485-
#ifdef FF_HAVE_LIBPLIST
486-
"libplist\n"
487-
#endif
488484
#ifdef FF_HAVE_LIBCJSON
489485
"libcjson\n"
490486
#endif

src/data/config_user.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,5 @@
347347
#--lib-glx /usr/lib/libGLX.so
348348
#--lib-osmesa /usr/lib/libOSMesa.so
349349
#--lib-opencl /usr/lib/libOpenCL.so
350-
#--lib-plist /usr/local/bin/libplist-2.0.dylib
351350
#--lib-cjson /usr/lib/libcjson.so
352351
#--lib-freetype /data/data/com.termux/files/usr/lib

src/data/help.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ Library options: Set the path of a library to load
8484
--lib-glx <path>
8585
--lib-osmesa <path>
8686
--lib-opencl <path>
87-
--lib-plist <path>
8887
--lib-cjson <path>
8988

9089
Module specific options:

src/fastfetch.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,8 +1241,6 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
12411241
optionParseString(key, value, &instance->config.libOSMesa);
12421242
else if(strcasecmp(key, "--lib-opencl") == 0)
12431243
optionParseString(key, value, &instance->config.libOpenCL);
1244-
else if(strcasecmp(key, "--lib-plist") == 0)
1245-
optionParseString(key, value, &instance->config.libplist);
12461244
else if(strcasecmp(key, "--lib-cjson") == 0)
12471245
optionParseString(key, value, &instance->config.libcJSON);
12481246

src/fastfetch.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ typedef struct FFconfig
151151
FFstrbuf libGLX;
152152
FFstrbuf libOSMesa;
153153
FFstrbuf libOpenCL;
154-
FFstrbuf libplist;
155154
FFstrbuf libcJSON;
156155
FFstrbuf libfreetype;
157156

0 commit comments

Comments
 (0)