From 74e9d007839867a3f4e052fd9629bde0d44baafd Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 25 Dec 2024 09:40:01 +0100
Subject: [PATCH] jbig2enc: 0.29.0 -> 0.30.0

https://github.com/agl/jbig2enc/releases/tag/0.30

Fixes CVE-2018-11230.
---
 pkgs/by-name/jb/jbig2enc/package.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/jb/jbig2enc/package.nix b/pkgs/by-name/jb/jbig2enc/package.nix
index 6cb7ca15d17d..95b38a0a905a 100644
--- a/pkgs/by-name/jb/jbig2enc/package.nix
+++ b/pkgs/by-name/jb/jbig2enc/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   leptonica,
   zlib,
   libwebp,
@@ -10,18 +9,19 @@
   libjpeg,
   libpng,
   libtiff,
+  python3,
   autoreconfHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "jbig2enc";
-  version = "0.29";
+  version = "0.30";
 
   src = fetchFromGitHub {
     owner = "agl";
     repo = "jbig2enc";
     rev = version;
-    hash = "sha256-IAL4egXgaGmCilzcryjuvOoHhahyrfGWY68GBfXXgAM=";
+    hash = "sha256-B19l2NdMq+wWKQ5f/y5aoPiBtQnn6sqpaIoyIq+ugTg=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -34,20 +34,13 @@ stdenv.mkDerivation rec {
     libjpeg
     libpng
     libtiff
-  ];
-
-  patches = [
-    (fetchpatch {
-      name = "fix-build-leptonica-1.83.patch";
-      url = "https://github.com/agl/jbig2enc/commit/ea050190466f5336c69c6a11baa1cb686677fcab.patch";
-      hash = "sha256-+kScjFgDEU9F7VOUNAhm2XBjGm49fzAH8hYhmTm8xv8=";
-    })
+    python3
   ];
 
   # We don't want to install this Python 2 script
-  postInstall = ''
-    rm "$out/bin/pdf.py"
-  '';
+  #postInstall = ''
+  #  rm "$out/bin/pdf.py"
+  #'';
 
   # This is necessary, because the resulting library has
   # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib