Merge pull request #1446 from fastfetch-cli/dev

CarterLi · web-flow · commit c145ce49a5b6 · 2024-12-18T14:41:21.000+08:00
Release: v2.32.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 2.32.1
+
+A hotfix for OpenBSD. No changes to other platforms.
+
+Bugfixes:
+* Fix package count detection on OpenBSD (Packages, OpenBSD)
+
 # 2.32.0
 
 Bugfixes:
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 2.32.0
+    VERSION 2.32.1
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+fastfetch (2.32.0) jammy; urgency=medium
+
+  * Update to 2.32.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 18 Dec 2024 10:39:06 +0800
+
 fastfetch (2.31.0) jammy; urgency=medium
 
   * Update to 2.31.0
diff --git a/debian/files b/debian/files
@@ -1 +1 @@
-fastfetch_2.31.0_source.buildinfo universe/utils optional
+fastfetch_2.32.0_source.buildinfo universe/utils optional
diff --git a/src/detection/packages/packages_obsd.c b/src/detection/packages/packages_obsd.c
@@ -27,7 +27,7 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
     if (!(options->disabled & FF_PACKAGES_FLAG_PKG_BIT))
     {
         result->pkg = getNumElementsImpl(FASTFETCH_TARGET_DIR_ROOT
-        #if __OpenBSD
+        #if __OpenBSD__
             "/var/db/pkg"
         #else
             "/usr/pkg/pkgdb"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-fastfetch_2.31.0_source.buildinfo universe/utils optional`
	`1`	`+fastfetch_2.32.0_source.buildinfo universe/utils optional`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)`
`27`	`27`	`if (!(options->disabled & FF_PACKAGES_FLAG_PKG_BIT))`
`28`	`28`	`{`
`29`	`29`	`result->pkg = getNumElementsImpl(FASTFETCH_TARGET_DIR_ROOT`
`30`		`- #if __OpenBSD`
	`30`	`+ #if __OpenBSD__`
`31`	`31`	`"/var/db/pkg"`
`32`	`32`	`#else`
`33`	`33`	`"/usr/pkg/pkgdb"`