Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'

2 files changed, 2 insertions, 19 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/nixpkgs/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch
deleted file mode 100644
index 2ea1b124ce7b..000000000000
--- a/nixpkgs/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014
---- a/libheif/heif_context.cc
-+++ b/libheif/heif_context.cc
-@@ -571,6 +571,11 @@
-             image->set_is_alpha_channel_of(refs[0]);
- 
-             auto master_iter = m_all_images.find(refs[0]);
-+            if (master_iter == m_all_images.end()) {
-+              return Error(heif_error_Invalid_input,
-+                           heif_suberror_Nonexisting_item_referenced,
-+                           "Non-existing alpha image referenced");
-+            }
-             master_iter->second->set_alpha_channel(image);
-           }
-
diff --git a/nixpkgs/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix
index 7e1bb2daa9e1..02c4dd334813 100644
--- a/nixpkgs/pkgs/development/libraries/libheif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.0";
   pname = "libheif";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "libheif";
     rev = "v${version}";
-    sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2";
+    sha256 = "1nvfjmnha06689imm8v24nlc011814gc9xq3x54cnmqvh5gn98ah";
   };
 
-  patches = [ ./1.4.0-CVE-2019-11471.patch ];
-
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libde265 x265 libpng libjpeg ];