From fd3b885482be9dce44080151ed1ec8ad16293de5 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Sat, 4 Mar 2023 18:59:07 +0100
Subject: [PATCH] gscan2pdf: 2.12.8 -> 2.13.2

This also removes a patch that has been upstreamed.

Changelog: https://sourceforge.net/p/gscan2pdf/mailman/message/37764345/
---
 pkgs/applications/graphics/gscan2pdf/default.nix  |  8 ++------
 .../graphics/gscan2pdf/ffmpeg5-compat.patch       | 15 ---------------
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch

diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix
index 9da51083c5ab..9e746cfbd7a6 100644
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/pkgs/applications/graphics/gscan2pdf/default.nix
@@ -10,17 +10,13 @@ with lib;
 
 perlPackages.buildPerlPackage rec {
   pname = "gscan2pdf";
-  version = "2.12.8";
+  version = "2.13.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz";
-    hash = "sha256-dmN2fMBDZqgvdHQryQgjmBHeH/h2dihRH8LkflFYzTk=";
+    hash = "sha256-NGz6DUa7TdChpgwmD9pcGdvYr3R+Ft3jPPSJpybCW4Q=";
   };
 
-  patches = [
-    ./ffmpeg5-compat.patch
-  ];
-
   nativeBuildInputs = [ wrapGAppsHook ];
 
   buildInputs =
diff --git a/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch b/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch
deleted file mode 100644
index ff522735fe35..000000000000
--- a/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/t/351_unpaper.t
-+++ b/t/351_unpaper.t
-@@ -88,8 +88,10 @@
- 
-                         # if we use unlike, we no longer
-                         # know how many tests there will be
--                        if ( $msg !~
--/(deprecated|Encoder did not produce proper pts, making some up)/
-+                        if ( $msg !~ /( deprecated |
-+                            \Qdoes not contain an image sequence pattern\E |
-+                            \QEncoder did not produce proper pts, making some up\E |
-+                            \Quse the -update option\E )/x
-                           )
-                         {
-                             fail 'no warnings';