From 7d564d6cf0e6d9ff12170ea0163014472f21b97e Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: May 11 2020 07:43:44 +0000
Subject: 2.7.0 bump


---

diff --git a/.gitignore b/.gitignore
index f290823..ec0ad64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,5 @@ gscan2pdf-0.9.31.tar.gz
 /gscan2pdf-2.6.6.tar.xz.asc
 /gscan2pdf-2.6.7.tar.xz
 /gscan2pdf-2.6.7.tar.xz.asc
+/gscan2pdf-2.7.0.tar.xz
+/gscan2pdf-2.7.0.tar.xz.asc
diff --git a/gscan2pdf-2.6.2-Use-specific-font-by-ImageMagick.patch b/gscan2pdf-2.6.2-Use-specific-font-by-ImageMagick.patch
deleted file mode 100644
index f9dee7d..0000000
--- a/gscan2pdf-2.6.2-Use-specific-font-by-ImageMagick.patch
+++ /dev/null
@@ -1,572 +0,0 @@
-From be34950e164f8ff412630a40074d13ebc350f7f9 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/1628_import_pdf_metadata.t     | 2 +-
- 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 +-
- 32 files changed, 45 insertions(+), 45 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 3c7c210..eafd3f9 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.tif && tiff2pdf -o test.pdf test.tif'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.tif && tiff2pdf -o test.pdf test.tif'
-     );
- }
- 
-diff --git a/t/1625_import_pdf_bw.t b/t/1625_import_pdf_bw.t
-index 5f72774..ab76172 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.tif && tiff2pdf -o test.pdf test.tif'
-+'convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.tif && tiff2pdf -o test.pdf test.tif'
- );
- 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 f0a15c5..8dac274 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.tif && tiff2pdf -o test.pdf test.tif'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" input.tif && tiff2pdf -o test.pdf test.tif'
-         );
-     }
- 
-diff --git a/t/1628_import_pdf_metadata.t b/t/1628_import_pdf_metadata.t
-index 4974510..b83444e 100644
---- a/t/1628_import_pdf_metadata.t
-+++ b/t/1628_import_pdf_metadata.t
-@@ -16,7 +16,7 @@ Gscan2pdf::Document->setup($logger);
- 
- # Create b&w test image
- system(
--'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.tif && tiff2pdf -o test.pdf -e 20181231120000 -a Author -t Title -s Subject -k Keywords test.tif'
-+'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.tif && tiff2pdf -o test.pdf -e 20181231120000 -a Author -t Title -s Subject -k Keywords test.tif'
- );
- 
- my $slist = Gscan2pdf::Document->new;
-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 a12f19e..d912433 100644
---- a/t/351_unpaper.t
-+++ b/t/351_unpaper.t
-@@ -44,7 +44,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 f812b7b..95a2be8 100644
---- a/t/352_unpaper.t
-+++ b/t/352_unpaper.t
-@@ -44,7 +44,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 a8aff45..187d268 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 91c34b3..e4ac358 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 4355943..206fb47 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.21.0
-
diff --git a/gscan2pdf-2.7.0-Use-a-specific-font-by-ImageMagick.patch b/gscan2pdf-2.7.0-Use-a-specific-font-by-ImageMagick.patch
new file mode 100644
index 0000000..4fe19be
--- /dev/null
+++ b/gscan2pdf-2.7.0-Use-a-specific-font-by-ImageMagick.patch
@@ -0,0 +1,577 @@
+From 5743024d83188c972c16648d182e2537e18ef128 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 a specific font by ImageMagick
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The tests use ImageMagick to draw the labels into the 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.
+
+It also helps in using the same font all the times making the tests
+reproducible. Otherwise different systems could default to a different
+font. That would change the rendered pixmap and as a result it would
+break tests that checks pixels there.
+
+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/1628_import_pdf_metadata.t     | 2 +-
+ 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 +-
+ 32 files changed, 45 insertions(+), 45 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 3c7c210..eafd3f9 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.tif && tiff2pdf -o test.pdf test.tif'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.tif && tiff2pdf -o test.pdf test.tif'
+     );
+ }
+ 
+diff --git a/t/1625_import_pdf_bw.t b/t/1625_import_pdf_bw.t
+index 5f72774..ab76172 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.tif && tiff2pdf -o test.pdf test.tif'
++'convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.tif && tiff2pdf -o test.pdf test.tif'
+ );
+ 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 f0a15c5..8dac274 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.tif && tiff2pdf -o test.pdf test.tif'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" input.tif && tiff2pdf -o test.pdf test.tif'
+         );
+     }
+ 
+diff --git a/t/1628_import_pdf_metadata.t b/t/1628_import_pdf_metadata.t
+index cd24730..2fafdea 100644
+--- a/t/1628_import_pdf_metadata.t
++++ b/t/1628_import_pdf_metadata.t
+@@ -16,7 +16,7 @@ Gscan2pdf::Document->setup($logger);
+ 
+ # Create b&w test image
+ system(
+-'convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300 label:"The quick brown fox" test.tif && tiff2pdf -o test.pdf -e 20181231120000 -a Authör -t Title -s Sübject -k Keywörds test.tif'
++'convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300 label:"The quick brown fox" test.tif && tiff2pdf -o test.pdf -e 20181231120000 -a Authör -t Title -s Sübject -k Keywörds test.tif'
+ );
+ 
+ my $slist = Gscan2pdf::Document->new;
+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 e60be53..e5f126c 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 f812b7b..95a2be8 100644
+--- a/t/352_unpaper.t
++++ b/t/352_unpaper.t
+@@ -44,7 +44,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 a8aff45..187d268 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 91c34b3..e4ac358 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 02b702b..74df972 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 4355943..206fb47 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.21.3
+
diff --git a/gscan2pdf.spec b/gscan2pdf.spec
index 2cefdab..8ee4ea5 100644
--- a/gscan2pdf.spec
+++ b/gscan2pdf.spec
@@ -3,7 +3,7 @@
 %bcond_without gscan2pdf_enables_test
 
 Name:           gscan2pdf
-Version:        2.6.7
+Version:        2.7.0
 Release:        1%{?dist}
 Summary:        GUI for producing a multipage PDF from a scan
 # icons/180_degree.svg: GPLv3
@@ -19,8 +19,8 @@ Source0:        https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar
 Source1:        https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
 # Key exported from Petr Pisar's keyring
 Source2:        gpgkey-463293E4AE33871846F30227B321F203110FCAF3.gpg
-# Use specific font for ImageMagick, bug #1494563
-Patch0:         gscan2pdf-2.6.2-Use-specific-font-by-ImageMagick.patch
+# Use a specific font for ImageMagick, bug #1494563
+Patch0:         gscan2pdf-2.7.0-Use-a-specific-font-by-ImageMagick.patch
 # Do not warn about missing pdftk, bug #1708054, not upstreamable
 Patch1:         gscan2pdf-2.5.2-Do-not-warn-about-missing-pdftk.patch
 BuildArch:      noarch
@@ -132,8 +132,6 @@ BuildRequires:  sane-frontends
 # libappstream-glib for appstream-util
 BuildRequires:  libappstream-glib
 Suggests:       cuneiform
-# GConf2 for gconftool-2
-Requires:       GConf2
 # Prefer gocr over cuneiform, ocropus, or tesseract
 Recommends:     gocr
 Recommends:     djvulibre
@@ -229,6 +227,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon May 11 2020 Petr Pisar <ppisar@redhat.com> - 2.7.0-1
+- 2.7.0 bump
+
 * Thu Apr 09 2020 Petr Pisar <ppisar@redhat.com> - 2.6.7-1
 - 2.6.7 bump
 
diff --git a/sources b/sources
index 17ce405..e8ff26d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (gscan2pdf-2.6.7.tar.xz) = 926df3434cebb8978ff4714b265b4ceff77c177653855c9416a87084ff6601a84a8e536d799f9efa9645336f49ef2c133672863da364145c5a785b43fd5c7c72
-SHA512 (gscan2pdf-2.6.7.tar.xz.asc) = 92860896ebb8afa2cda1879aa521191fe37b7021ddc84d966d3fffa52c0a8504e62f44e610920d41acdc21488e9b14f4b3d60be6e1a2a5812d64898ba01fef08
+SHA512 (gscan2pdf-2.7.0.tar.xz) = 7878d7e77cf107315301bf7adb29c178f4c35c1986780843dfc1742870b8a9bc6cd7a1a0d06f1c37585e6c2050e75222c8af2359b5a7c194f308ba32b5c64f06
+SHA512 (gscan2pdf-2.7.0.tar.xz.asc) = ac495400e3538eeb73864bf57bcd3f45ddee7e1cea18d72a4b4ef9d0262fad0970ef57b1f8979f4b7f1db0b079a3dde1f6ccf7009cae28787c1dfce982b7def2