diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-10-18 10:58:12 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-10-18 11:00:14 +0100 |
| commit | 0a74a54ac2600656cd0b640d5ea1c8efb5c35d68 (patch) | |
| tree | c44add1d19097fd7f22951de5884aa463de3de8a | |
| parent | bfa7372576dda9e851ef0d2b4b6ce2167be7a65e (diff) | |
| download | nixpkgs-0a74a54ac2600656cd0b640d5ea1c8efb5c35d68.tar nixpkgs-0a74a54ac2600656cd0b640d5ea1c8efb5c35d68.tar.gz nixpkgs-0a74a54ac2600656cd0b640d5ea1c8efb5c35d68.tar.bz2 nixpkgs-0a74a54ac2600656cd0b640d5ea1c8efb5c35d68.tar.lz nixpkgs-0a74a54ac2600656cd0b640d5ea1c8efb5c35d68.tar.xz nixpkgs-0a74a54ac2600656cd0b640d5ea1c8efb5c35d68.tar.zst nixpkgs-0a74a54ac2600656cd0b640d5ea1c8efb5c35d68.zip | |
libtiff: 4.5.1 -> 4.6.0
Changes: http://www.simplesystems.org/libtiff/releases/v4.6.0.html
| -rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libtiff/headers.patch | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libtiff/rename-version.patch | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 4fc6449230d..8055704b089 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; rev = "v${version}"; - hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; + hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw="; }; patches = [ diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch index 49af1abb0a5..933e06f3232 100644 --- a/pkgs/development/libraries/libtiff/headers.patch +++ b/pkgs/development/libraries/libtiff/headers.patch @@ -2,7 +2,7 @@ export private headers for freeimage --- i/libtiff/Makefile.am +++ w/libtiff/Makefile.am @@ -36,8 +36,12 @@ EXTRA_DIST = \ - tiffconf.h.cmake.in + tif_win32_versioninfo.rc libtiffinclude_HEADERS = \ + tif_config.h \ diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch index 3e93569d424..04fa1bfc88c 100644 --- a/pkgs/development/libraries/libtiff/rename-version.patch +++ b/pkgs/development/libraries/libtiff/rename-version.patch @@ -7,15 +7,15 @@ fix case-insensitive build TODO \ - VERSION + VERSION.txt - + EXTRA_DIST = \ - cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc - + placeholder.h \ +@@ -68,7 +68,7 @@ NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d") release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) + @(echo --- Setting release date to $(NEW_LIBTIFF_RELEASE_DATE) and release version to $(LIBTIFF_VERSION) ---) + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(NEW_LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) - (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - ++ (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_builddir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(NEW_LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_builddir)/libtiff/tiffvers.h && sed -i 's,@,,g' $(top_builddir)/libtiff/tiffvers.h) + pkgconfigdir = $(libdir)/pkgconfig |