Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace libtiff_4_5 with libtiff_and_tools, update hylafaxplus #298561

Merged
merged 6 commits into from
Apr 21, 2024
Merged

replace libtiff_4_5 with libtiff_and_tools, update hylafaxplus #298561

merged 6 commits into from
Apr 21, 2024

Commits on Apr 20, 2024

  1. hylafaxplus: 7.0.7 -> 7.0.8 

    Note that this update makes hylafaxplus compatible
with libtiff 4.6.0t (a fork of libtiff at version 4.6.0).
A follow-up commit will introduce that library
fork and make hylafaxplus build with it.
    @Yarny0
    Yarny0 committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    fabdf2c View commit details
    Browse the repository at this point in the history

  2. libtiff: fix meta.changelog url

    @Yarny0
    Yarny0 committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    376bd19 View commit details
    Browse the repository at this point in the history

  3. libtiff_t: init at 4.6.0t (fork of libtiff) 

    libtiff 4.6.0 dropped a bunch of helper tools,
thereby breaking packages that depend on these tools.
To fix those packages, nixpkgs started packaging libtiff_4_5
separately, see commit f57a4b0.

Currently, two packages use libtiff_4_5:

* hylafaplus (cd3771c)
* gscan2pdf (9a579e1)

Lee Howard (core developer of hylafaxplus)
forked libtiff 4.6.0 to provide a current version
that restores those dropped helper tools.
The library is also called "libtiff",
with current version "4.6.0t".
It is based on libtiff 4.6.0 and incorporates several fixes,
particularly for the dropped helper tools,
see https://sourceforge.net/p/hylafax/mailman/message/58751878/
and http://www.libtiff.org/releases/v4.6.0t.html .

The commit at hand packages that fork for nixpkgs.
Follow-up commits will replace libtiff_4_5 with
libtiff_t, so affected packages can
again use a current libtiff library.

The build recipe of libtiff_t is based on the libtiff recipe.
Besides adapted URLs, the only change is dropping `passthru`, as
it referred to many packages depending on the original libtiff.
The unorthodox code introduced in all-packages.nix
is needed to satisfy the automated "by-name" check;
see "Recommendation for new packages with multiple versions"
in the file `pkgs/by-name/README.md`.

Depending on how things develop in the future,
we might want to switch completely
to the forked libtiff library one day.
Or the original libtiff restores the missing tools,
making libtiff_t superfluous.
    @Yarny0
    Yarny0 committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    6ce2532 View commit details
    Browse the repository at this point in the history

  4. hylafaxplus: switch to current libtiff 4.6.0t 

    hylafaxplus is not compatible with libtiff 4.6.0
as published on https://libtiff.gitlab.io/libtiff/
and http://www.simplesystems.org/libtiff/ .
To fix the build, we used an older libtiff version
(see cd3771c).

In the meantime, hylafaxplus developer Lee Howard
published a forked version "4.6.0t" of libtiff,
providing the missing tools for hylafaxplus, see
https://sourceforge.net/p/hylafax/mailman/message/58751879/ .
The commit at hand changes the libtiff
version for hylafaxplus to use that fork.
    @Yarny0
    Yarny0 committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    cff182e View commit details
    Browse the repository at this point in the history

  5. gscan2pdf: switch to current libtiff 4.6.0t 

    gscan2pdf is not compatible with libtiff 4.6.0
as published on https://libtiff.gitlab.io/libtiff/
and http://www.simplesystems.org/libtiff/ .
To fix the build, we used an older libtiff version
(see 9a579e1).

In the meantime, hylafaxplus developer Lee Howard
published a forked version "4.6.0t" of libtiff,
providing the missing tools, see
https://sourceforge.net/p/hylafax/mailman/message/58751879/ .
That fork is also suitable for gscan2pdf,
so the commit at hand changes the libtiff
version for gscan2pdf to use that fork.
    @Yarny0
    Yarny0 committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    ec1a369 View commit details
    Browse the repository at this point in the history

  6. Revert "libtiff: introduce libtiff_4_5" 

    This reverts commit f57a4b0.

The old version libtiff_4_5 is no longer needed.
Both dependents (gscan2pdf and hylafaxplus)
have switched to the forked libtiff version 4.6.0t
which is based on the current libtiff version 4.6.0
but also contains required command line tools
missing in the original libtiff library.
    @Yarny0
    Yarny0 committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    87eabf9 View commit details
    Browse the repository at this point in the history