From 94cececb66aa57da643e8240fee10efb67900ce1 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sun, 5 Apr 2026 10:24:52 +0300 Subject: [PATCH] Update package version to 2.61.0 --- pkg.info | 4 +- source-files/add-tide-bpm-detection.patch | 66 ++++++++++------------- 2 files changed, 31 insertions(+), 39 deletions(-) diff --git a/pkg.info b/pkg.info index 578bcc1..a2a4027 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.60.0 +version: 2.61.0 revision: 1 url: https://github.com/fastfetch-cli/fastfetch license: MIT @@ -45,4 +45,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: 001dd608ebe0d8b651069983690cc93fe7f3e41ac11a50fc591b22c2fe97d9a4 + checksum: b05b95bcc0915431cf732382813261497fa4412c3967904c1a9f207d5c946c65 diff --git a/source-files/add-tide-bpm-detection.patch b/source-files/add-tide-bpm-detection.patch index 75bd7e1..e77a415 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 a6447f9c..15eccd0a 100644 +index 8d51df5d..a5e4328f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -120,7 +120,7 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS) +@@ -119,7 +119,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 a6447f9c..15eccd0a 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 8627d322..4dc6ce5a 100644 +index 6efa904c..4816f6c7 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -442,7 +442,7 @@ @@ -20,7 +20,7 @@ index 8627d322..4dc6ce5a 100644 }, "packagesFormat": { - "description": "Output format of the module `Packages`. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop-user}: Number of scoop-user packages\n 21. {scoop-global}: Number of scoop-global packages\n 22. {choco}: Number of choco packages\n 23. {pkgtool}: Number of pkgtool packages\n 24. {paludis}: Number of paludis packages\n 25. {winget}: Number of winget packages\n 26. {opkg}: Number of opkg packages\n 27. {am-system}: Number of am-system packages\n 28. {sorcery}: Number of sorcery packages\n 29. {lpkg}: Number of lpkg packages\n 30. {lpkgbuild}: Number of lpkgbuild packages\n 31. {guix-system}: Number of guix-system packages\n 32. {guix-user}: Number of guix-user packages\n 33. {guix-home}: Number of guix-home packages\n 34. {linglong}: Number of linglong packages\n 35. {pacstall}: Number of pacstall packages\n 36. {mport}: Number of mport packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {kiss}: Number of kiss packages\n 44. {moss}: Number of moss packages\n 45. {nix-all}: Total number of all nix packages\n 46. {flatpak-all}: Total number of all flatpak app packages\n 47. {brew-all}: Total number of all brew packages\n 48. {guix-all}: Total number of all guix packages\n 49. {hpkg-all}: Total number of all hpkg packages", -+ "description": "Output format of the module `Packages`. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop-user}: Number of scoop-user packages\n 21. {scoop-global}: Number of scoop-global packages\n 22. {choco}: Number of choco packages\n 23. {pkgtool}: Number of pkgtool packages\n 24. {paludis}: Number of paludis packages\n 25. {winget}: Number of winget packages\n 26. {opkg}: Number of opkg packages\n 27. {am-system}: Number of am-system packages\n 28. {sorcery}: Number of sorcery packages\n 29. {lpkg}: Number of lpkg packages\n 30. {lpkgbuild}: Number of lpkgbuild packages\n 31. {guix-system}: Number of guix-system packages\n 32. {guix-user}: Number of guix-user packages\n 33. {guix-home}: Number of guix-home packages\n 34. {linglong}: Number of linglong packages\n 35. {pacstall}: Number of pacstall packages\n 36. {mport}: Number of mport packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {kiss}: Number of kiss packages\n 44. {moss}: Number of moss packages\n 45. {nix-all}: Total number of all nix packages\n 46. {flatpak-all}: Total number of all flatpak app packages\n 47. {brew-all}: Total number of all brew packages\n 48. {guix-all}: Total number of all guix packages\n 49. {hpkg-all}: Total number of all hpkg packages\n 50. {bpm}: Total number of all bpm packages\n", ++ "description": "Output format of the module `Packages`. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop-user}: Number of scoop-user packages\n 21. {scoop-global}: Number of scoop-global packages\n 22. {choco}: Number of choco packages\n 23. {pkgtool}: Number of pkgtool packages\n 24. {paludis}: Number of paludis packages\n 25. {winget}: Number of winget packages\n 26. {opkg}: Number of opkg packages\n 27. {am-system}: Number of am-system packages\n 28. {sorcery}: Number of sorcery packages\n 29. {lpkg}: Number of lpkg packages\n 30. {lpkgbuild}: Number of lpkgbuild packages\n 31. {guix-system}: Number of guix-system packages\n 32. {guix-user}: Number of guix-user packages\n 33. {guix-home}: Number of guix-home packages\n 34. {linglong}: Number of linglong packages\n 35. {pacstall}: Number of pacstall packages\n 36. {mport}: Number of mport packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {kiss}: Number of kiss packages\n 44. {moss}: Number of moss packages\n 45. {bpm}: Total number of all bpm packages\n 46. {nix-all}: Total number of all nix packages\n 47. {flatpak-all}: Total number of all flatpak app packages\n 48. {brew-all}: Total number of all brew packages\n 49. {guix-all}: Total number of all guix packages\n 50. {hpkg-all}: Total number of all hpkg packages\n", "type": "string" }, "physicaldiskFormat": { @@ -69,11 +69,11 @@ index 00000000..2d8b44e3 + $2*$1@@$2~~ $2~$1@@@@$2~~~ + $2~~ $2~~~~ diff --git a/src/logo/builtin.c b/src/logo/builtin.c -index 5315fdd4..54d086d7 100644 +index 5315fdd4..e6218166 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c -@@ -4920,6 +4920,17 @@ static const FFlogo T[] = { - FF_COLOR_FG_GREEN, +@@ -4910,6 +4910,17 @@ static const FFlogo T[] = { + FF_COLOR_FG_CYAN, }, }, + // TideLinux @@ -87,9 +87,9 @@ index 5315fdd4..54d086d7 100644 + .colorTitle = FF_COLOR_FG_BLUE, + .colorKeys = FF_COLOR_FG_MAGENTA, + }, - // Torizon OS + // TileOS { - .names = {"Torizon OS", "TorizonCore"}, + .names = {"TileOS"}, diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h index 45c04971..6f37ea2a 100644 --- a/src/modules/packages/option.h @@ -103,42 +103,34 @@ index 45c04971..6f37ea2a 100644 } FFPackagesFlags; static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), ""); diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c -index f9433718..e6f7f102 100644 +index 6552d53d..a9225fb1 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c -@@ -63,6 +63,7 @@ bool ffPrintPackages(FFPackagesOptions* options) - FF_PRINT_PACKAGE(emerge) - FF_PRINT_PACKAGE(eopkg) - FF_PRINT_PACKAGE(xbps) +@@ -77,6 +77,7 @@ bool ffPrintPackages(FFPackagesOptions* options) + FF_PRINT_PACKAGE(pkg) + FF_PRINT_PACKAGE(pkgsrc) + FF_PRINT_PACKAGE(kiss) + FF_PRINT_PACKAGE(bpm) if (options->combined) { - FF_PRINT_PACKAGE_ALL(nix); -@@ -162,6 +163,7 @@ bool ffPrintPackages(FFPackagesOptions* options) - FF_FORMAT_ARG(counts.emerge, "emerge"), - FF_FORMAT_ARG(counts.eopkg, "eopkg"), - FF_FORMAT_ARG(counts.xbps, "xbps"), -+ FF_FORMAT_ARG(counts.bpm, "bpm"), - FF_FORMAT_ARG(counts.nixSystem, "nix-system"), - FF_FORMAT_ARG(counts.nixUser, "nix-user"), - FF_FORMAT_ARG(counts.nixDefault, "nix-default"), -@@ -251,6 +253,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) - FF_TEST_PACKAGE_NAME(AM) + FF_PRINT_PACKAGE_ALL(hpkg) +@@ -252,6 +253,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) break; case 'B': if (false); -+ FF_TEST_PACKAGE_NAME(BPM) FF_TEST_PACKAGE_NAME(BREW) ++ FF_TEST_PACKAGE_NAME(BPM) break; case 'C': if (false); -@@ -346,6 +349,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do - if (false); + FF_TEST_PACKAGE_NAME(CHOCO) +@@ -347,6 +349,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do FF_TEST_PACKAGE_NAME(AM) FF_TEST_PACKAGE_NAME(APK) -+ FF_TEST_PACKAGE_NAME(BPM) FF_TEST_PACKAGE_NAME(BREW) ++ FF_TEST_PACKAGE_NAME(BPM) FF_TEST_PACKAGE_NAME(CHOCO) FF_TEST_PACKAGE_NAME(DPKG) -@@ -403,6 +407,7 @@ bool ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy + FF_TEST_PACKAGE_NAME(EMERGE) +@@ -403,6 +406,7 @@ bool ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy FF_APPEND_PACKAGE_COUNT(amSystem) FF_APPEND_PACKAGE_COUNT(amUser) FF_APPEND_PACKAGE_COUNT(apk) @@ -146,11 +138,11 @@ index f9433718..e6f7f102 100644 FF_APPEND_PACKAGE_COUNT(brew) FF_APPEND_PACKAGE_COUNT(brewCask) FF_APPEND_PACKAGE_COUNT(choco) -@@ -476,6 +481,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = { - {"Number of emerge packages", "emerge"}, - {"Number of eopkg packages", "eopkg"}, - {"Number of xbps packages", "xbps"}, +@@ -512,6 +516,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = { + {"Number of soar packages", "soar"}, + {"Number of kiss packages", "kiss"}, + {"Number of moss packages", "moss"}, + {"Number of bpm packages", "bpm"}, - {"Number of nix-system packages", "nix-system"}, - {"Number of nix-user packages", "nix-user"}, - {"Number of nix-default packages", "nix-default"}, + {"Total number of all nix packages", "nix-all"}, + {"Total number of all flatpak app packages", "flatpak-all"}, + {"Total number of all brew packages", "brew-all"},