Merge pull request #183120 from Yarny0/hylafaxplus

hylafaxplus: 7.0.5 -> 7.0.6
This commit is contained in:
Winter 2022-07-28 01:07:09 -04:00 committed by GitHub
commit 25ca58cf38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -13,6 +13,7 @@
, gnugrep
, gnused
, libtiff
, openssl
, psmisc
, sharutils
, util-linux
@ -30,8 +31,8 @@
let
pname = "hylafaxplus";
version = "7.0.5";
sha256 = "1blv251r0yhnhxk9wgkjgr35al50q23hiskjkcbs8lmqqrz0cm8f";
version = "7.0.6";
hash = "sha512-0faeEwF/XQE/85zwUMOnrGzvGanuWRDr53SnrgbX0i/SHjHelzSEd2TK6plVOfV4w8RY7Ox7lSO1gjqEEzfZyw==";
configSite = substituteAll {
name = "${pname}-config.site";
@ -65,7 +66,7 @@ stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz";
inherit sha256;
inherit hash;
};
patches = [
# adjust configure check to work with libtiff > 4.1
@ -78,6 +79,7 @@ stdenv.mkDerivation {
file # for `file` command
ghostscript
libtiff
openssl
psmisc # for `fuser` command
sharutils # for `uuencode` command
util-linux # for `agetty` command

View file

@ -5,7 +5,7 @@ https://bugs.gentoo.org/706154
echo '#define TIFFSTRIPBYTECOUNTS uint32_t'
echo '#define TIFFVERSION TIFF_VERSION'
echo '#define TIFFHEADER TIFFHeader';;
- 4.[0123]) tiff_runlen_t="uint32_t"
- 4.[01234]) tiff_runlen_t="uint32_t"
+ 4.[0-9]) tiff_runlen_t="uint32_t"
tiff_offset_t="uint64_t"
echo '#define TIFFSTRIPBYTECOUNTS uint64_t'