Skip to content

Commit c6ce707

Browse files
iskandergabaiskandergaba
authored
Merge branch 'dev' into dev
2 parents 0696ba5 + 56eabbe commit c6ce707

File tree

196 files changed

+4793
-2170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+4793
-2170
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ jobs:
9393
run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
9494

9595
- name: install required packages
96-
run: sudo apt-get update && sudo apt-get install -y gcc-13 g++-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libddcutil-dev libchafa-dev directx-headers-dev rpm ninja-build
96+
run: sudo apt-get update && sudo apt-get install -y gcc-13 g++-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libddcutil-dev directx-headers-dev rpm ninja-build
9797

9898
- name: install linuxbrew packages
9999
run: |
100100
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
101-
/home/linuxbrew/.linuxbrew/bin/brew install imagemagick --ignore-dependencies
101+
/home/linuxbrew/.linuxbrew/bin/brew install imagemagick chafa --ignore-dependencies
102102
103103
- name: Initialize CodeQL
104104
if: matrix.arch == 'amd64'
@@ -151,7 +151,7 @@ jobs:
151151
cpack -V
152152
153153
- name: upload artifacts
154-
uses: actions/upload-artifact@v6
154+
uses: actions/upload-artifact@v7
155155
with:
156156
name: fastfetch-linux-${{ matrix.arch }}
157157
path: ./fastfetch-*.*
@@ -217,7 +217,7 @@ jobs:
217217
run: ctest --output-on-failure
218218

219219
- name: upload artifacts
220-
uses: actions/upload-artifact@v6
220+
uses: actions/upload-artifact@v7
221221
with:
222222
name: fastfetch-linux-i686
223223
path: ./fastfetch-*.*
@@ -237,14 +237,14 @@ jobs:
237237
id: runcmd
238238
with:
239239
arch: armv7
240-
distro: ubuntu20.04
240+
distro: ubuntu22.04
241241
githubToken: ${{ github.token }}
242242
run: |
243243
uname -a
244244
apt-get update && apt-get install -y software-properties-common ca-certificates gpg curl
245245
add-apt-repository -y ppa:ubuntu-toolchain-r/test
246246
curl -L https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
247-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
247+
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
248248
echo -e 'Acquire::https::Verify-Peer "false";\nAcquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99ignore-certificates
249249
apt-get update && apt-get install -y cmake make gcc-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev rpm
250250
CC=gcc-13 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_DIRECTX_HEADERS=Off -DCMAKE_INSTALL_PREFIX=/usr .
@@ -257,7 +257,7 @@ jobs:
257257
ctest --output-on-failure
258258
259259
- name: upload artifacts
260-
uses: actions/upload-artifact@v6
260+
uses: actions/upload-artifact@v7
261261
with:
262262
name: fastfetch-linux-armv7l
263263
path: ./fastfetch-*.*
@@ -293,7 +293,7 @@ jobs:
293293
ctest --output-on-failure
294294
295295
- name: upload artifacts
296-
uses: actions/upload-artifact@v6
296+
uses: actions/upload-artifact@v7
297297
with:
298298
name: fastfetch-linux-armv6l
299299
path: ./fastfetch-*.*
@@ -336,7 +336,7 @@ jobs:
336336
ctest --output-on-failure
337337
338338
- name: upload artifacts
339-
uses: actions/upload-artifact@v6
339+
uses: actions/upload-artifact@v7
340340
with:
341341
name: fastfetch-linux-${{ matrix.arch }}
342342
path: ./fastfetch-*.*
@@ -374,7 +374,7 @@ jobs:
374374
shell: alpine.sh {0}
375375

376376
- name: upload artifacts
377-
uses: actions/upload-artifact@v6
377+
uses: actions/upload-artifact@v7
378378
with:
379379
name: fastfetch-musl-amd64
380380
path: ./fastfetch-*.*
@@ -428,7 +428,7 @@ jobs:
428428
run: ctest --output-on-failure
429429

430430
- name: upload artifacts
431-
uses: actions/upload-artifact@v6
431+
uses: actions/upload-artifact@v7
432432
with:
433433
name: fastfetch-macos-${{ matrix.arch }}
434434
path: ./fastfetch-*.*
@@ -444,6 +444,7 @@ jobs:
444444
uses: vmactions/omnios-vm@v1
445445
with:
446446
usesh: true
447+
envs: 'CMAKE_BUILD_TYPE'
447448
prepare: |
448449
uname -a
449450
pkg update --accept
@@ -462,7 +463,7 @@ jobs:
462463
cpack -V
463464
464465
- name: upload artifacts
465-
uses: actions/upload-artifact@v6
466+
uses: actions/upload-artifact@v7
466467
with:
467468
name: fastfetch-omnios-amd64
468469
path: ./fastfetch-*.*
@@ -478,6 +479,7 @@ jobs:
478479
uses: vmactions/solaris-vm@v1
479480
with:
480481
usesh: true
482+
envs: 'CMAKE_BUILD_TYPE'
481483
release: "11.4-gcc-14"
482484
prepare: |
483485
uname -a
@@ -497,7 +499,7 @@ jobs:
497499
cpack -V
498500
499501
- name: upload artifacts
500-
uses: actions/upload-artifact@v6
502+
uses: actions/upload-artifact@v7
501503
with:
502504
name: fastfetch-solaris-amd64
503505
path: ./fastfetch-*.*
@@ -520,6 +522,7 @@ jobs:
520522
cpu_count: 4
521523
shell: bash
522524
version: '15.0'
525+
environment_variables: 'CMAKE_BUILD_TYPE'
523526
run: |
524527
uname -a
525528
sudo pkg update
@@ -534,7 +537,7 @@ jobs:
534537
ctest --output-on-failure
535538
536539
- name: upload artifacts
537-
uses: actions/upload-artifact@v6
540+
uses: actions/upload-artifact@v7
538541
with:
539542
name: fastfetch-freebsd-amd64
540543
path: ./fastfetch-*.*
@@ -557,6 +560,7 @@ jobs:
557560
cpu_count: 4
558561
shell: bash
559562
version: '7.8'
563+
environment_variables: 'CMAKE_BUILD_TYPE'
560564
run: |
561565
uname -a
562566
sudo pkg_add -u
@@ -571,7 +575,7 @@ jobs:
571575
ctest --output-on-failure
572576
573577
- name: upload artifacts
574-
uses: actions/upload-artifact@v6
578+
uses: actions/upload-artifact@v7
575579
with:
576580
name: fastfetch-openbsd-amd64
577581
path: ./fastfetch-*.*
@@ -594,6 +598,7 @@ jobs:
594598
cpu_count: 4
595599
shell: bash
596600
version: '10.1'
601+
environment_variables: 'CMAKE_BUILD_TYPE'
597602
run: |
598603
uname -a
599604
sudo pkgin -y install clang cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick
@@ -607,7 +612,7 @@ jobs:
607612
ctest --output-on-failure
608613
609614
- name: upload artifacts
610-
uses: actions/upload-artifact@v6
615+
uses: actions/upload-artifact@v7
611616
with:
612617
name: fastfetch-netbsd-amd64
613618
path: ./fastfetch-*.*
@@ -626,6 +631,7 @@ jobs:
626631
uses: vmactions/dragonflybsd-vm@v1
627632
with:
628633
usesh: yes
634+
envs: 'CMAKE_BUILD_TYPE'
629635
prepare: |
630636
uname -a
631637
pkg update
@@ -642,7 +648,7 @@ jobs:
642648
ctest --output-on-failure
643649
644650
- name: upload artifacts
645-
uses: actions/upload-artifact@v6
651+
uses: actions/upload-artifact@v7
646652
with:
647653
name: fastfetch-dragonfly-amd64
648654
path: ./fastfetch-*.*
@@ -665,6 +671,7 @@ jobs:
665671
architecture: x86-64
666672
cpu_count: 4
667673
shell: bash
674+
environment_variables: 'CMAKE_BUILD_TYPE'
668675
run: |
669676
uname -a
670677
pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake gcc make pkgconfig python3.10 || pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake gcc make pkgconfig python3.10
@@ -677,13 +684,13 @@ jobs:
677684
ctest --output-on-failure
678685
679686
- name: upload artifacts
680-
uses: actions/upload-artifact@v6
687+
uses: actions/upload-artifact@v7
681688
with:
682689
name: fastfetch-haiku-amd64
683690
path: ./fastfetch-*.*
684691

685692
windows-hosts:
686-
name: Windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
693+
name: Windows-${{ matrix.arch }}
687694
runs-on: ${{ matrix.runs-on }}
688695
permissions:
689696
security-events: write
@@ -696,22 +703,11 @@ jobs:
696703
msystem: CLANG64
697704
msystem-lower: clang64
698705
msys-arch: x86_64
699-
win7-compat-flag: OFF
700-
win7-compat-postfix: ""
701-
- arch: amd64
702-
runs-on: windows-latest
703-
msystem: CLANG64
704-
msystem-lower: clang64
705-
msys-arch: x86_64
706-
win7-compat-flag: ON
707-
win7-compat-postfix: "-win7"
708706
- arch: aarch64
709707
runs-on: windows-11-arm
710708
msystem: CLANGARM64
711709
msystem-lower: clangarm64
712710
msys-arch: aarch64
713-
win7-compat-flag: OFF
714-
win7-compat-postfix: ""
715711
defaults:
716712
run:
717713
shell: msys2 {0}
@@ -730,7 +726,7 @@ jobs:
730726
run: uname -a
731727

732728
- name: configure project
733-
run: env PKG_CONFIG_PATH=/${{ matrix.msystem-lower }}/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_WIN7_COMPAT=${{ matrix.win7-compat-flag }} .
729+
run: env PKG_CONFIG_PATH=/${{ matrix.msystem-lower }}/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
734730

735731
- name: build project
736732
run: cmake --build . --verbose -j4
@@ -759,9 +755,9 @@ jobs:
759755
- if: github.event_name == 'push' && github.repository == 'fastfetch-cli/fastfetch'
760756
id: upload-unsigned-artifact
761757
name: upload artifacts for signing
762-
uses: actions/upload-artifact@v6
758+
uses: actions/upload-artifact@v7
763759
with:
764-
name: fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
760+
name: fastfetch-windows-${{ matrix.arch }}
765761
path: |
766762
*.dll
767763
fastfetch.exe
@@ -780,16 +776,16 @@ jobs:
780776
output-artifact-directory: '.'
781777

782778
- name: create zip archive
783-
run: 7z a -tzip -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
779+
run: 7z a -tzip -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
784780

785781
- name: create 7z archive
786-
run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
782+
run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
787783

788784
- name: upload true artifacts
789-
uses: actions/upload-artifact@v6
785+
uses: actions/upload-artifact@v7
790786
with:
791-
name: fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
792-
path: ./fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.*
787+
name: fastfetch-windows-${{ matrix.arch }}
788+
path: ./fastfetch-windows-${{ matrix.arch }}.*
793789
overwrite: true
794790

795791
release:
@@ -823,7 +819,7 @@ jobs:
823819

824820
- name: download artifacts
825821
if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release
826-
uses: actions/download-artifact@v5
822+
uses: actions/download-artifact@v8
827823

828824
- name: create release
829825
if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release

‎CHANGELOG.md‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
# 2.60.0
2+
3+
Changes:
4+
* The CMake option `ENABLE_WIN7_COMPAT:BOOLEAN` now defaults to `OFF` and will be removed in v2.61.0, effectively dropping support for Windows 7 in the next release.
5+
* This follows the Windows 7 deprecation notice introduced in v2.57.0.
6+
* `wm.detectPlugin` now defaults to `true` (WM)
7+
8+
Features:
9+
* Adds `{cwd}` for custom title formatting, which displays the current working directory (Title)
10+
* Adds support for detecting the Zed version (#2200, Editor)
11+
* Adds support for detecting `moss` packages (Packages, Linux)
12+
* Adds support for detecting komorebi, FancyWM, and GlazeWM (WM, Windows)
13+
* Adds support for WM plugin version detection on macOS (WM, macOS)
14+
* Adds support for retrieving the executable path on OpenBSD (#2195, OpenBSD)
15+
16+
Bugfixes:
17+
* Fixes a potential segmentation fault caused by dereferencing a negative index (#2198)
18+
* Fixes `tempSensor` parsing so that it accepts only string values (#2202, CPU)
19+
* Fixes an issue that unexpectedly caused fewer devices to be reported (Keyboard, Linux)
20+
* Improves WM detection on LXQt by querying WM settings only when no WM has already been detected (#2199, WM, Linux)
21+
* Fixes memory leaks in DBus connection handling and in the OpenGL EGL context lifecycle
22+
* Fixes niri version detection on Fedora (WM, Linux)
23+
* Includes various internal cleanups and optimizations
24+
25+
Logos:
26+
* Adds `RengeOS` (#2170)
27+
* Adds `Emmabuntüs` (#2207)
28+
* Updates Artix Linux (#2157)
29+
* Updates Linux Mint (#2186)
30+
* Renames `Refracted Devuan` to `Refracta`
31+
* Renames `ExodiaPredator` to `ExodiaOS`
32+
133
# 2.59.0
234

335
Changes:
@@ -35,7 +67,7 @@ Features:
3567
* Honors the `DBPath` and `RootDir` settings in `pacman.conf` when detecting Pacman packages (#2154, Packages, Linux)
3668

3769
Bugfixes:
38-
* Fixes a crash issues on KDE Plasma 6.6 (Display, Linux)
70+
* Fixes a crash issue on KDE Plasma 6.6 (Display, Linux)
3971
* Fixes the Command module not working with `--dynamic-interval` (#2152, Command)
4072
* Fixes Quartz Compositor version detection. It now correctly reports the version of `WindowServer` (`SkyLight`) instead of `WindowManager`. (WM, macOS)
4173

@@ -62,7 +94,7 @@ Deprecation notice:
6294
* Support for Windows 7 (and 8.x) is deprecated and will be removed in a future release. Extended support for Windows 7 (and 8.1) ended on January 10, 2023. These versions do not officially support ANSI escape codes (running fastfetch on them requires a third-party terminal such as ConEmu). In addition, Windows 7 lacks some APIs used by fastfetch. Fastfetch currently loads these APIs dynamically at runtime to maintain compatibility, but this adds complexity to the codebase and increases the maintenance burden.
6395
* A CMake flag `ENABLE_WIN7_COMPAT:BOOLEAN` has been introduced (defaults to `ON` for now). If set to `OFF`, Windows 7 compatibility code is excluded, and the resulting binaries will support only Windows 10 (version 1607 and later) and Windows 11.
6496
* The main prebuilt Windows binaries on the Release page (`fastfetch-windows-amd64.*`) are built with `ENABLE_WIN7_COMPAT=OFF`. These are the binaries used by `scoop` and `winget`. Users who need Windows 7 (or 8.x) support can download the `-win7` variant instead.
65-
* The `ENABLE_WIN7_COMPAT` CMake option and the `-win7` variant binaries are planned to be removed in 2.60.0.
97+
* ~~The `ENABLE_WIN7_COMPAT` CMake option and the `-win7` variant binaries are planned to be removed in 2.60.0~~.
6698

6799
Features:
68100
* Supports COSMIC DE version detection (DE, Linux)

0 commit comments

Comments
 (0)
⚡