diff options
| author | Yarny0 <41838844+Yarny0@users.noreply.github.com> | 2023-01-24 12:21:13 +0100 |
|---|---|---|
| committer | Yarny0 <41838844+Yarny0@users.noreply.github.com> | 2023-01-24 12:21:13 +0100 |
| commit | 94022accb0af2cedf7288a5e95fbdb15167c891f (patch) | |
| tree | b0cd7744003cd9db7d05e5df398e73a3b6b9f02c /pkgs/servers/hylafaxplus | |
| parent | 5ed481943351e9fd354aeb557679624224de38d5 (diff) | |
hylafaxplus: 7.0.6 -> 7.0.7
Also: * Drop patch for libtiff 4.5 compatibility; it is now included upstream. * Update patch which expands the range of permitted libtiff versions so it still applies. Release notes: https://hylafax.sourceforge.io/news/7.0.7.php
Diffstat (limited to 'pkgs/servers/hylafaxplus')
| -rw-r--r-- | pkgs/servers/hylafaxplus/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/servers/hylafaxplus/libtiff-4.patch | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 681c7ca7a8170..278f0b4c5260a 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -32,8 +32,8 @@ let pname = "hylafaxplus"; - version = "7.0.6"; - hash = "sha512-0faeEwF/XQE/85zwUMOnrGzvGanuWRDr53SnrgbX0i/SHjHelzSEd2TK6plVOfV4w8RY7Ox7lSO1gjqEEzfZyw=="; + version = "7.0.7"; + hash = "sha512-nUvt+M0HBYN+MsGskuuDt1j0nI5Dk8MbfK/OVxP2FCDby3eiDg0eDtcpIxlOe4o0klko07zDRIb06zqh8ABuKA=="; configSite = substituteAll { name = "${pname}-config.site"; @@ -72,16 +72,6 @@ stdenv.mkDerivation { patches = [ # adjust configure check to work with libtiff > 4.1 ./libtiff-4.patch - # fix missing exports in libtiff 4.5+ - # https://gitlab.com/libtiff/libtiff/-/issues/504 - # can probably be dropped with next hylafaxplus release - (fetchurl { - name = "hylafaxplus-7.0.6-tiff-4.5.0.patch"; - url = "https://dev.gentoo.org/~sam/distfiles/net-misc/hylafaxplus/hylafaxplus-7.0.6-tiff-4.5.0.patch.xz"; - downloadToTemp = true; - postFetch = ''xz -d < $downloadedFile > $out''; - hash = "sha256-koZvvzlgZHcANVaYdewnuLARz2TTeyDZRjm0EYWzsmk="; - }) ]; # Note that `configure` (and maybe `faxsetup`) are looking # for a couple of standard binaries in the `PATH` and diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch index c890f317e5137..e00d94b5a979b 100644 --- a/pkgs/servers/hylafaxplus/libtiff-4.patch +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -5,7 +5,7 @@ https://bugs.gentoo.org/706154 echo '#define TIFFSTRIPBYTECOUNTS uint32_t' echo '#define TIFFVERSION TIFF_VERSION' echo '#define TIFFHEADER TIFFHeader';; -- 4.[01234]) tiff_runlen_t="uint32_t" +- 4.[012345]) tiff_runlen_t="uint32_t" + 4.[0-9]) tiff_runlen_t="uint32_t" tiff_offset_t="uint64_t" echo '#define TIFFSTRIPBYTECOUNTS uint64_t' |