diff --git a/pkg.info b/pkg.info index bbb8812..5e2db93 100644 --- a/pkg.info +++ b/pkg.info @@ -1,6 +1,6 @@ name: fastfetch description: A maintained, feature-rich and performance oriented, neofetch like system information tool -version: 2.55.1 +version: 2.56.0 revision: 1 url: https://github.com/fastfetch-cli/fastfetch license: MIT @@ -39,4 +39,4 @@ downloads: - url: https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: 65178a21158872990f570e09ca988a7dbeed3fbc27a6d64152ffdd73a9096fbd + checksum: 8df6f21b168069dc35eb361eed47815650a5253f5e0f6948c5490faf375aad74 diff --git a/source-files/add-tide-bpm-detection.patch b/source-files/add-tide-bpm-detection.patch index df318fd..608f0cf 100644 --- a/source-files/add-tide-bpm-detection.patch +++ b/source-files/add-tide-bpm-detection.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 045b8f7b..9342c677 100644 +index ef745278..513ca770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -103,7 +103,7 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS) +@@ -115,7 +115,7 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS) message(FATAL_ERROR "BINARY_LINK_TYPE must be one of ${BINARY_LINK_TYPE_OPTIONS}") endif() @@ -12,7 +12,7 @@ index 045b8f7b..9342c677 100644 if(package_manager STREQUAL "WINGET") option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" ON) diff --git a/doc/json_schema.json b/doc/json_schema.json -index d32269bd..a4ab7be1 100644 +index 57096616..b17b58aa 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -442,7 +442,7 @@ @@ -25,7 +25,7 @@ index d32269bd..a4ab7be1 100644 }, "physicaldiskFormat": { diff --git a/src/detection/packages/packages.h b/src/detection/packages/packages.h -index 7464a30c..c684d33b 100644 +index 12e98793..6db93e17 100644 --- a/src/detection/packages/packages.h +++ b/src/detection/packages/packages.h @@ -8,6 +8,7 @@ typedef struct FFPackagesResult @@ -37,10 +37,10 @@ index 7464a30c..c684d33b 100644 uint32_t brewCask; uint32_t choco; diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c -index 3d83f3a5..42acc3c8 100644 +index fc5a0cf2..a7be2081 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c -@@ -452,6 +452,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts, +@@ -453,6 +453,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts, if (!(options->disabled & FF_PACKAGES_FLAG_PACSTALL_BIT)) packageCounts->pacstall += getNumElements(baseDir, "/var/lib/pacstall/metadata", false); if (!(options->disabled & FF_PACKAGES_FLAG_PISI_BIT)) packageCounts->pisi += getNumElements(baseDir, "/var/lib/pisi/package", true); if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT)) packageCounts->pkgsrc += getNumElements(baseDir, "/usr/pkg/pkgdb", DT_DIR); @@ -69,10 +69,10 @@ index 00000000..2d8b44e3 + $2*$1@@$2~~ $2~$1@@@@$2~~~ + $2~~ $2~~~~ diff --git a/src/logo/builtin.c b/src/logo/builtin.c -index 26bce146..b6446fca 100644 +index ca9fca50..79a7ef66 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c -@@ -4788,6 +4788,17 @@ static const FFlogo T[] = { +@@ -4845,6 +4845,17 @@ static const FFlogo T[] = { FF_COLOR_FG_GREEN, }, }, @@ -91,79 +91,19 @@ index 26bce146..b6446fca 100644 { .names = {"Torizon OS", "TorizonCore"}, diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h -index 240ca666..5b1d9e98 100644 +index f3954138..c580d2be 100644 --- a/src/modules/packages/option.h +++ b/src/modules/packages/option.h -@@ -6,36 +6,37 @@ typedef enum __attribute__((__packed__)) FFPackagesFlags - { - FF_PACKAGES_FLAG_NONE = 0, - FF_PACKAGES_FLAG_APK_BIT = 1ULL << 0, -- FF_PACKAGES_FLAG_BREW_BIT = 1ULL << 1, -- FF_PACKAGES_FLAG_CHOCO_BIT = 1ULL << 2, -- FF_PACKAGES_FLAG_DPKG_BIT = 1ULL << 3, -- FF_PACKAGES_FLAG_EMERGE_BIT = 1ULL << 4, -- FF_PACKAGES_FLAG_EOPKG_BIT = 1ULL << 5, -- FF_PACKAGES_FLAG_FLATPAK_BIT = 1ULL << 6, -- FF_PACKAGES_FLAG_NIX_BIT = 1ULL << 7, -- FF_PACKAGES_FLAG_OPKG_BIT = 1ULL << 8, -- FF_PACKAGES_FLAG_PACMAN_BIT = 1ULL << 9, -- FF_PACKAGES_FLAG_PALUDIS_BIT = 1ULL << 10, -- FF_PACKAGES_FLAG_PKG_BIT = 1ULL << 11, -- FF_PACKAGES_FLAG_PKGTOOL_BIT = 1ULL << 12, -- FF_PACKAGES_FLAG_MACPORTS_BIT = 1ULL << 13, -- FF_PACKAGES_FLAG_RPM_BIT = 1ULL << 14, -- FF_PACKAGES_FLAG_SCOOP_BIT = 1ULL << 15, -- FF_PACKAGES_FLAG_SNAP_BIT = 1ULL << 16, -- FF_PACKAGES_FLAG_WINGET_BIT = 1ULL << 17, -- FF_PACKAGES_FLAG_XBPS_BIT = 1ULL << 18, -- FF_PACKAGES_FLAG_AM_BIT = 1ULL << 19, -- FF_PACKAGES_FLAG_SORCERY_BIT = 1ULL << 20, -- FF_PACKAGES_FLAG_LPKG_BIT = 1ULL << 21, -- FF_PACKAGES_FLAG_LPKGBUILD_BIT = 1ULL << 22, -- FF_PACKAGES_FLAG_GUIX_BIT = 1ULL << 23, -- FF_PACKAGES_FLAG_LINGLONG_BIT = 1ULL << 24, -- FF_PACKAGES_FLAG_PACSTALL_BIT = 1ULL << 25, -- FF_PACKAGES_FLAG_MPORT_BIT = 1ULL << 26, -- FF_PACKAGES_FLAG_PKGSRC_BIT = 1ULL << 27, -- FF_PACKAGES_FLAG_HPKG_BIT = 1ULL << 28, -- FF_PACKAGES_FLAG_PISI_BIT = 1ULL << 29, -- FF_PACKAGES_FLAG_SOAR_BIT = 1ULL << 30, -+ FF_PACKAGES_FLAG_BPM_BIT = 1ULL << 1, -+ FF_PACKAGES_FLAG_BREW_BIT = 1ULL << 2, -+ FF_PACKAGES_FLAG_CHOCO_BIT = 1ULL << 3, -+ FF_PACKAGES_FLAG_DPKG_BIT = 1ULL << 4, -+ FF_PACKAGES_FLAG_EMERGE_BIT = 1ULL << 5, -+ FF_PACKAGES_FLAG_EOPKG_BIT = 1ULL << 6, -+ FF_PACKAGES_FLAG_FLATPAK_BIT = 1ULL << 7, -+ FF_PACKAGES_FLAG_NIX_BIT = 1ULL << 8, -+ FF_PACKAGES_FLAG_OPKG_BIT = 1ULL << 9, -+ FF_PACKAGES_FLAG_PACMAN_BIT = 1ULL << 10, -+ FF_PACKAGES_FLAG_PALUDIS_BIT = 1ULL << 11, -+ FF_PACKAGES_FLAG_PKG_BIT = 1ULL << 12, -+ FF_PACKAGES_FLAG_PKGTOOL_BIT = 1ULL << 13, -+ FF_PACKAGES_FLAG_MACPORTS_BIT = 1ULL << 14, -+ FF_PACKAGES_FLAG_RPM_BIT = 1ULL << 15, -+ FF_PACKAGES_FLAG_SCOOP_BIT = 1ULL << 16, -+ FF_PACKAGES_FLAG_SNAP_BIT = 1ULL << 17, -+ FF_PACKAGES_FLAG_WINGET_BIT = 1ULL << 18, -+ FF_PACKAGES_FLAG_XBPS_BIT = 1ULL << 19, -+ FF_PACKAGES_FLAG_AM_BIT = 1ULL << 20, -+ FF_PACKAGES_FLAG_SORCERY_BIT = 1ULL << 21, -+ FF_PACKAGES_FLAG_LPKG_BIT = 1ULL << 22, -+ FF_PACKAGES_FLAG_LPKGBUILD_BIT = 1ULL << 23, -+ FF_PACKAGES_FLAG_GUIX_BIT = 1ULL << 24, -+ FF_PACKAGES_FLAG_LINGLONG_BIT = 1ULL << 25, -+ FF_PACKAGES_FLAG_PACSTALL_BIT = 1ULL << 26, -+ FF_PACKAGES_FLAG_MPORT_BIT = 1ULL << 27, -+ FF_PACKAGES_FLAG_PKGSRC_BIT = 1ULL << 28, -+ FF_PACKAGES_FLAG_HPKG_BIT = 1ULL << 29, -+ FF_PACKAGES_FLAG_PISI_BIT = 1ULL << 30, -+ FF_PACKAGES_FLAG_SOAR_BIT = 1ULL << 31, +@@ -37,6 +37,7 @@ typedef enum __attribute__((__packed__)) FFPackagesFlags + FF_PACKAGES_FLAG_PISI_BIT = 1ULL << 29, + FF_PACKAGES_FLAG_SOAR_BIT = 1ULL << 30, + FF_PACKAGES_FLAG_KISS_BIT = 1ULL << 31, ++ FF_PACKAGES_FLAG_BPM_BIT = 1ULL << 32, FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX, } FFPackagesFlags; static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), ""); diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c -index 1d1094ae..a0b90137 100644 +index 5f78a052..0da0d17b 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -63,6 +63,7 @@ bool ffPrintPackages(FFPackagesOptions* options) @@ -174,7 +114,7 @@ index 1d1094ae..a0b90137 100644 if (options->combined) { FF_PRINT_PACKAGE_ALL(nix); -@@ -160,6 +161,7 @@ bool ffPrintPackages(FFPackagesOptions* options) +@@ -161,6 +162,7 @@ bool ffPrintPackages(FFPackagesOptions* options) FF_FORMAT_ARG(counts.emerge, "emerge"), FF_FORMAT_ARG(counts.eopkg, "eopkg"), FF_FORMAT_ARG(counts.xbps, "xbps"), @@ -182,7 +122,7 @@ index 1d1094ae..a0b90137 100644 FF_FORMAT_ARG(counts.nixSystem, "nix-system"), FF_FORMAT_ARG(counts.nixUser, "nix-user"), FF_FORMAT_ARG(counts.nixDefault, "nix-default"), -@@ -247,6 +249,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) +@@ -249,6 +251,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) FF_TEST_PACKAGE_NAME(AM) break; case 'B': if (false); @@ -190,7 +130,7 @@ index 1d1094ae..a0b90137 100644 FF_TEST_PACKAGE_NAME(BREW) break; case 'C': if (false); -@@ -338,6 +341,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do +@@ -343,6 +346,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do if (false); FF_TEST_PACKAGE_NAME(AM) FF_TEST_PACKAGE_NAME(APK) @@ -198,7 +138,7 @@ index 1d1094ae..a0b90137 100644 FF_TEST_PACKAGE_NAME(BREW) FF_TEST_PACKAGE_NAME(CHOCO) FF_TEST_PACKAGE_NAME(DPKG) -@@ -393,6 +397,7 @@ bool ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy +@@ -399,6 +403,7 @@ bool ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy FF_APPEND_PACKAGE_COUNT(amSystem) FF_APPEND_PACKAGE_COUNT(amUser) FF_APPEND_PACKAGE_COUNT(apk) @@ -206,7 +146,7 @@ index 1d1094ae..a0b90137 100644 FF_APPEND_PACKAGE_COUNT(brew) FF_APPEND_PACKAGE_COUNT(brewCask) FF_APPEND_PACKAGE_COUNT(choco) -@@ -464,6 +469,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = { +@@ -471,6 +476,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = { {"Number of emerge packages", "emerge"}, {"Number of eopkg packages", "eopkg"}, {"Number of xbps packages", "xbps"},