From bca7bc52d36e4957bd7abf04604d2c7acce1a784 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 9 May 2025 13:21:21 +0300
Subject: [PATCH] poppler: 24.02.0 -> 25.05.0

---
 .../development/libraries/poppler/default.nix | 31 +++----------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 0345863b00d3..4f8c2a880aab 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -56,13 +56,13 @@ let
     domain = "gitlab.freedesktop.org";
     owner = "poppler";
     repo = "test";
-    rev = "400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1";
-    hash = "sha256-Y4aNOJLqo4g6tTW6TAb60jAWtBhRgT/JXsub12vi3aU=";
+    rev = "91ee031c882634c36f2f0f2f14eb6646dd542fb9";
+    hash = "sha256-bImTdlhMAA79kwbKPrHN3a9vVrtsgBh3rFjH3B7tEbQ=";
   };
 in
 stdenv.mkDerivation (finalAttrs: rec {
   pname = "poppler-${suffix}";
-  version = "24.02.0"; # beware: updates often break cups-filters build, check scribus too!
+  version = "25.05.0"; # beware: updates often break cups-filters build, check scribus too!
 
   outputs = [
     "out"
@@ -71,32 +71,9 @@ stdenv.mkDerivation (finalAttrs: rec {
 
   src = fetchurl {
     url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
-    hash = "sha256-GRh6P90F8z59YExHmcGD3lygEYZAyIs3DdzzE2NDIi4=";
+    hash = "sha256-mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://access.redhat.com/security/cve/CVE-2024-6239
-      name = "CVE-2024-6239.patch";
-      url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/0554731052d1a97745cb179ab0d45620589dd9c4.patch";
-      hash = "sha256-I78wJ4l1DSh+x/e00ZL8uvrGdBH+ufp+EDm0A1XWyCU=";
-    })
-    (fetchpatch {
-      # https://nvd.nist.gov/vuln/detail/CVE-2025-43903
-      name = "CVE-2025-43903.patch";
-      url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/f1b9c830f145a0042e853d6462b2f9ca4016c669.patch";
-      hash = "sha256-wZ8fqIAmMnQDf64sWXjfpkhk8TLDWMPUGxz40ktAzFI=";
-    })
-
-    (fetchpatch {
-      # fixes build on clang-19
-      # https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1526
-      name = "char16_t-not-short.patch";
-      url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/b4ac7d9af7cb5edfcfcbda035ed8b8c218ba8564.patch";
-      hash = "sha256-2aEq3VDITJabvB/+bcdULBXbqVbDdL0xJr2TWLiWqX8=";
-    })
-  ];
-
   nativeBuildInputs =
     [
       cmake