From b05198e27de5d75b187a06c0b6ede385db19b444 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Mar 25 2019 08:40:33 +0000
Subject: 2.5.1 bump


---

diff --git a/.gitignore b/.gitignore
index 7e2bbaa..9f7af6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ gscan2pdf-0.9.31.tar.gz
 /gscan2pdf-2.2.1.tar.xz
 /gscan2pdf-2.3.0.tar.xz
 /gscan2pdf-2.4.0.tar.xz
+/gscan2pdf-2.5.1.tar.xz
diff --git a/gscan2pdf-2.3.0-Use-specific-font-by-ImageMagick.patch b/gscan2pdf-2.3.0-Use-specific-font-by-ImageMagick.patch
deleted file mode 100644
index 4d4afe8..0000000
--- a/gscan2pdf-2.3.0-Use-specific-font-by-ImageMagick.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-From 134694473ff6a420b4d6845dfa826d76b70da279 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Mon, 25 Sep 2017 11:31:22 +0200
-Subject: [PATCH] Use specific font by ImageMagick
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Tests use ImageMagick to draw labels into pictures. This does not work
-with ImageMagick-6.9.9.13-1.fc28.x86_64 and
-rw-base35-fonts-20170801-1.fc28:
-
-$ convert label:"The quick brown fox" test.png
-convert: unable to read font `(null)' @ error/annotate.c/RenderFreetype/1362.
-convert: no images defined `test.png' @ error/convert.c/ConvertImageCommand/3258.
-
-This patch specifies DejaVu-Sans font explicitly.
-
-<https://bugzilla.redhat.com/show_bug.cgi?id=1494563>
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- t/1122_save_pdf_with_hocr.t      | 2 +-
- t/113_save_pdf_with_downsample.t | 2 +-
- t/134_save_tiff_alpha.t          | 4 ++--
- t/1621_import_pdf.t              | 4 ++--
- t/1625_import_pdf_bw.t           | 4 ++--
- t/31_ocropus.t                   | 6 +++---
- t/32_ocropus_in_thread.t         | 2 +-
- t/33_cancel_ocropus.t            | 2 +-
- t/351_unpaper.t                  | 2 +-
- t/352_unpaper.t                  | 2 +-
- t/353_cancel_unpaper.t           | 4 ++--
- t/354_unpaper_with_error.t       | 2 +-
- t/355_unpaper2.t                 | 4 ++--
- t/356_unpaper_corrupt_image.t    | 2 +-
- t/357_unpaper_rtl.t              | 4 ++--
- t/358_unpaper_with_warning.t     | 2 +-
- t/411_tesseract.t                | 6 +++---
- t/412_tesseract_in_thread.t      | 2 +-
- t/413_cancel_tesseract.t         | 2 +-
- t/414_tesseract_with_error.t     | 2 +-
- t/421_cuneiform.t                | 6 +++---
- t/422_cuneiform_in_thread.t      | 2 +-
- t/423_cancel_cuneiform.t         | 2 +-
- t/424_cuneiform_with_error.t     | 2 +-
- t/431_gocr.t                     | 2 +-
- t/432_gocr.t                     | 2 +-
- t/433_cancel_gocr.t              | 2 +-
- t/434_gocr_with_error.t          | 2 +-
- t/51_process_chain.t             | 2 +-
- t/53_process_chain.t             | 2 +-
- 30 files changed, 42 insertions(+), 42 deletions(-)
-
-diff --git a/t/1122_save_pdf_with_hocr.t b/t/1122_save_pdf_with_hocr.t
-index b38bd74..ba9dfc9 100644
---- a/t/1122_save_pdf_with_hocr.t
-+++ b/t/1122_save_pdf_with_hocr.t
-@@ -18,7 +18,7 @@ Gscan2pdf::Document->setup($logger);
- 
- # Create test image
- system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" -border 20x10 test.png'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" -border 20x10 test.png'
- );
- my $info = `identify test.png`;
- my ( $width, $height );
-diff --git a/t/113_save_pdf_with_downsample.t b/t/113_save_pdf_with_downsample.t
-index 505d691..3a5c80f 100644
---- a/t/113_save_pdf_with_downsample.t
-+++ b/t/113_save_pdf_with_downsample.t
-@@ -18,7 +18,7 @@ Gscan2pdf::Document->setup($logger);
- 
- # Create test image
- system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
- );
- 
- my $slist = Gscan2pdf::Document->new;
-diff --git a/t/134_save_tiff_alpha.t b/t/134_save_tiff_alpha.t
-index e913797..c5cde13 100644
---- a/t/134_save_tiff_alpha.t
-+++ b/t/134_save_tiff_alpha.t
-@@ -17,7 +17,7 @@ Gscan2pdf::Document->setup($logger);
- 
- # Create test image
- system(
--'convert -fill lightblue -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
-+'convert -fill lightblue -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
- );
- 
- my $slist = Gscan2pdf::Document->new;
-@@ -43,7 +43,7 @@ Gtk3->main;
- 
- like(
-     `identify test.tif`,
--    qr/test.tif TIFF 4\d\dx\d\d 4\d\dx\d\d\+0\+0 16-bit sRGB/,
-+    qr/test.tif TIFF \d\d\dx\d\d \d\d\dx\d\d\+0\+0 16-bit sRGB/,
-     'valid TIFF created'
- );
- 
-diff --git a/t/1621_import_pdf.t b/t/1621_import_pdf.t
-index 0138004..e9eb4fe 100644
---- a/t/1621_import_pdf.t
-+++ b/t/1621_import_pdf.t
-@@ -20,7 +20,7 @@ Gscan2pdf::Document->setup($logger);
- 
- # Create b&w test image
- system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
- );
- 
- # Add text layer with tesseract
-@@ -29,7 +29,7 @@ if ($tess_installed) {
- }
- else {
-     system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.pdf'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pdf'
-     );
- }
- 
-diff --git a/t/1625_import_pdf_bw.t b/t/1625_import_pdf_bw.t
-index 926f5ec..2db6044 100644
---- a/t/1625_import_pdf_bw.t
-+++ b/t/1625_import_pdf_bw.t
-@@ -18,10 +18,10 @@ Gscan2pdf::Document->setup($logger);
- 
- # Create test image
- system(
--'convert +matte -depth 1 -colorspace Gray -type Bilevel -pointsize 12 -density 300 label:"The quick brown fox" test.pdf'
-+'convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pdf'
- );
- system(
--'convert +matte -depth 1 -colorspace Gray -type Bilevel -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
- );
- my $old = `identify -format '%m %G %g %z-bit %r' test.png`;
- 
-diff --git a/t/31_ocropus.t b/t/31_ocropus.t
-index fad08a8..81a1b6f 100644
---- a/t/31_ocropus.t
-+++ b/t/31_ocropus.t
-@@ -19,7 +19,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     my $got = Gscan2pdf::Ocropus->hocr(
-@@ -32,7 +32,7 @@ SKIP: {
- 
-     # Create colour test image
-     system(
--'convert -fill lightblue -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     $got = Gscan2pdf::Ocropus->hocr(
-@@ -55,7 +55,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--"convert +matte -depth 1 -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
-+"convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
-     );
- 
-     $got = Gscan2pdf::Ocropus->hocr(
-diff --git a/t/32_ocropus_in_thread.t b/t/32_ocropus_in_thread.t
-index 30406ef..f9fa9fb 100644
---- a/t/32_ocropus_in_thread.t
-+++ b/t/32_ocropus_in_thread.t
-@@ -23,7 +23,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/33_cancel_ocropus.t b/t/33_cancel_ocropus.t
-index eb39af1..f1c352d 100644
---- a/t/33_cancel_ocropus.t
-+++ b/t/33_cancel_ocropus.t
-@@ -20,7 +20,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/351_unpaper.t b/t/351_unpaper.t
-index 3ac8c3d..0ebc0f8 100644
---- a/t/351_unpaper.t
-+++ b/t/351_unpaper.t
-@@ -45,7 +45,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-+'convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/352_unpaper.t b/t/352_unpaper.t
-index 83e1e7a..44bb98b 100644
---- a/t/352_unpaper.t
-+++ b/t/352_unpaper.t
-@@ -45,7 +45,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert -size 2550x3507 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-+'convert -size 2550x3507 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/353_cancel_unpaper.t b/t/353_cancel_unpaper.t
-index 5d1c271..3199a0e 100644
---- a/t/353_cancel_unpaper.t
-+++ b/t/353_cancel_unpaper.t
-@@ -24,10 +24,10 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
-+'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
-     );
-     system(
--'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
-+'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
-     );
-     system('convert -size 100x100 xc:black black.pnm');
-     system('convert 1.pnm black.pnm 2.pnm +append test.pnm');
-diff --git a/t/354_unpaper_with_error.t b/t/354_unpaper_with_error.t
-index 0247b20..f0052a7 100644
---- a/t/354_unpaper_with_error.t
-+++ b/t/354_unpaper_with_error.t
-@@ -45,7 +45,7 @@ SKIP: {
-     # Create test image
-     my $filename = 'test.png';
-     system(
--"convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:'The quick brown fox' $filename"
-+"convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:'The quick brown fox' $filename"
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/355_unpaper2.t b/t/355_unpaper2.t
-index 20ea40a..2af39f9 100644
---- a/t/355_unpaper2.t
-+++ b/t/355_unpaper2.t
-@@ -22,10 +22,10 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
-+'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
-     );
-     system(
--'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
-+'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
-     );
-     system('convert -size 100x100 xc:black black.pnm');
-     system('convert 1.pnm black.pnm 2.pnm +append test.pnm');
-diff --git a/t/356_unpaper_corrupt_image.t b/t/356_unpaper_corrupt_image.t
-index 09257fb..0cb77b7 100644
---- a/t/356_unpaper_corrupt_image.t
-+++ b/t/356_unpaper_corrupt_image.t
-@@ -51,7 +51,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-+'convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-     );
- 
-     $slist->import_files(
-diff --git a/t/357_unpaper_rtl.t b/t/357_unpaper_rtl.t
-index 7b05361..b0fb8b8 100644
---- a/t/357_unpaper_rtl.t
-+++ b/t/357_unpaper_rtl.t
-@@ -23,10 +23,10 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
-+'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
-     );
-     system(
--'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
-+'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
-     );
-     system('convert -size 100x100 xc:black black.pnm');
-     system('convert 1.pnm black.pnm 2.pnm +append test.pnm');
-diff --git a/t/358_unpaper_with_warning.t b/t/358_unpaper_with_warning.t
-index d313f28..f28a02f 100644
---- a/t/358_unpaper_with_warning.t
-+++ b/t/358_unpaper_with_warning.t
-@@ -25,7 +25,7 @@ SKIP: {
-     # Create test image
-     my $filename = 'test.png';
-     system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" -rotate 20 '
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" -rotate 20 '
-           . $filename );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/411_tesseract.t b/t/411_tesseract.t
-index f222006..bb91116 100644
---- a/t/411_tesseract.t
-+++ b/t/411_tesseract.t
-@@ -81,7 +81,7 @@ SKIP: {
- 
-     # Create b&w test image
-     system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     my ( $got, $messages ) = Gscan2pdf::Tesseract->hocr(
-@@ -97,7 +97,7 @@ SKIP: {
- 
-     # Create colour test image
-     system(
--'convert -fill lightblue -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     ( $got, $messages ) = Gscan2pdf::Tesseract->hocr(
-@@ -118,7 +118,7 @@ SKIP: {
- 
-     # Create b&w test image
-     system(
--"convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
-+"convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
-     );
- 
-     ( $got, $messages ) = Gscan2pdf::Tesseract->hocr(
-diff --git a/t/412_tesseract_in_thread.t b/t/412_tesseract_in_thread.t
-index ba6efe9..db56ac8 100644
---- a/t/412_tesseract_in_thread.t
-+++ b/t/412_tesseract_in_thread.t
-@@ -23,7 +23,7 @@ SKIP: {
-     # Deliberately not setting -units to provoke
-     # "Invalid resolution 0 dpi. Using 70 instead." warning from tesseract
-     system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/413_cancel_tesseract.t b/t/413_cancel_tesseract.t
-index 8bf7c30..0ee53f2 100644
---- a/t/413_cancel_tesseract.t
-+++ b/t/413_cancel_tesseract.t
-@@ -22,7 +22,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.tif'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.tif'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/414_tesseract_with_error.t b/t/414_tesseract_with_error.t
-index 788515e..ec488e8 100644
---- a/t/414_tesseract_with_error.t
-+++ b/t/414_tesseract_with_error.t
-@@ -23,7 +23,7 @@ SKIP: {
-     # Create test image
-     my $filename = 'test.png';
-     system(
--"convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:'The quick brown fox' $filename"
-+"convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:'The quick brown fox' $filename"
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/421_cuneiform.t b/t/421_cuneiform.t
-index 51cff00..38ec42a 100644
---- a/t/421_cuneiform.t
-+++ b/t/421_cuneiform.t
-@@ -19,7 +19,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     my $got = Gscan2pdf::Cuneiform->hocr(
-@@ -32,7 +32,7 @@ SKIP: {
- 
-     # Create colour test image
-     system(
--'convert -fill lightblue -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     $got = Gscan2pdf::Cuneiform->hocr(
-@@ -50,7 +50,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--"convert +matte -depth 1 -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
-+"convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
-     );
- 
-     $got = Gscan2pdf::Cuneiform->hocr(
-diff --git a/t/422_cuneiform_in_thread.t b/t/422_cuneiform_in_thread.t
-index 5f73385..2ff0fd5 100644
---- a/t/422_cuneiform_in_thread.t
-+++ b/t/422_cuneiform_in_thread.t
-@@ -24,7 +24,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/423_cancel_cuneiform.t b/t/423_cancel_cuneiform.t
-index 7da3d85..ae8e5c5 100644
---- a/t/423_cancel_cuneiform.t
-+++ b/t/423_cancel_cuneiform.t
-@@ -23,7 +23,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-+'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/424_cuneiform_with_error.t b/t/424_cuneiform_with_error.t
-index 354be31..62875dd 100644
---- a/t/424_cuneiform_with_error.t
-+++ b/t/424_cuneiform_with_error.t
-@@ -23,7 +23,7 @@ SKIP: {
-     # Create test image
-     my $filename = 'test.png';
-     system(
--"convert +matte -depth 1 -pointsize 12 -density 300 label:'The quick brown fox' $filename"
-+"convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:'The quick brown fox' $filename"
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/431_gocr.t b/t/431_gocr.t
-index a4a4603..0ec6b42 100644
---- a/t/431_gocr.t
-+++ b/t/431_gocr.t
-@@ -21,7 +21,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-+'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/432_gocr.t b/t/432_gocr.t
-index 0ae8cc9..dd577b1 100644
---- a/t/432_gocr.t
-+++ b/t/432_gocr.t
-@@ -22,7 +22,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -pointsize 12 -density 300 label:"öÖäÄüÜß" test.pnm'
-+'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"öÖäÄüÜß" test.pnm'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/433_cancel_gocr.t b/t/433_cancel_gocr.t
-index 3a66fb8..f443463 100644
---- a/t/433_cancel_gocr.t
-+++ b/t/433_cancel_gocr.t
-@@ -21,7 +21,7 @@ SKIP: {
- 
-     # Create test image
-     system(
--'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-+'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/434_gocr_with_error.t b/t/434_gocr_with_error.t
-index 7bd8a7d..05e46b6 100644
---- a/t/434_gocr_with_error.t
-+++ b/t/434_gocr_with_error.t
-@@ -22,7 +22,7 @@ SKIP: {
-     # Create test image
-     my $filename = 'test.pnm';
-     system(
--"convert +matte -depth 1 -pointsize 12 -density 300 label:'The quick brown fox' $filename"
-+"convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:'The quick brown fox' $filename"
-     );
- 
-     my $slist = Gscan2pdf::Document->new;
-diff --git a/t/51_process_chain.t b/t/51_process_chain.t
-index 067c803..6f97b8a 100644
---- a/t/51_process_chain.t
-+++ b/t/51_process_chain.t
-@@ -33,7 +33,7 @@ SKIP: {
- 
-     # Create b&w test image
-     system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" -rotate -90 test.pnm'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" -rotate -90 test.pnm'
-     );
- 
-     $slist->import_scan(
-diff --git a/t/53_process_chain.t b/t/53_process_chain.t
-index 84fc93b..bc09269 100644
---- a/t/53_process_chain.t
-+++ b/t/53_process_chain.t
-@@ -33,7 +33,7 @@ SKIP: {
- 
-     # Create b&w test image
-     system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" -rotate -90 test.pnm'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" -rotate -90 test.pnm'
-     );
- 
-     $slist->import_scan(
--- 
-2.17.2
-
diff --git a/gscan2pdf-2.4.0-lock.patch b/gscan2pdf-2.4.0-lock.patch
deleted file mode 100644
index c45a0f8..0000000
--- a/gscan2pdf-2.4.0-lock.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/lib/Gscan2pdf/Document.pm b/lib/Gscan2pdf/Document.pm
-index cea4b689..b673dd5f 100644
---- a/lib/Gscan2pdf/Document.pm
-+++ b/lib/Gscan2pdf/Document.pm
-@@ -225,6 +225,8 @@ sub quit {
- 
- sub cancel {
-     my ( $self, $cancel_callback, $process_callback ) = @_;
-+    lock( $_self->{requests} );    # unlocks automatically when out of scope
-+    lock( $_self->{pages} );       # unlocks automatically when out of scope
- 
-     # Empty process queue first to stop any new process from starting
-     $logger->info('Emptying process queue');
-@@ -252,8 +254,8 @@ sub cancel {
-                 $process_callback->($pid);
-             }
-             $logger->info("Killing PID $pid");
--            local $SIG{HUP} = 'IGNORE';
--            killfam 'HUP', ($pid);
-+            local $SIG{CHLD} = 'IGNORE';
-+            killfam 'KILL', ($pid);
-             delete $self->{running_pids}{$pidfile};
-         }
-     }
-@@ -671,6 +673,7 @@ sub _throw_error {
- 
- sub check_return_queue {
-     my ($self) = @_;
-+    lock( $_self->{return} );       # unlocks automatically when out of scope
-     while ( defined( my $data = $_self->{return}->dequeue_nb() ) ) {
-         if ( not defined $data->{type} ) {
-             $logger->error("Bad data bundle $data in return queue.");
-@@ -2311,6 +2314,8 @@ sub _thread_main {
-             }
- 
-             when ('cancel') {
-+                lock( $_self->{pages} )
-+                  ;    # unlocks automatically when out of scope
- 
-                 # Empty pages queue
-                 while ( $_self->{pages}->pending ) {
diff --git a/gscan2pdf-2.5.1-Use-specific-font-by-ImageMagick.patch b/gscan2pdf-2.5.1-Use-specific-font-by-ImageMagick.patch
new file mode 100644
index 0000000..e4d429f
--- /dev/null
+++ b/gscan2pdf-2.5.1-Use-specific-font-by-ImageMagick.patch
@@ -0,0 +1,558 @@
+From e6cfdb33918d960227ecf597676af22b80a6fc8a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 25 Sep 2017 11:31:22 +0200
+Subject: [PATCH] Use specific font by ImageMagick
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Tests use ImageMagick to draw labels into pictures. This does not work
+with ImageMagick-6.9.9.13-1.fc28.x86_64 and
+rw-base35-fonts-20170801-1.fc28:
+
+$ convert label:"The quick brown fox" test.png
+convert: unable to read font `(null)' @ error/annotate.c/RenderFreetype/1362.
+convert: no images defined `test.png' @ error/convert.c/ConvertImageCommand/3258.
+
+This patch specifies DejaVu-Sans font explicitly.
+
+<https://bugzilla.redhat.com/show_bug.cgi?id=1494563>
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ t/1122_save_pdf_with_hocr.t      | 2 +-
+ t/113_save_pdf_with_downsample.t | 2 +-
+ t/134_save_tiff_alpha.t          | 4 ++--
+ t/1621_import_pdf.t              | 4 ++--
+ t/1625_import_pdf_bw.t           | 4 ++--
+ t/1627_import_encrypted_pdf.t    | 4 ++--
+ t/31_ocropus.t                   | 6 +++---
+ t/32_ocropus_in_thread.t         | 2 +-
+ t/33_cancel_ocropus.t            | 2 +-
+ t/351_unpaper.t                  | 2 +-
+ t/352_unpaper.t                  | 2 +-
+ t/353_cancel_unpaper.t           | 4 ++--
+ t/354_unpaper_with_error.t       | 2 +-
+ t/355_unpaper2.t                 | 4 ++--
+ t/356_unpaper_corrupt_image.t    | 2 +-
+ t/357_unpaper_rtl.t              | 4 ++--
+ t/358_unpaper_with_warning.t     | 2 +-
+ t/411_tesseract.t                | 6 +++---
+ t/412_tesseract_in_thread.t      | 2 +-
+ t/413_cancel_tesseract.t         | 2 +-
+ t/414_tesseract_with_error.t     | 2 +-
+ t/421_cuneiform.t                | 6 +++---
+ t/422_cuneiform_in_thread.t      | 2 +-
+ t/423_cancel_cuneiform.t         | 2 +-
+ t/424_cuneiform_with_error.t     | 2 +-
+ t/431_gocr.t                     | 2 +-
+ t/432_gocr.t                     | 2 +-
+ t/433_cancel_gocr.t              | 2 +-
+ t/434_gocr_with_error.t          | 2 +-
+ t/51_process_chain.t             | 2 +-
+ t/53_process_chain.t             | 2 +-
+ 31 files changed, 44 insertions(+), 44 deletions(-)
+
+diff --git a/t/1122_save_pdf_with_hocr.t b/t/1122_save_pdf_with_hocr.t
+index b38bd74..ba9dfc9 100644
+--- a/t/1122_save_pdf_with_hocr.t
++++ b/t/1122_save_pdf_with_hocr.t
+@@ -18,7 +18,7 @@ Gscan2pdf::Document->setup($logger);
+ 
+ # Create test image
+ system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" -border 20x10 test.png'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" -border 20x10 test.png'
+ );
+ my $info = `identify test.png`;
+ my ( $width, $height );
+diff --git a/t/113_save_pdf_with_downsample.t b/t/113_save_pdf_with_downsample.t
+index 505d691..3a5c80f 100644
+--- a/t/113_save_pdf_with_downsample.t
++++ b/t/113_save_pdf_with_downsample.t
+@@ -18,7 +18,7 @@ Gscan2pdf::Document->setup($logger);
+ 
+ # Create test image
+ system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+ );
+ 
+ my $slist = Gscan2pdf::Document->new;
+diff --git a/t/134_save_tiff_alpha.t b/t/134_save_tiff_alpha.t
+index e913797..c5cde13 100644
+--- a/t/134_save_tiff_alpha.t
++++ b/t/134_save_tiff_alpha.t
+@@ -17,7 +17,7 @@ Gscan2pdf::Document->setup($logger);
+ 
+ # Create test image
+ system(
+-'convert -fill lightblue -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
++'convert -fill lightblue -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
+ );
+ 
+ my $slist = Gscan2pdf::Document->new;
+@@ -43,7 +43,7 @@ Gtk3->main;
+ 
+ like(
+     `identify test.tif`,
+-    qr/test.tif TIFF 4\d\dx\d\d 4\d\dx\d\d\+0\+0 16-bit sRGB/,
++    qr/test.tif TIFF \d\d\dx\d\d \d\d\dx\d\d\+0\+0 16-bit sRGB/,
+     'valid TIFF created'
+ );
+ 
+diff --git a/t/1621_import_pdf.t b/t/1621_import_pdf.t
+index 0138004..e9eb4fe 100644
+--- a/t/1621_import_pdf.t
++++ b/t/1621_import_pdf.t
+@@ -20,7 +20,7 @@ Gscan2pdf::Document->setup($logger);
+ 
+ # Create b&w test image
+ system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
+ );
+ 
+ # Add text layer with tesseract
+@@ -29,7 +29,7 @@ if ($tess_installed) {
+ }
+ else {
+     system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.pdf'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pdf'
+     );
+ }
+ 
+diff --git a/t/1625_import_pdf_bw.t b/t/1625_import_pdf_bw.t
+index c7f2db4..9c8a3da 100644
+--- a/t/1625_import_pdf_bw.t
++++ b/t/1625_import_pdf_bw.t
+@@ -18,10 +18,10 @@ Gscan2pdf::Document->setup($logger);
+ 
+ # Create test image
+ system(
+-'convert +matte -depth 1 -colorspace Gray -type Bilevel -pointsize 12 -density 300 label:"The quick brown fox" test.pdf'
++'convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pdf'
+ );
+ system(
+-'convert +matte -depth 1 -colorspace Gray -type Bilevel -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+ );
+ my $old = `identify -format '%m %G %g %z-bit %r' test.png`;
+ 
+diff --git a/t/1627_import_encrypted_pdf.t b/t/1627_import_encrypted_pdf.t
+index db1326d..737ca53 100644
+--- a/t/1627_import_encrypted_pdf.t
++++ b/t/1627_import_encrypted_pdf.t
+@@ -23,7 +23,7 @@ SKIP: {
+ 
+     # Create b&w test image
+     system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     # Add text layer with tesseract
+@@ -32,7 +32,7 @@ SKIP: {
+     }
+     else {
+         system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" input.pdf'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" input.pdf'
+         );
+     }
+ 
+diff --git a/t/31_ocropus.t b/t/31_ocropus.t
+index fad08a8..81a1b6f 100644
+--- a/t/31_ocropus.t
++++ b/t/31_ocropus.t
+@@ -19,7 +19,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     my $got = Gscan2pdf::Ocropus->hocr(
+@@ -32,7 +32,7 @@ SKIP: {
+ 
+     # Create colour test image
+     system(
+-'convert -fill lightblue -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     $got = Gscan2pdf::Ocropus->hocr(
+@@ -55,7 +55,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-"convert +matte -depth 1 -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
++"convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
+     );
+ 
+     $got = Gscan2pdf::Ocropus->hocr(
+diff --git a/t/32_ocropus_in_thread.t b/t/32_ocropus_in_thread.t
+index 30406ef..f9fa9fb 100644
+--- a/t/32_ocropus_in_thread.t
++++ b/t/32_ocropus_in_thread.t
+@@ -23,7 +23,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/33_cancel_ocropus.t b/t/33_cancel_ocropus.t
+index eb39af1..f1c352d 100644
+--- a/t/33_cancel_ocropus.t
++++ b/t/33_cancel_ocropus.t
+@@ -20,7 +20,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/351_unpaper.t b/t/351_unpaper.t
+index 3ac8c3d..0ebc0f8 100644
+--- a/t/351_unpaper.t
++++ b/t/351_unpaper.t
+@@ -45,7 +45,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
++'convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/352_unpaper.t b/t/352_unpaper.t
+index 83e1e7a..44bb98b 100644
+--- a/t/352_unpaper.t
++++ b/t/352_unpaper.t
+@@ -45,7 +45,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert -size 2550x3507 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
++'convert -size 2550x3507 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/353_cancel_unpaper.t b/t/353_cancel_unpaper.t
+index 5d1c271..3199a0e 100644
+--- a/t/353_cancel_unpaper.t
++++ b/t/353_cancel_unpaper.t
+@@ -24,10 +24,10 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
++'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
+     );
+     system(
+-'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
++'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
+     );
+     system('convert -size 100x100 xc:black black.pnm');
+     system('convert 1.pnm black.pnm 2.pnm +append test.pnm');
+diff --git a/t/354_unpaper_with_error.t b/t/354_unpaper_with_error.t
+index 0247b20..f0052a7 100644
+--- a/t/354_unpaper_with_error.t
++++ b/t/354_unpaper_with_error.t
+@@ -45,7 +45,7 @@ SKIP: {
+     # Create test image
+     my $filename = 'test.png';
+     system(
+-"convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:'The quick brown fox' $filename"
++"convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:'The quick brown fox' $filename"
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/355_unpaper2.t b/t/355_unpaper2.t
+index 20ea40a..2af39f9 100644
+--- a/t/355_unpaper2.t
++++ b/t/355_unpaper2.t
+@@ -22,10 +22,10 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
++'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
+     );
+     system(
+-'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
++'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
+     );
+     system('convert -size 100x100 xc:black black.pnm');
+     system('convert 1.pnm black.pnm 2.pnm +append test.pnm');
+diff --git a/t/356_unpaper_corrupt_image.t b/t/356_unpaper_corrupt_image.t
+index 09257fb..0cb77b7 100644
+--- a/t/356_unpaper_corrupt_image.t
++++ b/t/356_unpaper_corrupt_image.t
+@@ -51,7 +51,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
++'convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
+     );
+ 
+     $slist->import_files(
+diff --git a/t/357_unpaper_rtl.t b/t/357_unpaper_rtl.t
+index 7b05361..b0fb8b8 100644
+--- a/t/357_unpaper_rtl.t
++++ b/t/357_unpaper_rtl.t
+@@ -23,10 +23,10 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
++'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" 1.pnm'
+     );
+     system(
+-'convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
++'convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300 label:"The slower lazy dog" 2.pnm'
+     );
+     system('convert -size 100x100 xc:black black.pnm');
+     system('convert 1.pnm black.pnm 2.pnm +append test.pnm');
+diff --git a/t/358_unpaper_with_warning.t b/t/358_unpaper_with_warning.t
+index d313f28..f28a02f 100644
+--- a/t/358_unpaper_with_warning.t
++++ b/t/358_unpaper_with_warning.t
+@@ -25,7 +25,7 @@ SKIP: {
+     # Create test image
+     my $filename = 'test.png';
+     system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" -rotate 20 '
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" -rotate 20 '
+           . $filename );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/411_tesseract.t b/t/411_tesseract.t
+index 583bec8..ff55802 100644
+--- a/t/411_tesseract.t
++++ b/t/411_tesseract.t
+@@ -81,7 +81,7 @@ SKIP: {
+ 
+     # Create b&w test image
+     system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     my ( $got, $messages ) = Gscan2pdf::Tesseract->hocr(
+@@ -97,7 +97,7 @@ SKIP: {
+ 
+     # Create colour test image
+     system(
+-'convert -fill lightblue -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     ( $got, $messages ) = Gscan2pdf::Tesseract->hocr(
+@@ -118,7 +118,7 @@ SKIP: {
+ 
+     # Create b&w test image
+     system(
+-"convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:'süß tränenüberströmt' test.png"
++"convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:'süß tränenüberströmt' test.png"
+     );
+ 
+     ( $got, $messages ) = Gscan2pdf::Tesseract->hocr(
+diff --git a/t/412_tesseract_in_thread.t b/t/412_tesseract_in_thread.t
+index cba37f7..75c7600 100644
+--- a/t/412_tesseract_in_thread.t
++++ b/t/412_tesseract_in_thread.t
+@@ -23,7 +23,7 @@ SKIP: {
+     # Deliberately not setting -units to provoke
+     # "Invalid resolution 0 dpi. Using 70 instead." warning from tesseract
+     system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/413_cancel_tesseract.t b/t/413_cancel_tesseract.t
+index 8bf7c30..0ee53f2 100644
+--- a/t/413_cancel_tesseract.t
++++ b/t/413_cancel_tesseract.t
+@@ -22,7 +22,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.tif'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.tif'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/414_tesseract_with_error.t b/t/414_tesseract_with_error.t
+index 788515e..ec488e8 100644
+--- a/t/414_tesseract_with_error.t
++++ b/t/414_tesseract_with_error.t
+@@ -23,7 +23,7 @@ SKIP: {
+     # Create test image
+     my $filename = 'test.png';
+     system(
+-"convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:'The quick brown fox' $filename"
++"convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:'The quick brown fox' $filename"
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/421_cuneiform.t b/t/421_cuneiform.t
+index 51cff00..38ec42a 100644
+--- a/t/421_cuneiform.t
++++ b/t/421_cuneiform.t
+@@ -19,7 +19,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     my $got = Gscan2pdf::Cuneiform->hocr(
+@@ -32,7 +32,7 @@ SKIP: {
+ 
+     # Create colour test image
+     system(
+-'convert -fill lightblue -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     $got = Gscan2pdf::Cuneiform->hocr(
+@@ -50,7 +50,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-"convert +matte -depth 1 -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
++"convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png"
+     );
+ 
+     $got = Gscan2pdf::Cuneiform->hocr(
+diff --git a/t/422_cuneiform_in_thread.t b/t/422_cuneiform_in_thread.t
+index 5f73385..2ff0fd5 100644
+--- a/t/422_cuneiform_in_thread.t
++++ b/t/422_cuneiform_in_thread.t
+@@ -24,7 +24,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/423_cancel_cuneiform.t b/t/423_cancel_cuneiform.t
+index 7da3d85..ae8e5c5 100644
+--- a/t/423_cancel_cuneiform.t
++++ b/t/423_cancel_cuneiform.t
+@@ -23,7 +23,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.png'
++'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.png'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/424_cuneiform_with_error.t b/t/424_cuneiform_with_error.t
+index 354be31..62875dd 100644
+--- a/t/424_cuneiform_with_error.t
++++ b/t/424_cuneiform_with_error.t
+@@ -23,7 +23,7 @@ SKIP: {
+     # Create test image
+     my $filename = 'test.png';
+     system(
+-"convert +matte -depth 1 -pointsize 12 -density 300 label:'The quick brown fox' $filename"
++"convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:'The quick brown fox' $filename"
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/431_gocr.t b/t/431_gocr.t
+index a4a4603..0ec6b42 100644
+--- a/t/431_gocr.t
++++ b/t/431_gocr.t
+@@ -21,7 +21,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
++'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/432_gocr.t b/t/432_gocr.t
+index 0ae8cc9..dd577b1 100644
+--- a/t/432_gocr.t
++++ b/t/432_gocr.t
+@@ -22,7 +22,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -pointsize 12 -density 300 label:"öÖäÄüÜß" test.pnm'
++'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"öÖäÄüÜß" test.pnm'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/433_cancel_gocr.t b/t/433_cancel_gocr.t
+index 3a66fb8..f443463 100644
+--- a/t/433_cancel_gocr.t
++++ b/t/433_cancel_gocr.t
+@@ -21,7 +21,7 @@ SKIP: {
+ 
+     # Create test image
+     system(
+-'convert +matte -depth 1 -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
++'convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.pnm'
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/434_gocr_with_error.t b/t/434_gocr_with_error.t
+index 7bd8a7d..05e46b6 100644
+--- a/t/434_gocr_with_error.t
++++ b/t/434_gocr_with_error.t
+@@ -22,7 +22,7 @@ SKIP: {
+     # Create test image
+     my $filename = 'test.pnm';
+     system(
+-"convert +matte -depth 1 -pointsize 12 -density 300 label:'The quick brown fox' $filename"
++"convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300 label:'The quick brown fox' $filename"
+     );
+ 
+     my $slist = Gscan2pdf::Document->new;
+diff --git a/t/51_process_chain.t b/t/51_process_chain.t
+index 6be9a50..94c169b 100644
+--- a/t/51_process_chain.t
++++ b/t/51_process_chain.t
+@@ -33,7 +33,7 @@ SKIP: {
+ 
+     # Create b&w test image
+     system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" -rotate -90 test.pnm'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" -rotate -90 test.pnm'
+     );
+ 
+     $slist->import_scan(
+diff --git a/t/53_process_chain.t b/t/53_process_chain.t
+index 81785db..43ca252 100644
+--- a/t/53_process_chain.t
++++ b/t/53_process_chain.t
+@@ -33,7 +33,7 @@ SKIP: {
+ 
+     # Create b&w test image
+     system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" -rotate -90 test.pnm'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" -rotate -90 test.pnm'
+     );
+ 
+     $slist->import_scan(
+-- 
+2.20.1
+
diff --git a/gscan2pdf.rpmlintrc b/gscan2pdf.rpmlintrc
index 872f25d..17b01d2 100644
--- a/gscan2pdf.rpmlintrc
+++ b/gscan2pdf.rpmlintrc
@@ -1,2 +1,4 @@
 from Config import *
 addFilter("spelling-error .* multipage");
+# libtiff-tools is not a library
+addFilter("E: explicit-lib-dependency libtiff-tools");
diff --git a/gscan2pdf.spec b/gscan2pdf.spec
index 5ef9327..aaeee42 100644
--- a/gscan2pdf.spec
+++ b/gscan2pdf.spec
@@ -3,8 +3,8 @@
 %bcond_without gscan2pdf_enables_test
 
 Name:           gscan2pdf
-Version:        2.4.0
-Release:        3%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        GUI for producing a multipage PDF from a scan
 # icons/scanner.svg:    GPLv2
 # icons/pdf.svg:        LGPLv2+ (copy of
@@ -15,9 +15,7 @@ License:        GPLv3 and GPLv2 and LGPLv2+
 URL:            http://gscan2pdf.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 # Use specific font for ImageMagick, bug #1494563
-Patch0:         gscan2pdf-2.3.0-Use-specific-font-by-ImageMagick.patch
-# Fix document queue locking, <https://sourceforge.net/p/gscan2pdf/bugs/317/>
-Patch1:         gscan2pdf-2.4.0-lock.patch
+Patch0:         gscan2pdf-2.5.1-Use-specific-font-by-ImageMagick.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  desktop-file-utils
@@ -157,7 +155,6 @@ A GUI to ease the process of producing a multipage PDF from a scan.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 SHAREDIR=%{_datadir}
@@ -213,6 +210,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Mar 25 2019 Petr Pisar <ppisar@redhat.com> - 2.5.1-1
+- 2.5.1 bump
+
 * Thu Mar 14 2019 Petr Pisar <ppisar@redhat.com> - 2.4.0-3
 - Enable t/1163_save_multipage_pdf_as_ps.t test
 
diff --git a/sources b/sources
index 88542a3..b2f8558 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gscan2pdf-2.4.0.tar.xz) = 90ec9d8cc56a2fe9d7a77c928f548c87a81bdfb62f1caa491b32a42600c5677974ec613b0bf384bd806953a9a5d29ccf3077df7c0b3dd73d06866003c3a01791
+SHA512 (gscan2pdf-2.5.1.tar.xz) = 677f9081fb4f6ecd064f965399be20802e10f470d40ef00da5afd6de37ed9914c856fe01e28daedf900e8c8bd75a798f1579a7970509fc789382bbe2b1923804