diff options
| author | Yarny0 <41838844+Yarny0@users.noreply.github.com> | 2021-09-04 12:51:41 +0200 |
|---|---|---|
| committer | Yarny0 <41838844+Yarny0@users.noreply.github.com> | 2021-09-04 13:05:36 +0200 |
| commit | 44aea0986baa4c6a414d24fc894c91e4623b61e9 (patch) | |
| tree | 001279f96585444e2a5c7c98466e5539a7f641fa /pkgs/servers/hylafaxplus | |
| parent | 8a2ec31e224de9461390cdd03e5e0b0290cdad0b (diff) | |
hylafaxplus: 7.0.3 -> 7.0.4
Release notes: https://hylafax.sourceforge.io/news/7.0.4.php Regarding libtiff versions: In the past, libtiff updates sometimes broke hylafaxplus builds as the configure script checks the libtiff version very thoroughly: https://github.com/NixOS/nixpkgs/pull/122650 https://github.com/NixOS/nixpkgs/pull/130888 The new version permits libtiff versions `4.[0123]`, due to this commit https://sourceforge.net/p/hylafax/HylaFAX+/2595/ This is OK for now as we currently ship libtiff 4.3. However, since the past tells us that libtiff updates are rarely a problem, we keep our patch that permits libtiff versions `4.[0-9]`. The patch also needs adaption to new libtiff integer types due to this commit https://sourceforge.net/p/hylafax/HylaFAX+/2597/#diff-2
Diffstat (limited to 'pkgs/servers/hylafaxplus')
| -rw-r--r-- | pkgs/servers/hylafaxplus/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/hylafaxplus/libtiff-4.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 04be8c63599d8..00dfd7c481766 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -30,8 +30,8 @@ let pname = "hylafaxplus"; - version = "7.0.3"; - sha256 = "139iwcwrn9i5lragxi33ilzah72w59wg4midfjjgx5cly3ah0iy4"; + version = "7.0.4"; + sha256 = "1y4b178rxa4ivxm8cnypnnyc8db7cjqyyzy60hiw215x4cyyj4i5"; configSite = substituteAll { name = "${pname}-config.site"; diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch index daf7b4f7d05ad..7faa89740338e 100644 --- a/pkgs/servers/hylafaxplus/libtiff-4.patch +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -2,11 +2,11 @@ https://bugs.gentoo.org/706154 --- a/configure +++ b/configure @@ -2583,7 +2583,7 @@ EOF - echo '#define TIFFSTRIPBYTECOUNTS uint32' + echo '#define TIFFSTRIPBYTECOUNTS uint32_t' echo '#define TIFFVERSION TIFF_VERSION' echo '#define TIFFHEADER TIFFHeader';; -- 4.[01]) tiff_runlen_t="uint32" -+ 4.[0-9]) tiff_runlen_t="uint32" - tiff_offset_t="uint64" - echo '#define TIFFSTRIPBYTECOUNTS uint64' +- 4.[0123]) tiff_runlen_t="uint32_t" ++ 4.[0-9]) tiff_runlen_t="uint32_t" + tiff_offset_t="uint64_t" + echo '#define TIFFSTRIPBYTECOUNTS uint64_t' echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' |