diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-28 18:05:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 18:05:53 +0000 |
| commit | f18d801779602b884f219f9370bdbba692f3fd4c (patch) | |
| tree | 916c938586e9d37e9e314122741b0c55076cf4ea /pkgs/applications/graphics | |
| parent | 8aa2f637e6daa164f9a803427b4d474027a67cbf (diff) | |
| parent | d2b7f4ad5f78a0f9989cb30f1f8f595dbc0dbb27 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/gscan2pdf/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch | 15 |
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'; |