about summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2022-09-28 02:26:27 +0200
committerGitHub <noreply@github.com>2022-09-28 02:26:27 +0200
commit977b477bd0ff2f9900e14d377d00782be83f3f99 (patch)
tree12ec6c466ab0ae4842faf4508b0c6db898f90c5b /pkgs/applications/graphics
parent93b6efc8e13be073da59b88552d25c9798329e09 (diff)
parent608a3ef0b71359fb19ecfaaa3c8163dc58058010 (diff)
Merge pull request #192510 from mweinelt/unpaper
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/gscan2pdf/default.nix8
-rw-r--r--pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch15
2 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix
index 214688b56f899..fc686ad1f2120 100644
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/pkgs/applications/graphics/gscan2pdf/default.nix
@@ -10,13 +10,17 @@ with lib;
 
 perlPackages.buildPerlPackage rec {
   pname = "gscan2pdf";
-  version = "2.12.6";
+  version = "2.12.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz";
-    sha256 = "sha256-9ntpUEM3buT3EhneXz9G8bibvzOnEK6Xt0jJcTvLKT0=";
+    hash = "sha256-dmN2fMBDZqgvdHQryQgjmBHeH/h2dihRH8LkflFYzTk=";
   };
 
+  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
new file mode 100644
index 0000000000000..ff522735fe350
--- /dev/null
+++ b/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch
@@ -0,0 +1,15 @@
+--- 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';