gentoo auto-resync : 20:12:2023 - 07:52:53

3 files changed, 41 insertions, 1 deletions

diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 291f12fbf586..e95522031b4d 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,3 +1,4 @@
+AUX fastfetch-2.4.0-default-config-suffix.patch 1321 BLAKE2B 05fb94aa9854b7739313016167b33e1a6671fdacf39111713fb3fc0e71bbd0da7211d285f4febda39b33f8bcdf7412dd7f4c7fdf4ee76eb12fed792055ce3b5c SHA512 c424c18caa4ddcf0fc05ddfaa673bb44482041c0bc03973bf0bee89b99140fc16fb543c3746dd09eeff1e8fb5bb961ff3bd2c5da279625e5bc8a108ed178dcfd
 DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
 DIST fastfetch-2.3.4.tar.gz 909105 BLAKE2B 132f88681f9133cdeae8126c4dabf4e8805865fe506a005f938bcda487750a874ab59deebdf2fc348c2a469cf4771fe5916f594a5a408769c1e49fba417ab113 SHA512 fe1e6465380e513e4e75092bc737b23adca4c9dd42de8adb888bad1ce173f1fa9c93e9cbd7b2ca648058503b7cfb72c2ba1d70abf63b8f1497e94ce6eb349524
 DIST fastfetch-2.4.0.tar.gz 913193 BLAKE2B 88df9a8cb641596855cbd539d0be7f9270cd234dc060612ee6c52f5d47b2deb0d95608bdc496c81ac5e0e74c0c403f373fdcf7c17303eebab1f3b32ee0a41270 SHA512 00130ad3825cff039dc9ab3efd9f3431b36357e0ae144148872ab761f8b07a8d95c2413450d000b0181e9424d490ad55e6af928d1b7b2efdc7d5842ead8ab028
@@ -5,5 +6,5 @@ EBUILD fastfetch-0.1.9999.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1
 EBUILD fastfetch-0.2.9999.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a
 EBUILD fastfetch-2.2.3-r1.ebuild 3150 BLAKE2B 68ef835c0dcd463b19fa4ece4f7c64107af0ba3cbdf05f78e8ebf664d4db6ecd662a659899d4f5977d26801aea4d29be55476842186a917d39e4811dcbeb37cd SHA512 2493ed60298576479119a6bfae5ae6966fb0bd9fef92d48c3b60759dd3b8dddbd3f35a164f3d67b31f568386378def792361154d4ea71e8fd72f56e64b773fee
 EBUILD fastfetch-2.3.4.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a
-EBUILD fastfetch-2.4.0.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a
+EBUILD fastfetch-2.4.0-r1.ebuild 3268 BLAKE2B 5a5b8070cb1bb91e41cb7885cc0f798fbd95e8c135b187c40b0843d030e5123479285d72296eb76140ca0da320c8ced181d2044dfb9c3559056c2b3d692d2dbd SHA512 b6481b2d1112215b68d3381527ac0eb86b0af60e45f64faef1ad185cce42ca8d525eaf6da634085d7c567d995eca22c84cc988c51619f43fee46ec3f5b8dda98
 MISC metadata.xml 1188 BLAKE2B 1eda2e0d51e6743207de52da82b322ccd1b007ab0f977bae0dd2deeb35b5beddfc835258380ae01d134c44bfdb552f0228d5cdc07d00e3c994e9e651ea64b49e SHA512 577afae25bcf6cf698018ff431d8600179e62746e67459d9e7999d901ededfac98d1aa4729c7bf044163c356e7ecff155b77794e4e4d9f1ff5e189a7f63aa880
diff --git a/app-misc/fastfetch/fastfetch-2.4.0.ebuild b/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 000000000000..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?= <zhangsongcui3371@sina.com>
+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(&absolutePath, value);
+ 
+         bool success = isJsonConfig ? parseJsoncFile(absolutePath.chars) : parseConfigFile(data, absolutePath.chars);
++        if (!success)
++        {
++            ffStrbufAppendS(&absolutePath, ".jsonc");
++            success = parseJsoncFile(absolutePath.chars);
++        }
+ 
+         if(success)
+             return;
+@@ -514,6 +519,11 @@ static void optionParseConfigFile(FFdata* data, const char* key, const char* val
+         ffStrbufAppendS(&absolutePath, value);
+ 
+         bool success = isJsonConfig ? parseJsoncFile(absolutePath.chars) : parseConfigFile(data, absolutePath.chars);
++        if (!success)
++        {
++            ffStrbufAppendS(&absolutePath, ".jsonc");
++            success = parseJsoncFile(absolutePath.chars);
++        }
+ 
+         if(success)
+             return;