Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: bebcf42905e4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f27031f48f12
Choose a head ref
  • 11 commits
  • 8 files changed
  • 1 contributor

Commits on Mar 1, 2020

  1. netpbm: add updateScript

    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    b19ce7c View commit details
    Browse the repository at this point in the history

  2. netpbm: Clean up 

    * Format with nixpkgs-fmt
* Move build tools to nativeBuildInputs
* Clarify license
    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    8ea075b View commit details
    Browse the repository at this point in the history

  3. netpbm: add pre/post phase hooks

    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    6b4d057 View commit details
    Browse the repository at this point in the history

  4. netpbm: 10.82.01 → 10.89.1 

    https://sourceforge.net/p/netpbm/code/3735/tree//advanced/doc/HISTORY
    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    aa1aefd View commit details
    Browse the repository at this point in the history

  5. netpbm: Fix tiff support 

    The build script check whether JPEGLIB and ZLIB are not set to NONE.
We did not set the latter as pkg-config handles zlib requirement
for libpng dependency and the comment in config.mk only talks about
zlib being needed for libpng.

Since libtiff only needs libz for static linking, we turn TIFFLIB_NEEDS_ZLIB
off instead of pointlessly setting ZLIB value.

Closes: #75156
    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    9018090 View commit details
    Browse the repository at this point in the history

  6. netpbm: split into multiple outputs

    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    9555834 View commit details
    Browse the repository at this point in the history

  7. netpbm: more clean ups 

    * Append to config.mk instead of substituting
* Remove unused path substitution (rgbpaths.patch was deleted in f6c2898)
* -lz in LDFLAGS does not seem to be necessary
* Touching the file (introduced in 4dd9507) does not seem to be necessary.
    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    256f717 View commit details
    Browse the repository at this point in the history

  8. netpbm: re-enable parallel building 

    It was disabled in abd3c24 but it no longer seems to fail.
    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    44f6961 View commit details
    Browse the repository at this point in the history

  9. netpbm: Hardcode rgb.txt path 

    We did that in the past with rgbpaths.patch in the past but it was eventually removed. This fixes the regression.
    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    43ea7f1 View commit details
    Browse the repository at this point in the history

  10. netpbm: Remove "CVE" patch 

    The CVE was patched upstream long ago.

http://cve.circl.lu/cve/CVE-2005-2471

-dPARANOIDSAFER seems not to be supported any more.

https://phabricator.wikimedia.org/T136402#2338482
https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=79a06b45e784e6839b2b2129cd2620ea606254e1
    @jtojnar
    jtojnar committed Mar 1, 2020
    Copy the full SHA
    7566c09 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2020

  1. Merge pull request #81063 from NixOS/netpbm 

    netpbm: 10.82.01 → 10.89.1
    @jtojnar
    jtojnar committed Mar 2, 2020
    Copy the full SHA
    f27031f View commit details
    Browse the repository at this point in the history