Merge pull request #192510 from mweinelt/unpaper

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 =

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';

pkgs/tools/graphics/unpaper/default.nix

@@ -1,16 +1,52 @@
-{ lib, stdenv, fetchurl, buildPackages, pkg-config, ffmpeg_4 }:
+{ lib
+, stdenv
+, fetchurl
+
+# build
+, meson
+, ninja
+, pkg-config
+
+# docs
+, sphinx
+
+# runtime
+, buildPackages
+, ffmpeg_5
+
+# tests
+, nixosTests
+}:
 
 stdenv.mkDerivation rec {
   pname = "unpaper";
-  version = "6.1";
+  version = "7.0.0";
 
   src = fetchurl {
     url = "https://www.flameeyes.eu/files/${pname}-${version}.tar.xz";
-    sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13";
+    hash = "sha256-JXX7vybCJxnRy4grWWAsmQDH90cRisEwiD9jQZvkaoA=";
   };
 
-  nativeBuildInputs = [ pkg-config buildPackages.libxslt.bin ];
-  buildInputs = [ ffmpeg_4 ];
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  nativeBuildInputs = [
+    buildPackages.libxslt.bin
+    meson
+    ninja
+    pkg-config
+    sphinx
+  ];
+
+  buildInputs = [
+    ffmpeg_5
+  ];
+
+  passthru.tests = {
+    inherit (nixosTests) paperless;
+  };
 
   meta = with lib; {
     homepage = "https://www.flameeyes.eu/projects/unpaper";