[gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/, app-misc/fastfetch/files/
commit: 428178fdfad1721d1be9ef1e31e51c292962f933
Author: Viorel Munteanu gentoo org>
AuthorDate: Wed Jan 17 17:22:19 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Wed Jan 17 17:24:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428178fd
app-misc/fastfetch: drop 2.5.0
Signed-off-by: Viorel Munteanu gentoo.org>
app-misc/fastfetch/Manifest| 1 -
app-misc/fastfetch/fastfetch-2.5.0.ebuild | 122 -
.../fastfetch/files/fastfetch-2.5.0-nvidia.patch | 83 --
.../fastfetch/files/fastfetch-2.5.0-nvidia2.patch | 20
4 files changed, 226 deletions(-)
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index e6261dc3c3f9..2d5a2d6e61d7 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,3 +1,2 @@
DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B
d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709
SHA512
81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
-DIST fastfetch-2.5.0.tar.gz 984182 BLAKE2B
5185cce0e5933524835093a2f730cac8a9262cb6ec2c422fff60a4c6daec4f2a8ba11eab4323f00eaeebf2d946da9767f125b265e87cda6714d50e1c5e1383de
SHA512
a69f4e839acf8897a9cd8f6c017a4d7657a8dc0b3c58e645c88fc8e47e0a7bd3411d1a3e1e916628a948cb7e1688a200f7ac1eabd090f5eb42ce4b0030e342b4
DIST fastfetch-2.6.0.tar.gz 992987 BLAKE2B
07f33a1e0c272350128e5d0fdf69200af773260c3c83f08028289b6b0f9bd460b2916108818915e2cc7c226ce584e7096d297b53551a5354e7b8b8ea787baf7e
SHA512
9a09d6f85948778413f5a82f44b42b925c7c5ce0920f99248003d3be8697d1ec934d1e2c21375bf3a99ce874c1cc25d01055e56ad5e3f1af70f8f93beebda702
diff --git a/app-misc/fastfetch/fastfetch-2.5.0.ebuild
b/app-misc/fastfetch/fastfetch-2.5.0.ebuild
deleted file mode 100644
index 2cdbae60debd..
--- a/app-misc/fastfetch/fastfetch-2.5.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Fast neofetch-like system information tool"
-HOMEPAGE="https://github.com/fastfetch-cli/fastfetch;
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git;
- [[ ${PV} == *0.1. ]] && EGIT_BRANCH=master
- [[ ${PV} == *0.2. ]] && EGIT_BRANCH=dev
- [[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
-else
-
SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="MIT nvidia-gpu? ( NVIDIA-NVLM )"
-SLOT="0"
-IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager nvidia-gpu
opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
-RESTRICT="!test? ( test )"
-
-# note - qa-vdb will always report errors because fastfetch loads the libs
dynamically
-# make sure to crank yyjson minimum version to match bundled version
-RDEPEND="
- >=dev-libs/yyjson-0.8.0:=
- sys-libs/zlib
- X? ( x11-libs/libX11 )
- chafa? ( media-gfx/chafa )
- dbus? ( sys-apps/dbus )
- ddcutil? ( app-misc/ddcutil:= )
- drm? ( x11-libs/libdrm )
- gnome? (
- dev-libs/glib
- gnome-base/dconf
- )
- imagemagick? ( media-gfx/imagemagick:= )
- networkmanager? ( net-misc/networkmanager )
- opencl? ( virtual/opencl )
- opengl? ( media-libs/libglvnd[X] )
- osmesa? ( media-libs/mesa[osmesa] )
- pci? ( sys-apps/pciutils )
- pulseaudio? ( media-libs/libpulse )
- sqlite? ( dev-db/sqlite:3 )
- vulkan? (
- media-libs/vulkan-loader
- sys-apps/pciutils
- )
- wayland? ( dev-libs/wayland )
- xcb? ( x11-libs/libxcb )
- xfce? ( xfce-base/xfconf )
- xrandr? ( x11-libs/libXrandr )
-"
-DEPEND="
- ${RDEPEND}
- vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
- xrandr? ( X )
- chafa? ( imagemagick )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-nvidia.patch
- "${FILESDIR}"/${P}-nvidia2.patch
-)
-
-src_configure() {
- local fastfetch_enable_imagemagick7=no
- local fastfetch_enable_imagemagick6=no
- if use imagemagick; then
- fastfetch_enable_imagemagick7=$(has_version
'>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
- fastfetch_enable_imagemagick6=$(has_version
'https://github.com/fastfetch-cli/fastfetch/commit/0a1de91a29b802962e123966e370befd3894cb6d.patch
-
-Option to opt out of Nvidia GPU support.
-
-From: Viorel
-Date: Mon, 1 Jan 2024 12:38:06 +0200
-Subject: [PATCH] Add option for NVIDIA GPU support
-
[gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/, app-misc/fastfetch/files/
commit: bc99265637446283620eed378bd77cc540566c83
Author: Viorel Munteanu gentoo org>
AuthorDate: Wed Dec 20 05:45:52 2023 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Wed Dec 20 05:45:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc992656
app-misc/fastfetch: make `.jsonc` suffix optional
Signed-off-by: Viorel Munteanu gentoo.org>
...etch-2.4.0.ebuild => fastfetch-2.4.0-r1.ebuild} | 4 +++
.../fastfetch-2.4.0-default-config-suffix.patch| 35 ++
2 files changed, 39 insertions(+)
diff --git a/app-misc/fastfetch/fastfetch-2.4.0.ebuild
b/app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild
similarity index 98%
rename from app-misc/fastfetch/fastfetch-2.4.0.ebuild
rename to app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild
index 4af72e9b74c7..4590e479070b 100644
--- a/app-misc/fastfetch/fastfetch-2.4.0.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild
@@ -62,6 +62,10 @@ REQUIRED_USE="
chafa? ( imagemagick )
"
+PATCHES=(
+ "${FILESDIR}"/${P}-default-config-suffix.patch
+)
+
src_configure() {
local fastfetch_enable_imagemagick7=no
local fastfetch_enable_imagemagick6=no
diff --git
a/app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch
b/app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch
new file mode 100644
index ..fcf21ce0af23
--- /dev/null
+++ b/app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch
@@ -0,0 +1,35 @@
+Make specifying `.jsonc` suffix for configs optional
+
+https://github.com/fastfetch-cli/fastfetch/commit/456a58c8f57aaf22c51571ec0ead1e7c40c3d860
+
+From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?=
+Date: Tue, 19 Dec 2023 15:26:51 +0800
+Subject: [PATCH] fastfetch: default preset names to `.jsonc`
+
+Fix #666
+--- a/src/fastfetch.c
b/src/fastfetch.c
+@@ -501,6 +501,11 @@ static void optionParseConfigFile(FFdata* data, const
char* key, const char* val
+ ffStrbufAppendS(, value);
+
+ bool success = isJsonConfig ? parseJsoncFile(absolutePath.chars) :
parseConfigFile(data, absolutePath.chars);
++if (!success)
++{
++ffStrbufAppendS(, ".jsonc");
++success = parseJsoncFile(absolutePath.chars);
++}
+
+ if(success)
+ return;
+@@ -514,6 +519,11 @@ static void optionParseConfigFile(FFdata* data, const
char* key, const char* val
+ ffStrbufAppendS(, value);
+
+ bool success = isJsonConfig ? parseJsoncFile(absolutePath.chars) :
parseConfigFile(data, absolutePath.chars);
++if (!success)
++{
++ffStrbufAppendS(, ".jsonc");
++success = parseJsoncFile(absolutePath.chars);
++}
+
+ if(success)
+ return;
