diff --git a/gnu/local.mk b/gnu/local.mk index 755b69d32f..816f68cd6f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1278,6 +1278,7 @@ dist_patch_DATA = \ %D%/packages/patches/ffmpeg-jami-remove-mjpeg-log.patch \ %D%/packages/patches/ffmpeg-jami-screen-sharing-x11-fix.patch \ %D%/packages/patches/ffmpeg-4-binutils-2.41.patch \ + %D%/packages/patches/fgallery-also-look-for-7z.patch \ %D%/packages/patches/fifengine-boost-compat.patch \ %D%/packages/patches/fifengine-python-3.9-compat.patch \ %D%/packages/patches/fifengine-swig-compat.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index d1ada9ec37..ac861f1ef6 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2219,7 +2219,10 @@ improve the thumbnail cutting region, so that faces are always centered.") "fgallery-" version ".zip")) (sha256 (base32 - "0zf6r88m2swgj1ylgh3qa1knzb4if501hzvga37h9psy8k179w8n")))) + "0zf6r88m2swgj1ylgh3qa1knzb4if501hzvga37h9psy8k179w8n")) + ;; TODO: Remove this patch when updating the package. + ;; Merged upstream at https://gitlab.com/wavexx/fgallery/-/commit/67b4a41de3f788e77ca619658950bae0e33b277b. + (patches (search-patches "fgallery-also-look-for-7z.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -2255,7 +2258,7 @@ improve the thumbnail cutting region, so that faces are always centered.") "zip" "jpegoptim" "pngcrush" - "p7zip"))) + "7zip"))) `("PERL5LIB" ":" prefix (,perl5lib))))))))) (native-inputs (list unzip)) @@ -2272,7 +2275,7 @@ improve the thumbnail cutting region, so that faces are always centered.") perl-image-exiftool jpegoptim pngcrush - p7zip)) + 7zip)) (home-page "https://www.thregr.org/~wavexx/software/fgallery/") (synopsis "Static photo gallery generator") (description diff --git a/gnu/packages/patches/fgallery-also-look-for-7z.patch b/gnu/packages/patches/fgallery-also-look-for-7z.patch new file mode 100644 index 0000000000..207f77ab76 --- /dev/null +++ b/gnu/packages/patches/fgallery-also-look-for-7z.patch @@ -0,0 +1,37 @@ +Note: The 7zip package only provides the bin/7z, not bin/7zz or bin/7za. + +From 71148e6f8d98936064733eeeac7d42b4cddddd23 Mon Sep 17 00:00:00 2001 +From: "kestrelwx" +Date: Sat, 18 Oct 2025 14:56:04 +0300 +Subject: [PATCH] Also check for 7z in $PATH. +To: wave++ "Yuri D'Elia" + +From: kestrel + +--- + fgallery | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fgallery b/fgallery +index 1bf90e5..1da2c82 100755 +--- a/fgallery ++++ b/fgallery +@@ -444,12 +444,14 @@ if($facedet && system("facedetect -h >/dev/null 2>&1")) { + my $p7zipcmd; + if(!system("7zz -h >/dev/null 2>&1")) { + $p7zipcmd = "7zz"; ++} elsif(!system("7z -h >/dev/null 2>&1")) { ++ $p7zipcmd = "7z"; + } elsif(!system("7za -h >/dev/null 2>&1")) { + $p7zipcmd = "7za"; + } else { + $p7zip = 0; + if(system("zip -h >/dev/null 2>&1")) { +- fatal("cannot run \"zip\" (check if 7zz, 7za or zip is installed)"); ++ fatal("cannot run \"zip\" (check if 7zz, 7za, 7z or zip is installed)"); + } + } + +-- +2.51.0 +