From d0e4f24baec26644bfa2369e4026b94db7ab4a90 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Jan 18 2021 13:13:08 +0000 Subject: 2.11.0 bump --- diff --git a/.gitignore b/.gitignore index acb4ca9..d4385f0 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,5 @@ gscan2pdf-0.9.31.tar.gz /gscan2pdf-2.10.1.tar.xz.asc /gscan2pdf-2.10.2.tar.xz /gscan2pdf-2.10.2.tar.xz.asc +/gscan2pdf-2.11.0.tar.xz +/gscan2pdf-2.11.0.tar.xz.asc diff --git a/gscan2pdf-2.10.1-Keep-using-PDF-API2.patch b/gscan2pdf-2.10.1-Keep-using-PDF-API2.patch deleted file mode 100644 index a6be8e9..0000000 --- a/gscan2pdf-2.10.1-Keep-using-PDF-API2.patch +++ /dev/null @@ -1,475 +0,0 @@ -From d42eee3ce713491e16a1e566df0402f9b1a8e58d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 14 Dec 2020 12:19:58 +0100 -Subject: [PATCH] Keep using PDF::API2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -PDF::Builder has a license problem which prevents us from packaging it -. - -This patch revers most of the parts of an upstream "Switch from -PDF::API2 to PDF::Builder to improve TIFF handling and compression -options" commit 8107da73d9f40d3e816ea2465733b0b42d07e0f7. - -Signed-off-by: Petr Písař ---- - History | 4 --- - MANIFEST | 1 - - Makefile.PL | 2 +- - bin/gscan2pdf | 10 +++--- - debian/changelog | 4 --- - debian/control | 6 ++-- - gscan2pdf.Suse.spec | 4 +-- - gscan2pdf.spec | 4 +-- - lib/Gscan2pdf/Dialog/Save.pm | 6 ++-- - lib/Gscan2pdf/Document.pm | 8 ++--- - t/101_Document.t | 4 +-- - t/1112_save_pdf_with_locale.t | 2 +- - t/1121_save_pdf_with_text.t | 2 +- - t/1122_save_pdf_with_hocr.t | 2 +- - t/1123_save_pdf_with_utf8.t | 2 +- - t/1124_save_pdf_with_non-utf8.t | 2 +- - t/1126_save_pdf_without_font.t | 2 +- - t/1127_save_pdf_g4.t | 51 --------------------------- - t/114_cancel_save_pdf.t | 2 +- - t/1161_save_multipage_pdf_with_utf8.t | 2 +- - t/1162_save_multipage_pdf.t | 2 +- - 21 files changed, 32 insertions(+), 90 deletions(-) - delete mode 100644 t/1127_save_pdf_g4.t - -diff --git a/History b/History -index c0e7e012..4aba890a 100644 ---- a/History -+++ b/History -@@ -18,10 +18,6 @@ - - 2.10.0 (31.10.2020): - --* Switch from PDF::API2 to PDF::Builder to improve TIFF handling and compression -- options. -- Closes Debian bugs 602486 (heavily distored scans) and -- 703768 (parts of the page translated to the right, black border) - * Switch from internal image viewer to Gtk3::ImageView - (based on internal image viewer) - * Update to German translation (thanks to Eugen Artus) -diff --git a/MANIFEST b/MANIFEST -index 99de5047..b1fdfd51 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -234,7 +234,6 @@ t/1123_save_pdf_with_utf8.t - t/1124_save_pdf_with_non-utf8.t - t/1125_save_pdf_with_1bpp.t - t/1126_save_pdf_without_font.t --t/1127_save_pdf_g4.t - t/113_save_pdf_with_downsample.t - t/114_cancel_save_pdf.t - t/1151_save_pdf_with_metadata.t -diff --git a/Makefile.PL b/Makefile.PL -index 6502e12a..32e0c0dc 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -49,7 +49,7 @@ WriteMakefile( - Image::Magick => 0, - Locale::gettext => 1.05, - Config::General => 2.40, -- PDF::Builder => 0, -+ PDF::API2 => 0, - Set::IntSpan => 1.10, - GooCanvas2 => 0, - Readonly => 0, -diff --git a/bin/gscan2pdf b/bin/gscan2pdf -index 3434a2a8..16d30ef1 100755 ---- a/bin/gscan2pdf -+++ b/bin/gscan2pdf -@@ -86,7 +86,7 @@ use File::Copy; - use File::Temp; # To create temporary files - use File::Path qw(remove_tree); - use Glib qw(TRUE FALSE); # To get TRUE and FALSE --use PDF::Builder; -+use PDF::API2; - use Getopt::Long; - use Set::IntSpan 1.10; # For size method for page numbering issues - use Proc::Killfam; -@@ -217,7 +217,7 @@ $logger->info("Gscan2pdf::Document version $Gscan2pdf::Document::VERSION"); - #$logger->info( 'Using GtkImageView version ', - # Gtk3::ImageView->library_version ); - $logger->info("Using Gtk3::ImageView version $Gtk3::ImageView::VERSION"); --$logger->info("Using PDF::Builder version $PDF::Builder::VERSION"); -+$logger->info("Using PDF::API2 version $PDF::API2::VERSION"); - $logger->info( 'Using Sane version ' . join $DOT, Image::Sane->get_version ); - $logger->info("Using libimage-sane-perl version $Image::Sane::VERSION"); - -@@ -991,7 +991,7 @@ sub check_dependencies { - [ 'convert', 'rose:', $tempimg ] ); - my $temppdf = - File::Temp->new( DIR => $session, SUFFIX => '.pdf' ); -- my $pdfobj = PDF::Builder->new( -file => $temppdf ); -+ my $pdfobj = PDF::API2->new( -file => $temppdf ); - my $page = $pdfobj->page; - my $size = $Gscan2pdf::Document::POINTS_PER_INCH; - $page->mediabox( $size, $size ); -@@ -7442,7 +7442,7 @@ Displays the program version and exits. - =back - - Scanning is handled with SANE via scanimage. --PDF conversion is done by PDF::Builder. -+PDF conversion is done by PDF::API2. - TIFF export is handled by libtiff (faster and smaller memory footprint for - multipage files). - -@@ -7563,7 +7563,7 @@ A simple interface to Gtk3's complex MVC list widget - - Using libc functions for internationalisation in Perl - --=item libpdf-builder-perl -+=item libpdf-api2-perl - - provides the functions for creating PDF documents in Perl - -diff --git a/debian/changelog b/debian/changelog -index d6501c4c..93f9005e 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -11,10 +11,6 @@ gscan2pdf (2.10.0-1) unstable; urgency=low - * New upstream release - * Make dependency liblocale-codes-perl versioned - Closes: #972218 (gscan2pdf should depend on liblocale-codes-perl) -- * Removed dependency libpdf-api2-perl -- * Added new dependency libpdf-builder-perl. -- Closes: #602486 (heavily distored scans) -- Closes: #703768 (parts of the page translated to the right, black border) - * Added new build dependency fonts-noto-extra to ensure non-ascii fonts - available for tests. - -diff --git a/debian/control b/debian/control -index 931b711e..13e8a404 100644 ---- a/debian/control -+++ b/debian/control -@@ -22,7 +22,7 @@ Build-Depends-Indep: fonts-noto-extra, - liblog-log4perl-perl, - liblist-moreutils-perl, - libossp-uuid-perl | libdata-uuid-perl, -- libpdf-builder-perl, -+ libpdf-api2-perl, - libproc-processtable-perl, - libreadonly-perl, - librsvg2-common, -@@ -62,7 +62,7 @@ Depends: imagemagick, - liblocale-gettext-perl (>= 1.05), - liblog-log4perl-perl, - libossp-uuid-perl | libdata-uuid-perl, -- libpdf-builder-perl, -+ libpdf-api2-perl, - libproc-processtable-perl, - libreadonly-perl, - librsvg2-common, -@@ -88,7 +88,7 @@ Description: GUI to produce PDFs or DjVus from scanned documents - OCR can be used to recognise text in the scans, and the output - embedded in the PDF or DjVu. - . -- PDF conversion is done by PDF::Builder. -+ PDF conversion is done by PDF::API2. - . - The resulting document may be saved as a PDF, DjVu, multipage TIFF file, or - single page image file. -diff --git a/gscan2pdf.Suse.spec b/gscan2pdf.Suse.spec -index 8f9a2c93..6bf6f9b6 100644 ---- a/gscan2pdf.Suse.spec -+++ b/gscan2pdf.Suse.spec -@@ -19,7 +19,7 @@ Requires: perl(Gtk3::ImageView) - Requires: perl(Image::Magick) - Requires: perl(List::MoreUtils) - Requires: perl(Log::Log4perl) --Requires: perl(PDF::Builder) -+Requires: perl(PDF::API2) - Requires: perl(Proc::Killfam) - Requires: perl(Readonly) - Requires: perl(Sane) -@@ -43,7 +43,7 @@ scanimage or scanadf, and can scan multiple pages at once. It presents a - thumbnail view of scanned pages, and permits simple operations such as rotating - and deleting pages. - --PDF conversion is done by PDF::Builder. -+PDF conversion is done by PDF::API2. - - The resulting document may be saved as a PDF, DjVu or a multipage TIFF file. - -diff --git a/gscan2pdf.spec b/gscan2pdf.spec -index 4915cc5d..3716209d 100644 ---- a/gscan2pdf.spec -+++ b/gscan2pdf.spec -@@ -15,7 +15,7 @@ BuildRequires: gettext, desktop-file-utils - Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - Requires: perl(Gtk3::ImageView), perl-Gtk2-Ex-Simple-List - Requires: perl-Sane, perl-Locale-gettext --Requires: sane-utils, libtiff-tools, perl(PDF::Builder) -+Requires: sane-utils, libtiff-tools, perl(PDF::API2) - Requires: perl(Config::General), ImageMagick-perl, ImageMagick - Requires: librsvg-2-2, perl(Set::Intspan), perl(List::MoreUtils) - Requires: perl-HTML-Parser, perl(Goo::Canvas), perl-Proc-ProcessTable -@@ -33,7 +33,7 @@ scanimage or scanadf, and can scan multiple pages at once. It presents a - thumbnail view of scanned pages, and permits simple operations such as rotating - and deleting pages. - --PDF conversion is done by PDF::Builder. -+PDF conversion is done by PDF::API2. - - The resulting document may be saved as a PDF or a multipage TIFF file. - -diff --git a/lib/Gscan2pdf/Dialog/Save.pm b/lib/Gscan2pdf/Dialog/Save.pm -index 1d2c6704..96a53643 100644 ---- a/lib/Gscan2pdf/Dialog/Save.pm -+++ b/lib/Gscan2pdf/Dialog/Save.pm -@@ -800,8 +800,10 @@ sub add_pdf_options { - 'packbits', __('Packbits'), - __('Compress output with Packbits encoding.') - ], -- [ 'g3', __('G3'), __('Compress output with CCITT Group 3 encoding.') ], -- [ 'g4', __('G4'), __('Compress output with CCITT Group 4 encoding.') ], -+ -+ # g3 and 4 give an error message -+ # [ 'g3', __('G3'), __('Compress output with CCITT Group 3 encoding.') ], -+ # [ 'g4', __('G4'), __('Compress output with CCITT Group 4 encoding.') ], - [ 'png', __('PNG'), __('Compress output with PNG encoding.') ], - [ 'jpg', __('JPEG'), __('Compress output with JPEG encoding.') ], - [ 'none', __('None'), __('Use no compression algorithm on output.') ], -diff --git a/lib/Gscan2pdf/Document.pm b/lib/Gscan2pdf/Document.pm -index 57a3df53..807df05b 100644 ---- a/lib/Gscan2pdf/Document.pm -+++ b/lib/Gscan2pdf/Document.pm -@@ -31,7 +31,7 @@ use IPC::Open3 'open3'; - use Symbol; # for gensym - use Try::Tiny; - use Set::IntSpan 1.10; # For size method for page numbering issues --use PDF::Builder; -+use PDF::API2; - use English qw( -no_match_vars ); # for $PROCESS_ID, $INPUT_RECORD_SEPARATOR - # $CHILD_ERROR - use POSIX qw(:sys_wait_h strftime); -@@ -3387,7 +3387,7 @@ EOS - return; - } - --# return if the given PDF::Builder font can encode the given character -+# return if the given PDF::API2 font can encode the given character - - sub font_can_char { - my ( $font, $char ) = @_; -@@ -3400,14 +3400,14 @@ sub _thread_save_pdf { - my $pagenr = 0; - my ( $cache, $pdf, $error ); - -- # Create PDF with PDF::Builder -+ # Create PDF with PDF::API2 - $self->{message} = __('Setting up PDF'); - my $filename = $options{path}; - if ( _need_temp_pdf(%options) ) { - $filename = File::Temp->new( DIR => $options{dir}, SUFFIX => '.pdf' ); - } - try { -- $pdf = PDF::Builder->new( -file => $filename ); -+ $pdf = PDF::API2->new( -file => $filename ); - } - catch { - $logger->error("Caught error creating PDF $filename: $_"); -diff --git a/t/101_Document.t b/t/101_Document.t -index 703f01a3..0942e9a5 100644 ---- a/t/101_Document.t -+++ b/t/101_Document.t -@@ -5,7 +5,7 @@ use Test::More tests => 67; - use Glib 1.210 qw(TRUE FALSE); - use Gtk3 -init; # Could just call init separately - use Encode; --use PDF::Builder; -+use PDF::API2; - use File::stat; - use Date::Calc qw(Time_to_Date); - -@@ -513,7 +513,7 @@ is( - 'stderr open3 running unknown command' - ); - --my $pdf = PDF::Builder->new; -+my $pdf = PDF::API2->new; - my $font = $pdf->corefont('Times-Roman'); - is( Gscan2pdf::Document::font_can_char( $font, decode_utf8('a') ), - TRUE, '_font_can_char a' ); -diff --git a/t/1112_save_pdf_with_locale.t b/t/1112_save_pdf_with_locale.t -index 4993b03e..28d6dce3 100644 ---- a/t/1112_save_pdf_with_locale.t -+++ b/t/1112_save_pdf_with_locale.t -@@ -7,7 +7,7 @@ use POSIX qw(locale_h); - - BEGIN { - use Gscan2pdf::Document; -- use PDF::Builder; -+ use PDF::API2; - } - - ######################### -diff --git a/t/1121_save_pdf_with_text.t b/t/1121_save_pdf_with_text.t -index 10fa6e37..9ac3a6da 100644 ---- a/t/1121_save_pdf_with_text.t -+++ b/t/1121_save_pdf_with_text.t -@@ -6,7 +6,7 @@ use Test::More tests => 1; - BEGIN { - use Gscan2pdf::Document; - use Gtk3 -init; # Could just call init separately -- use PDF::Builder; -+ use PDF::API2; - } - - ######################### -diff --git a/t/1122_save_pdf_with_hocr.t b/t/1122_save_pdf_with_hocr.t -index 731d52d1..92a58e50 100644 ---- a/t/1122_save_pdf_with_hocr.t -+++ b/t/1122_save_pdf_with_hocr.t -@@ -6,7 +6,7 @@ use Test::More tests => 2; - BEGIN { - use Gscan2pdf::Document; - use Gtk3 -init; # Could just call init separately -- use PDF::Builder; -+ use PDF::API2; - } - - ######################### -diff --git a/t/1123_save_pdf_with_utf8.t b/t/1123_save_pdf_with_utf8.t -index b7ae9cdd..4d8d173b 100644 ---- a/t/1123_save_pdf_with_utf8.t -+++ b/t/1123_save_pdf_with_utf8.t -@@ -7,7 +7,7 @@ use Test::More tests => 1; - BEGIN { - use Gscan2pdf::Document; - use Gtk3 -init; # Could just call init separately -- use PDF::Builder; -+ use PDF::API2; - } - - ######################### -diff --git a/t/1124_save_pdf_with_non-utf8.t b/t/1124_save_pdf_with_non-utf8.t -index fdc8f63e..60c9b8ce 100644 ---- a/t/1124_save_pdf_with_non-utf8.t -+++ b/t/1124_save_pdf_with_non-utf8.t -@@ -6,7 +6,7 @@ use Test::More tests => 1; - BEGIN { - use Gscan2pdf::Document; - use Gtk3 -init; # Could just call init separately -- use PDF::Builder; -+ use PDF::API2; - } - - ######################### -diff --git a/t/1126_save_pdf_without_font.t b/t/1126_save_pdf_without_font.t -index 859ec1bb..258617e0 100644 ---- a/t/1126_save_pdf_without_font.t -+++ b/t/1126_save_pdf_without_font.t -@@ -7,7 +7,7 @@ use Test::More tests => 3; - BEGIN { - use Gscan2pdf::Document; - use Gtk3 -init; # Could just call init separately -- use PDF::Builder; -+ use PDF::API2; - } - - ######################### -diff --git a/t/1127_save_pdf_g4.t b/t/1127_save_pdf_g4.t -deleted file mode 100644 -index b4ae7376..00000000 ---- a/t/1127_save_pdf_g4.t -+++ /dev/null -@@ -1,51 +0,0 @@ --use warnings; --use strict; --use IPC::System::Simple qw(system capture); --use Test::More tests => 1; -- --BEGIN { -- use Gscan2pdf::Document; -- use Gtk3 -init; # Could just call init separately --} -- --######################### -- --Gscan2pdf::Translation::set_domain('gscan2pdf'); --use Log::Log4perl qw(:easy); --Log::Log4perl->easy_init($WARN); --my $logger = Log::Log4perl::get_logger; --Gscan2pdf::Document->setup($logger); -- --# Create test image --system(qw(convert rose: test.png)); -- --my $slist = Gscan2pdf::Document->new; -- --# dir for temporary files --my $dir = File::Temp->newdir; --$slist->set_dir($dir); -- --$slist->import_files( -- paths => ['test.png'], -- finished_callback => sub { -- $slist->save_pdf( -- path => 'test.pdf', -- list_of_pages => [ $slist->{data}[0][2]{uuid} ], -- options => { -- compression => 'g4', -- }, -- finished_callback => sub { Gtk3->main_quit } -- ); -- } --); --Gtk3->main; -- --is -- capture("pdfinfo test.pdf | grep 'Page size:'"), -- "Page size: 70 x 46 pts\n", -- 'valid PDF created'; -- --######################### -- --unlink 'test.pdf', 'test.png'; --Gscan2pdf::Document->quit(); -diff --git a/t/114_cancel_save_pdf.t b/t/114_cancel_save_pdf.t -index 2b271899..01ef30f0 100644 ---- a/t/114_cancel_save_pdf.t -+++ b/t/114_cancel_save_pdf.t -@@ -6,7 +6,7 @@ use Test::More tests => 1; - BEGIN { - use Gscan2pdf::Document; - use Gtk3 -init; # Could just call init separately -- use PDF::Builder; -+ use PDF::API2; - } - - ######################### -diff --git a/t/1161_save_multipage_pdf_with_utf8.t b/t/1161_save_multipage_pdf_with_utf8.t -index 41f291e1..c05653e8 100644 ---- a/t/1161_save_multipage_pdf_with_utf8.t -+++ b/t/1161_save_multipage_pdf_with_utf8.t -@@ -6,7 +6,7 @@ use Test::More tests => 1; - BEGIN { - use Gscan2pdf::Document; - use Gtk3 -init; # Could just call init separately -- use PDF::Builder; -+ use PDF::API2; - use File::Copy; - use utf8; - } -diff --git a/t/1162_save_multipage_pdf.t b/t/1162_save_multipage_pdf.t -index 5f0dc77c..2a9bbf63 100644 ---- a/t/1162_save_multipage_pdf.t -+++ b/t/1162_save_multipage_pdf.t -@@ -6,7 +6,7 @@ use Test::More tests => 1; - BEGIN { - use Gscan2pdf::Document; - use Gtk3 -init; # Could just call init separately -- use PDF::Builder; -+ use PDF::API2; - use File::Copy; - use utf8; - } --- -2.26.2 - diff --git a/gscan2pdf-2.10.1-Use-a-specific-font-by-ImageMagick.patch b/gscan2pdf-2.10.1-Use-a-specific-font-by-ImageMagick.patch deleted file mode 100644 index 7897e4f..0000000 --- a/gscan2pdf-2.10.1-Use-a-specific-font-by-ImageMagick.patch +++ /dev/null @@ -1,600 +0,0 @@ -From b8e65338d3067883d3dcf5224f097120368b1445 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 14 Dec 2020 13:58:39 +0100 -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 to make the test reproducible by using the same font all -the times. Otherwise, a system could default to a different font and -that would change the rendered pixmaps and as a result it would break -the tests that checks the pixels in there. - -This patch specifies DejaVu-Sans font explicitly. - - - -Signed-off-by: Petr Písař ---- - 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 +- - t/54_process_chain_w_delete.t | 2 +- - 33 files changed, 46 insertions(+), 46 deletions(-) - -diff --git a/t/1122_save_pdf_with_hocr.t b/t/1122_save_pdf_with_hocr.t -index 92a58e5..8f341c6 100644 ---- a/t/1122_save_pdf_with_hocr.t -+++ b/t/1122_save_pdf_with_hocr.t -@@ -19,7 +19,7 @@ Gscan2pdf::Document->setup($logger); - - # Create test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300), - 'label:"The quick brown fox"', - qw(-border 20x10 test.png) - ); -diff --git a/t/113_save_pdf_with_downsample.t b/t/113_save_pdf_with_downsample.t -index ccb27b0..11f7142 100644 ---- a/t/113_save_pdf_with_downsample.t -+++ b/t/113_save_pdf_with_downsample.t -@@ -18,7 +18,7 @@ my $logger = Log::Log4perl::get_logger; - Gscan2pdf::Document->setup($logger); - - # Create test image --system( qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+system( qw(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 90bf5d3..456d20a 100644 ---- a/t/134_save_tiff_alpha.t -+++ b/t/134_save_tiff_alpha.t -@@ -18,7 +18,7 @@ Gscan2pdf::Document->setup($logger); - - # Create test image - system( -- qw(convert -fill lightblue -pointsize 12 -units PixelsPerInch -density 300), -+ qw(convert -fill lightblue -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300), - 'label:"The quick brown fox"', - 'test.png' - ); -@@ -46,7 +46,7 @@ Gtk3->main; - - like( - capture(qw(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 8142c8b..bb88328 100644 ---- a/t/1621_import_pdf.t -+++ b/t/1621_import_pdf.t -@@ -21,7 +21,7 @@ Gscan2pdf::Document->setup($logger); - - # Create b&w test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300), - 'label:"The quick brown fox"', - 'test.png' - ); -@@ -32,7 +32,7 @@ if ($tess_installed) { - } - else { - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'test.tif' - ); -diff --git a/t/1625_import_pdf_bw.t b/t/1625_import_pdf_bw.t -index 070ed1e..2e48545 100644 ---- a/t/1625_import_pdf_bw.t -+++ b/t/1625_import_pdf_bw.t -@@ -19,13 +19,13 @@ Gscan2pdf::Document->setup($logger); - - # Create test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -type Bilevel -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'test.tif' - ); - system(qw(tiff2pdf -o test.pdf test.tif)); - system( -- qw(convert +matte -depth 1 -colorspace Gray -type Bilevel -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'test.png' - ); -diff --git a/t/1627_import_encrypted_pdf.t b/t/1627_import_encrypted_pdf.t -index 883b9cb..13183f0 100644 ---- a/t/1627_import_encrypted_pdf.t -+++ b/t/1627_import_encrypted_pdf.t -@@ -25,7 +25,7 @@ SKIP: { - - # Create b&w test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300), - 'label:"The quick brown fox"', - 'test.png' - ); -@@ -36,7 +36,7 @@ SKIP: { - } - else { - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'input.tif' - ); -diff --git a/t/1628_import_pdf_metadata.t b/t/1628_import_pdf_metadata.t -index 13f2d89..8cd74f4 100644 ---- a/t/1628_import_pdf_metadata.t -+++ b/t/1628_import_pdf_metadata.t -@@ -16,7 +16,7 @@ my $logger = Log::Log4perl::get_logger; - Gscan2pdf::Document->setup($logger); - - # Create b&w test image --system( qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+system( qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', 'test.tif' ); - system( - qw(tiff2pdf -o test.pdf -e 20181231120000 -a Authör -t Title -s Sübject -k Keywörds test.tif) -diff --git a/t/31_ocropus.t b/t/31_ocropus.t -index 4d89baf..b0a27ed 100644 ---- a/t/31_ocropus.t -+++ b/t/31_ocropus.t -@@ -19,7 +19,7 @@ SKIP: { - skip 'Ocropus not installed', 7 unless Gscan2pdf::Ocropus->setup($logger); - - # Create test image -- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', 'test.png' ); - - my $got = Gscan2pdf::Ocropus->hocr( -@@ -31,7 +31,7 @@ SKIP: { - like( $got, qr/The quick brown fox/, 'Ocropus returned sensible text' ); - - # Create colour test image -- system( qw(convert -fill lightblue -pointsize 12 -density 300), -+ system( qw(convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', 'test.png' ); - - $got = Gscan2pdf::Ocropus->hocr( -@@ -53,7 +53,7 @@ SKIP: { - unless ( defined $languages->{'deu'} ); - - # Create test image -- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(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 4f51fe8..947c965 100644 ---- a/t/32_ocropus_in_thread.t -+++ b/t/32_ocropus_in_thread.t -@@ -23,7 +23,7 @@ SKIP: { - skip 'Ocropus not installed', 2 unless Gscan2pdf::Ocropus->setup($logger); - - # Create test image -- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(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 367db1a..1f5e87a 100644 ---- a/t/33_cancel_ocropus.t -+++ b/t/33_cancel_ocropus.t -@@ -20,7 +20,7 @@ SKIP: { - skip 'Ocropus not installed', 2 unless Gscan2pdf::Ocropus->setup($logger); - - # Create test image -- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(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 623c565..47174fa 100644 ---- a/t/351_unpaper.t -+++ b/t/351_unpaper.t -@@ -46,7 +46,7 @@ SKIP: { - - # Create test image - system( -- qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'test.pnm' - ); -diff --git a/t/352_unpaper.t b/t/352_unpaper.t -index 19546b5..4e59861 100644 ---- a/t/352_unpaper.t -+++ b/t/352_unpaper.t -@@ -45,7 +45,7 @@ SKIP: { - - # Create test image - system( -- qw(convert -size 2550x3507 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert -size 2550x3507 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'test.pnm' - ); -diff --git a/t/353_cancel_unpaper.t b/t/353_cancel_unpaper.t -index 841aa94..b15ef68 100644 ---- a/t/353_cancel_unpaper.t -+++ b/t/353_cancel_unpaper.t -@@ -25,12 +25,12 @@ SKIP: { - - # Create test image - system( -- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - '1.pnm' - ); - system( -- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The slower lazy dog"', - '2.pnm' - ); -diff --git a/t/354_unpaper_with_error.t b/t/354_unpaper_with_error.t -index 96a817a..dbfb5d4 100644 ---- a/t/354_unpaper_with_error.t -+++ b/t/354_unpaper_with_error.t -@@ -46,7 +46,7 @@ SKIP: { - # Create test image - my $filename = 'test.png'; - system( -- qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - "label:'The quick brown fox'", - $filename - ); -diff --git a/t/355_unpaper2.t b/t/355_unpaper2.t -index d736df2..57b8d6b 100644 ---- a/t/355_unpaper2.t -+++ b/t/355_unpaper2.t -@@ -23,12 +23,12 @@ SKIP: { - - # Create test image - system( -- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - '1.pnm' - ); - system( -- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The slower lazy dog"', - '2.pnm' - ); -diff --git a/t/356_unpaper_corrupt_image.t b/t/356_unpaper_corrupt_image.t -index 8fd66d5..17c2d42 100644 ---- a/t/356_unpaper_corrupt_image.t -+++ b/t/356_unpaper_corrupt_image.t -@@ -52,7 +52,7 @@ SKIP: { - - # Create test image - system( -- qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'test.pnm' - ); -diff --git a/t/357_unpaper_rtl.t b/t/357_unpaper_rtl.t -index 53c5f9d..1c7d5f2 100644 ---- a/t/357_unpaper_rtl.t -+++ b/t/357_unpaper_rtl.t -@@ -24,12 +24,12 @@ SKIP: { - - # Create test image - system( -- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - '1.pnm' - ); - system( -- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The slower lazy dog"', - '2.pnm' - ); -diff --git a/t/358_unpaper_with_warning.t b/t/358_unpaper_with_warning.t -index db7e37b..80db6ec 100644 ---- a/t/358_unpaper_with_warning.t -+++ b/t/358_unpaper_with_warning.t -@@ -26,7 +26,7 @@ SKIP: { - # Create test image - my $filename = 'test.png'; - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - qw(-rotate 20), $filename - ); -diff --git a/t/411_tesseract.t b/t/411_tesseract.t -index 8e53937..279639d 100644 ---- a/t/411_tesseract.t -+++ b/t/411_tesseract.t -@@ -22,7 +22,7 @@ SKIP: { - - # Create b&w test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'test.png' - ); -@@ -40,7 +40,7 @@ SKIP: { - like( $got, qr/f(o|0)x/, 'Tesseract returned "fox"' ); - - # Create colour test image -- system( qw(convert -fill lightblue -pointsize 12 -density 300), -+ system( qw(convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', 'test.png' ); - - ( $got, $messages ) = Gscan2pdf::Tesseract->hocr( -@@ -62,7 +62,7 @@ SKIP: { - - # Create b&w test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - "label:'süß tränenüberströmt'", - 'test.png' - ); -diff --git a/t/412_tesseract_in_thread.t b/t/412_tesseract_in_thread.t -index e7e3fdc..f949c21 100644 ---- a/t/412_tesseract_in_thread.t -+++ b/t/412_tesseract_in_thread.t -@@ -26,7 +26,7 @@ SKIP: { - # which should no longer occur, since v2.8.1 added --dpi to the tesseract - # call - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'test.png' - ); -diff --git a/t/413_cancel_tesseract.t b/t/413_cancel_tesseract.t -index e73721d..aaed6c0 100644 ---- a/t/413_cancel_tesseract.t -+++ b/t/413_cancel_tesseract.t -@@ -23,7 +23,7 @@ SKIP: { - - # Create test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - 'test.tif' - ); -diff --git a/t/414_tesseract_with_error.t b/t/414_tesseract_with_error.t -index 90c7cc0..2122b8d 100644 ---- a/t/414_tesseract_with_error.t -+++ b/t/414_tesseract_with_error.t -@@ -24,7 +24,7 @@ SKIP: { - # Create test image - my $filename = 'test.png'; - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - "label:'The quick brown fox'", - $filename - ); -diff --git a/t/421_cuneiform.t b/t/421_cuneiform.t -index 295143b..23b6689 100644 ---- a/t/421_cuneiform.t -+++ b/t/421_cuneiform.t -@@ -19,7 +19,7 @@ SKIP: { - unless Gscan2pdf::Cuneiform->setup($logger); - - # Create test image -- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', 'test.png' ); - - my $got = Gscan2pdf::Cuneiform->hocr( -@@ -31,7 +31,7 @@ SKIP: { - like( $got, qr/The quick brown fox/, 'Cuneiform returned sensible text' ); - - # Create colour test image -- system( qw(convert -fill lightblue -pointsize 12 -density 300), -+ system( qw(convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', 'test.png' ); - - $got = Gscan2pdf::Cuneiform->hocr( -@@ -49,7 +49,7 @@ SKIP: { - - # Create test image - system( -- qw(convert +matte -depth 1 -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png) -+ qw(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 87b64fd..2106442 100644 ---- a/t/422_cuneiform_in_thread.t -+++ b/t/422_cuneiform_in_thread.t -@@ -24,7 +24,7 @@ SKIP: { - Gscan2pdf::Document->setup($logger); - - # Create test image -- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(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 a34d48a..b714e9f 100644 ---- a/t/423_cancel_cuneiform.t -+++ b/t/423_cancel_cuneiform.t -@@ -23,7 +23,7 @@ SKIP: { - Gscan2pdf::Document->setup($logger); - - # Create test image -- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(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 8bef9c0..6308855 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( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(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 1be3131..c21423e 100644 ---- a/t/431_gocr.t -+++ b/t/431_gocr.t -@@ -21,7 +21,7 @@ SKIP: { - Gscan2pdf::Document->setup($logger); - - # Create test image -- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(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 96936e1..9ba96a4 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 cdbb32d..6c90e1a 100644 ---- a/t/433_cancel_gocr.t -+++ b/t/433_cancel_gocr.t -@@ -21,7 +21,7 @@ SKIP: { - Gscan2pdf::Document->setup($logger); - - # Create test image -- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(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 abac00c..6f0c5bf 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( qw(convert +matte -depth 1 -pointsize 12 -density 300), -+ system( qw(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 ec38da1..6257e7c 100644 ---- a/t/51_process_chain.t -+++ b/t/51_process_chain.t -@@ -34,7 +34,7 @@ SKIP: { - - # Create b&w test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - qw(-rotate -90 test.pnm) - ); -diff --git a/t/53_process_chain.t b/t/53_process_chain.t -index 7070038..21fbb09 100644 ---- a/t/53_process_chain.t -+++ b/t/53_process_chain.t -@@ -34,7 +34,7 @@ SKIP: { - - # Create b&w test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - qw(-rotate -90 test.pnm) - ); -diff --git a/t/54_process_chain_w_delete.t b/t/54_process_chain_w_delete.t -index aee512b..891c388 100644 ---- a/t/54_process_chain_w_delete.t -+++ b/t/54_process_chain_w_delete.t -@@ -34,7 +34,7 @@ SKIP: { - - # Create b&w test image - system( -- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), -+ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), - 'label:"The quick brown fox"', - qw(-rotate -90 test.pnm) - ); --- -2.26.2 - diff --git a/gscan2pdf-2.11.0-Keep-using-PDF-API2.patch b/gscan2pdf-2.11.0-Keep-using-PDF-API2.patch new file mode 100644 index 0000000..75e8329 --- /dev/null +++ b/gscan2pdf-2.11.0-Keep-using-PDF-API2.patch @@ -0,0 +1,489 @@ +From a92a4d26cfae9832e70bf8a8ef703f9fab02ed78 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 14 Dec 2020 12:19:58 +0100 +Subject: [PATCH] Keep using PDF::API2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PDF::Builder has a license problem which prevents us from packaging it +. + +This patch revers most of the parts of an upstream "Switch from +PDF::API2 to PDF::Builder to improve TIFF handling and compression +options" commit 8107da73d9f40d3e816ea2465733b0b42d07e0f7. + +Signed-off-by: Petr Písař +--- + History | 4 --- + MANIFEST | 1 - + Makefile.PL | 2 +- + bin/gscan2pdf | 10 +++--- + debian/changelog | 4 --- + debian/control | 6 ++-- + gscan2pdf.Suse.spec | 4 +-- + gscan2pdf.spec | 4 +-- + lib/Gscan2pdf/Dialog/Save.pm | 6 ++-- + lib/Gscan2pdf/Document.pm | 8 ++--- + t/101_Document.t | 4 +-- + t/1112_save_pdf_with_locale.t | 2 +- + t/1121_save_pdf_with_text.t | 2 +- + t/1122_save_pdf_with_hocr.t | 2 +- + t/1123_save_pdf_with_utf8.t | 2 +- + t/1124_save_pdf_with_non-utf8.t | 2 +- + t/1126_save_pdf_without_font.t | 2 +- + t/1127_save_pdf_g4.t | 51 --------------------------- + t/1128_save_pdf_with_sbs_hocr.t | 2 +- + t/114_cancel_save_pdf.t | 2 +- + t/1161_save_multipage_pdf_with_utf8.t | 2 +- + t/1162_save_multipage_pdf.t | 2 +- + 22 files changed, 33 insertions(+), 91 deletions(-) + delete mode 100644 t/1127_save_pdf_g4.t + +diff --git a/History b/History +index b5e30cb6..c5a38f15 100644 +--- a/History ++++ b/History +@@ -50,10 +50,6 @@ + + 2.10.0 (31.10.2020): + +-* Switch from PDF::API2 to PDF::Builder to improve TIFF handling and compression +- options. +- Closes Debian bugs 602486 (heavily distored scans) and +- 703768 (parts of the page translated to the right, black border) + * Switch from internal image viewer to Gtk3::ImageView + (based on internal image viewer) + * Update to German translation (thanks to Eugen Artus) +diff --git a/MANIFEST b/MANIFEST +index 97844c78..70302a2d 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -237,7 +237,6 @@ t/1123_save_pdf_with_utf8.t + t/1124_save_pdf_with_non-utf8.t + t/1125_save_pdf_with_1bpp.t + t/1126_save_pdf_without_font.t +-t/1127_save_pdf_g4.t + t/1128_save_pdf_with_sbs_hocr.t + t/113_save_pdf_with_downsample.t + t/114_cancel_save_pdf.t +diff --git a/Makefile.PL b/Makefile.PL +index 6502e12a..32e0c0dc 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -49,7 +49,7 @@ WriteMakefile( + Image::Magick => 0, + Locale::gettext => 1.05, + Config::General => 2.40, +- PDF::Builder => 0, ++ PDF::API2 => 0, + Set::IntSpan => 1.10, + GooCanvas2 => 0, + Readonly => 0, +diff --git a/bin/gscan2pdf b/bin/gscan2pdf +index 49959ead..cd225a9f 100755 +--- a/bin/gscan2pdf ++++ b/bin/gscan2pdf +@@ -92,7 +92,7 @@ use File::Copy; + use File::Temp; # To create temporary files + use File::Path qw(remove_tree); + use Glib qw(TRUE FALSE); # To get TRUE and FALSE +-use PDF::Builder; ++use PDF::API2; + use Getopt::Long; + use Set::IntSpan 1.10; # For size method for page numbering issues + use Proc::Killfam; +@@ -233,7 +233,7 @@ if ( $Gscan2pdf::Document::VERSION ne $VERSION ) { + #$logger->info( 'Using GtkImageView version ', + # Gtk3::ImageView->library_version ); + $logger->info("Using Gtk3::ImageView version $Gtk3::ImageView::VERSION"); +-$logger->info("Using PDF::Builder version $PDF::Builder::VERSION"); ++$logger->info("Using PDF::API2 version $PDF::API2::VERSION"); + $logger->info( 'Using Sane version ' . join $DOT, Image::Sane->get_version ); + $logger->info("Using libimage-sane-perl version $Image::Sane::VERSION"); + +@@ -1044,7 +1044,7 @@ sub check_dependencies { + [ 'convert', 'rose:', $tempimg ] ); + my $temppdf = + File::Temp->new( DIR => $session, SUFFIX => '.pdf' ); +- my $pdfobj = PDF::Builder->new( -file => $temppdf ); ++ my $pdfobj = PDF::API2->new( -file => $temppdf ); + my $page = $pdfobj->page; + my $size = $Gscan2pdf::Document::POINTS_PER_INCH; + $page->mediabox( $size, $size ); +@@ -7514,7 +7514,7 @@ Displays the program version and exits. + =back + + Scanning is handled with SANE via scanimage. +-PDF conversion is done by PDF::Builder. ++PDF conversion is done by PDF::API2. + TIFF export is handled by libtiff (faster and smaller memory footprint for + multipage files). + +@@ -7630,7 +7630,7 @@ A simple interface to Gtk3's complex MVC list widget + + Using libc functions for internationalisation in Perl + +-=item libpdf-builder-perl ++=item libpdf-api2-perl + + provides the functions for creating PDF documents in Perl + +diff --git a/debian/changelog b/debian/changelog +index 5d4235ed..c6e35a76 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -25,10 +25,6 @@ gscan2pdf (2.10.0-1) unstable; urgency=low + * New upstream release + * Make dependency liblocale-codes-perl versioned + Closes: #972218 (gscan2pdf should depend on liblocale-codes-perl) +- * Removed dependency libpdf-api2-perl +- * Added new dependency libpdf-builder-perl. +- Closes: #602486 (heavily distored scans) +- Closes: #703768 (parts of the page translated to the right, black border) + * Added new build dependency fonts-noto-extra to ensure non-ascii fonts + available for tests. + +diff --git a/debian/control b/debian/control +index 931b711e..13e8a404 100644 +--- a/debian/control ++++ b/debian/control +@@ -22,7 +22,7 @@ Build-Depends-Indep: fonts-noto-extra, + liblog-log4perl-perl, + liblist-moreutils-perl, + libossp-uuid-perl | libdata-uuid-perl, +- libpdf-builder-perl, ++ libpdf-api2-perl, + libproc-processtable-perl, + libreadonly-perl, + librsvg2-common, +@@ -62,7 +62,7 @@ Depends: imagemagick, + liblocale-gettext-perl (>= 1.05), + liblog-log4perl-perl, + libossp-uuid-perl | libdata-uuid-perl, +- libpdf-builder-perl, ++ libpdf-api2-perl, + libproc-processtable-perl, + libreadonly-perl, + librsvg2-common, +@@ -88,7 +88,7 @@ Description: GUI to produce PDFs or DjVus from scanned documents + OCR can be used to recognise text in the scans, and the output + embedded in the PDF or DjVu. + . +- PDF conversion is done by PDF::Builder. ++ PDF conversion is done by PDF::API2. + . + The resulting document may be saved as a PDF, DjVu, multipage TIFF file, or + single page image file. +diff --git a/gscan2pdf.Suse.spec b/gscan2pdf.Suse.spec +index 8f9a2c93..6bf6f9b6 100644 +--- a/gscan2pdf.Suse.spec ++++ b/gscan2pdf.Suse.spec +@@ -19,7 +19,7 @@ Requires: perl(Gtk3::ImageView) + Requires: perl(Image::Magick) + Requires: perl(List::MoreUtils) + Requires: perl(Log::Log4perl) +-Requires: perl(PDF::Builder) ++Requires: perl(PDF::API2) + Requires: perl(Proc::Killfam) + Requires: perl(Readonly) + Requires: perl(Sane) +@@ -43,7 +43,7 @@ scanimage or scanadf, and can scan multiple pages at once. It presents a + thumbnail view of scanned pages, and permits simple operations such as rotating + and deleting pages. + +-PDF conversion is done by PDF::Builder. ++PDF conversion is done by PDF::API2. + + The resulting document may be saved as a PDF, DjVu or a multipage TIFF file. + +diff --git a/gscan2pdf.spec b/gscan2pdf.spec +index 4915cc5d..3716209d 100644 +--- a/gscan2pdf.spec ++++ b/gscan2pdf.spec +@@ -15,7 +15,7 @@ BuildRequires: gettext, desktop-file-utils + Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + Requires: perl(Gtk3::ImageView), perl-Gtk2-Ex-Simple-List + Requires: perl-Sane, perl-Locale-gettext +-Requires: sane-utils, libtiff-tools, perl(PDF::Builder) ++Requires: sane-utils, libtiff-tools, perl(PDF::API2) + Requires: perl(Config::General), ImageMagick-perl, ImageMagick + Requires: librsvg-2-2, perl(Set::Intspan), perl(List::MoreUtils) + Requires: perl-HTML-Parser, perl(Goo::Canvas), perl-Proc-ProcessTable +@@ -33,7 +33,7 @@ scanimage or scanadf, and can scan multiple pages at once. It presents a + thumbnail view of scanned pages, and permits simple operations such as rotating + and deleting pages. + +-PDF conversion is done by PDF::Builder. ++PDF conversion is done by PDF::API2. + + The resulting document may be saved as a PDF or a multipage TIFF file. + +diff --git a/lib/Gscan2pdf/Dialog/Save.pm b/lib/Gscan2pdf/Dialog/Save.pm +index fd95c3fa..dd1e4341 100644 +--- a/lib/Gscan2pdf/Dialog/Save.pm ++++ b/lib/Gscan2pdf/Dialog/Save.pm +@@ -807,8 +807,10 @@ sub add_pdf_options { + 'packbits', __('Packbits'), + __('Compress output with Packbits encoding.') + ], +- [ 'g3', __('G3'), __('Compress output with CCITT Group 3 encoding.') ], +- [ 'g4', __('G4'), __('Compress output with CCITT Group 4 encoding.') ], ++ ++ # g3 and 4 give an error message ++ # [ 'g3', __('G3'), __('Compress output with CCITT Group 3 encoding.') ], ++ # [ 'g4', __('G4'), __('Compress output with CCITT Group 4 encoding.') ], + [ 'png', __('PNG'), __('Compress output with PNG encoding.') ], + [ 'jpg', __('JPEG'), __('Compress output with JPEG encoding.') ], + [ 'none', __('None'), __('Use no compression algorithm on output.') ], +diff --git a/lib/Gscan2pdf/Document.pm b/lib/Gscan2pdf/Document.pm +index 8570a466..73b4ebf4 100644 +--- a/lib/Gscan2pdf/Document.pm ++++ b/lib/Gscan2pdf/Document.pm +@@ -31,7 +31,7 @@ use IPC::Open3 'open3'; + use Symbol; # for gensym + use Try::Tiny; + use Set::IntSpan 1.10; # For size method for page numbering issues +-use PDF::Builder; ++use PDF::API2; + use English qw( -no_match_vars ); # for $PROCESS_ID, $INPUT_RECORD_SEPARATOR + # $CHILD_ERROR + use POSIX qw(:sys_wait_h strftime); +@@ -3414,7 +3414,7 @@ EOS + return; + } + +-# return if the given PDF::Builder font can encode the given character ++# return if the given PDF::API2 font can encode the given character + + sub font_can_char { + my ( $font, $char ) = @_; +@@ -3427,14 +3427,14 @@ sub _thread_save_pdf { + my $pagenr = 0; + my ( $cache, $pdf, $error, $message ); + +- # Create PDF with PDF::Builder ++ # Create PDF with PDF::API2 + $self->{message} = __('Setting up PDF'); + my $filename = $options{path}; + if ( _need_temp_pdf(%options) ) { + $filename = File::Temp->new( DIR => $options{dir}, SUFFIX => '.pdf' ); + } + try { +- $pdf = PDF::Builder->new( -file => $filename ); ++ $pdf = PDF::API2->new( -file => $filename ); + } + catch { + $logger->error("Caught error creating PDF $filename: $_"); +diff --git a/t/101_Document.t b/t/101_Document.t +index 703f01a3..0942e9a5 100644 +--- a/t/101_Document.t ++++ b/t/101_Document.t +@@ -5,7 +5,7 @@ use Test::More tests => 67; + use Glib 1.210 qw(TRUE FALSE); + use Gtk3 -init; # Could just call init separately + use Encode; +-use PDF::Builder; ++use PDF::API2; + use File::stat; + use Date::Calc qw(Time_to_Date); + +@@ -513,7 +513,7 @@ is( + 'stderr open3 running unknown command' + ); + +-my $pdf = PDF::Builder->new; ++my $pdf = PDF::API2->new; + my $font = $pdf->corefont('Times-Roman'); + is( Gscan2pdf::Document::font_can_char( $font, decode_utf8('a') ), + TRUE, '_font_can_char a' ); +diff --git a/t/1112_save_pdf_with_locale.t b/t/1112_save_pdf_with_locale.t +index 4993b03e..28d6dce3 100644 +--- a/t/1112_save_pdf_with_locale.t ++++ b/t/1112_save_pdf_with_locale.t +@@ -7,7 +7,7 @@ use POSIX qw(locale_h); + + BEGIN { + use Gscan2pdf::Document; +- use PDF::Builder; ++ use PDF::API2; + } + + ######################### +diff --git a/t/1121_save_pdf_with_text.t b/t/1121_save_pdf_with_text.t +index 10fa6e37..9ac3a6da 100644 +--- a/t/1121_save_pdf_with_text.t ++++ b/t/1121_save_pdf_with_text.t +@@ -6,7 +6,7 @@ use Test::More tests => 1; + BEGIN { + use Gscan2pdf::Document; + use Gtk3 -init; # Could just call init separately +- use PDF::Builder; ++ use PDF::API2; + } + + ######################### +diff --git a/t/1122_save_pdf_with_hocr.t b/t/1122_save_pdf_with_hocr.t +index 731d52d1..92a58e50 100644 +--- a/t/1122_save_pdf_with_hocr.t ++++ b/t/1122_save_pdf_with_hocr.t +@@ -6,7 +6,7 @@ use Test::More tests => 2; + BEGIN { + use Gscan2pdf::Document; + use Gtk3 -init; # Could just call init separately +- use PDF::Builder; ++ use PDF::API2; + } + + ######################### +diff --git a/t/1123_save_pdf_with_utf8.t b/t/1123_save_pdf_with_utf8.t +index b7ae9cdd..4d8d173b 100644 +--- a/t/1123_save_pdf_with_utf8.t ++++ b/t/1123_save_pdf_with_utf8.t +@@ -7,7 +7,7 @@ use Test::More tests => 1; + BEGIN { + use Gscan2pdf::Document; + use Gtk3 -init; # Could just call init separately +- use PDF::Builder; ++ use PDF::API2; + } + + ######################### +diff --git a/t/1124_save_pdf_with_non-utf8.t b/t/1124_save_pdf_with_non-utf8.t +index fdc8f63e..60c9b8ce 100644 +--- a/t/1124_save_pdf_with_non-utf8.t ++++ b/t/1124_save_pdf_with_non-utf8.t +@@ -6,7 +6,7 @@ use Test::More tests => 1; + BEGIN { + use Gscan2pdf::Document; + use Gtk3 -init; # Could just call init separately +- use PDF::Builder; ++ use PDF::API2; + } + + ######################### +diff --git a/t/1126_save_pdf_without_font.t b/t/1126_save_pdf_without_font.t +index 859ec1bb..258617e0 100644 +--- a/t/1126_save_pdf_without_font.t ++++ b/t/1126_save_pdf_without_font.t +@@ -7,7 +7,7 @@ use Test::More tests => 3; + BEGIN { + use Gscan2pdf::Document; + use Gtk3 -init; # Could just call init separately +- use PDF::Builder; ++ use PDF::API2; + } + + ######################### +diff --git a/t/1127_save_pdf_g4.t b/t/1127_save_pdf_g4.t +deleted file mode 100644 +index b4ae7376..00000000 +--- a/t/1127_save_pdf_g4.t ++++ /dev/null +@@ -1,51 +0,0 @@ +-use warnings; +-use strict; +-use IPC::System::Simple qw(system capture); +-use Test::More tests => 1; +- +-BEGIN { +- use Gscan2pdf::Document; +- use Gtk3 -init; # Could just call init separately +-} +- +-######################### +- +-Gscan2pdf::Translation::set_domain('gscan2pdf'); +-use Log::Log4perl qw(:easy); +-Log::Log4perl->easy_init($WARN); +-my $logger = Log::Log4perl::get_logger; +-Gscan2pdf::Document->setup($logger); +- +-# Create test image +-system(qw(convert rose: test.png)); +- +-my $slist = Gscan2pdf::Document->new; +- +-# dir for temporary files +-my $dir = File::Temp->newdir; +-$slist->set_dir($dir); +- +-$slist->import_files( +- paths => ['test.png'], +- finished_callback => sub { +- $slist->save_pdf( +- path => 'test.pdf', +- list_of_pages => [ $slist->{data}[0][2]{uuid} ], +- options => { +- compression => 'g4', +- }, +- finished_callback => sub { Gtk3->main_quit } +- ); +- } +-); +-Gtk3->main; +- +-is +- capture("pdfinfo test.pdf | grep 'Page size:'"), +- "Page size: 70 x 46 pts\n", +- 'valid PDF created'; +- +-######################### +- +-unlink 'test.pdf', 'test.png'; +-Gscan2pdf::Document->quit(); +diff --git a/t/1128_save_pdf_with_sbs_hocr.t b/t/1128_save_pdf_with_sbs_hocr.t +index fdad84c5..835f6b1a 100644 +--- a/t/1128_save_pdf_with_sbs_hocr.t ++++ b/t/1128_save_pdf_with_sbs_hocr.t +@@ -6,7 +6,7 @@ use Test::More tests => 2; + BEGIN { + use Gscan2pdf::Document; + use Gtk3 -init; # Could just call init separately +- use PDF::Builder; ++ use PDF::API2; + } + + ######################### +diff --git a/t/114_cancel_save_pdf.t b/t/114_cancel_save_pdf.t +index 2b271899..01ef30f0 100644 +--- a/t/114_cancel_save_pdf.t ++++ b/t/114_cancel_save_pdf.t +@@ -6,7 +6,7 @@ use Test::More tests => 1; + BEGIN { + use Gscan2pdf::Document; + use Gtk3 -init; # Could just call init separately +- use PDF::Builder; ++ use PDF::API2; + } + + ######################### +diff --git a/t/1161_save_multipage_pdf_with_utf8.t b/t/1161_save_multipage_pdf_with_utf8.t +index 23ed652e..633d4538 100644 +--- a/t/1161_save_multipage_pdf_with_utf8.t ++++ b/t/1161_save_multipage_pdf_with_utf8.t +@@ -7,7 +7,7 @@ use Test::More tests => 1; + BEGIN { + use Gscan2pdf::Document; + use Gtk3 -init; # Could just call init separately +- use PDF::Builder; ++ use PDF::API2; + use File::Copy; + } + +diff --git a/t/1162_save_multipage_pdf.t b/t/1162_save_multipage_pdf.t +index 5f0dc77c..2a9bbf63 100644 +--- a/t/1162_save_multipage_pdf.t ++++ b/t/1162_save_multipage_pdf.t +@@ -6,7 +6,7 @@ use Test::More tests => 1; + BEGIN { + use Gscan2pdf::Document; + use Gtk3 -init; # Could just call init separately +- use PDF::Builder; ++ use PDF::API2; + use File::Copy; + use utf8; + } +-- +2.26.2 + diff --git a/gscan2pdf-2.11.0-Use-a-specific-font-by-ImageMagick.patch b/gscan2pdf-2.11.0-Use-a-specific-font-by-ImageMagick.patch new file mode 100644 index 0000000..9bbaf5e --- /dev/null +++ b/gscan2pdf-2.11.0-Use-a-specific-font-by-ImageMagick.patch @@ -0,0 +1,628 @@ +From d2e003a62ee485fe1b1e01c6706b4ebe2788f400 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 14 Dec 2020 13:58:39 +0100 +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 to make the test reproducible by using the same font all +the times. Otherwise, a system could default to a different font and +that would change the rendered pixmaps and as a result it would break +the tests that checks the pixels in there. + +This patch specifies DejaVu-Sans font explicitly. + + + +Signed-off-by: Petr Písař +--- + t/1122_save_pdf_with_hocr.t | 2 +- + t/1128_save_pdf_with_sbs_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 +- + t/54_process_chain_w_delete.t | 2 +- + t/55_process_chain_w_delete2.t | 2 +- + 35 files changed, 48 insertions(+), 48 deletions(-) + +diff --git a/t/1122_save_pdf_with_hocr.t b/t/1122_save_pdf_with_hocr.t +index 92a58e5..8f341c6 100644 +--- a/t/1122_save_pdf_with_hocr.t ++++ b/t/1122_save_pdf_with_hocr.t +@@ -19,7 +19,7 @@ Gscan2pdf::Document->setup($logger); + + # Create test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300), + 'label:"The quick brown fox"', + qw(-border 20x10 test.png) + ); +diff --git a/t/1128_save_pdf_with_sbs_hocr.t b/t/1128_save_pdf_with_sbs_hocr.t +index 835f6b1..57cf33d 100644 +--- a/t/1128_save_pdf_with_sbs_hocr.t ++++ b/t/1128_save_pdf_with_sbs_hocr.t +@@ -19,7 +19,7 @@ Gscan2pdf::Document->setup($logger); + + # Create test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300), + 'label:"The quick brown fox"', + qw(-border 20x10 test.png) + ); +diff --git a/t/113_save_pdf_with_downsample.t b/t/113_save_pdf_with_downsample.t +index ccb27b0..11f7142 100644 +--- a/t/113_save_pdf_with_downsample.t ++++ b/t/113_save_pdf_with_downsample.t +@@ -18,7 +18,7 @@ my $logger = Log::Log4perl::get_logger; + Gscan2pdf::Document->setup($logger); + + # Create test image +-system( qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++system( qw(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 90bf5d3..456d20a 100644 +--- a/t/134_save_tiff_alpha.t ++++ b/t/134_save_tiff_alpha.t +@@ -18,7 +18,7 @@ Gscan2pdf::Document->setup($logger); + + # Create test image + system( +- qw(convert -fill lightblue -pointsize 12 -units PixelsPerInch -density 300), ++ qw(convert -fill lightblue -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300), + 'label:"The quick brown fox"', + 'test.png' + ); +@@ -46,7 +46,7 @@ Gtk3->main; + + like( + capture(qw(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 8142c8b..bb88328 100644 +--- a/t/1621_import_pdf.t ++++ b/t/1621_import_pdf.t +@@ -21,7 +21,7 @@ Gscan2pdf::Document->setup($logger); + + # Create b&w test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300), + 'label:"The quick brown fox"', + 'test.png' + ); +@@ -32,7 +32,7 @@ if ($tess_installed) { + } + else { + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'test.tif' + ); +diff --git a/t/1625_import_pdf_bw.t b/t/1625_import_pdf_bw.t +index 070ed1e..2e48545 100644 +--- a/t/1625_import_pdf_bw.t ++++ b/t/1625_import_pdf_bw.t +@@ -19,13 +19,13 @@ Gscan2pdf::Document->setup($logger); + + # Create test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -type Bilevel -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'test.tif' + ); + system(qw(tiff2pdf -o test.pdf test.tif)); + system( +- qw(convert +matte -depth 1 -colorspace Gray -type Bilevel -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -type Bilevel -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'test.png' + ); +diff --git a/t/1627_import_encrypted_pdf.t b/t/1627_import_encrypted_pdf.t +index 883b9cb..13183f0 100644 +--- a/t/1627_import_encrypted_pdf.t ++++ b/t/1627_import_encrypted_pdf.t +@@ -25,7 +25,7 @@ SKIP: { + + # Create b&w test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -units PixelsPerInch -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -units PixelsPerInch -density 300), + 'label:"The quick brown fox"', + 'test.png' + ); +@@ -36,7 +36,7 @@ SKIP: { + } + else { + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'input.tif' + ); +diff --git a/t/1628_import_pdf_metadata.t b/t/1628_import_pdf_metadata.t +index 13f2d89..8cd74f4 100644 +--- a/t/1628_import_pdf_metadata.t ++++ b/t/1628_import_pdf_metadata.t +@@ -16,7 +16,7 @@ my $logger = Log::Log4perl::get_logger; + Gscan2pdf::Document->setup($logger); + + # Create b&w test image +-system( qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++system( qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', 'test.tif' ); + system( + qw(tiff2pdf -o test.pdf -e 20181231120000 -a Authör -t Title -s Sübject -k Keywörds test.tif) +diff --git a/t/31_ocropus.t b/t/31_ocropus.t +index 4d89baf..b0a27ed 100644 +--- a/t/31_ocropus.t ++++ b/t/31_ocropus.t +@@ -19,7 +19,7 @@ SKIP: { + skip 'Ocropus not installed', 7 unless Gscan2pdf::Ocropus->setup($logger); + + # Create test image +- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', 'test.png' ); + + my $got = Gscan2pdf::Ocropus->hocr( +@@ -31,7 +31,7 @@ SKIP: { + like( $got, qr/The quick brown fox/, 'Ocropus returned sensible text' ); + + # Create colour test image +- system( qw(convert -fill lightblue -pointsize 12 -density 300), ++ system( qw(convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', 'test.png' ); + + $got = Gscan2pdf::Ocropus->hocr( +@@ -53,7 +53,7 @@ SKIP: { + unless ( defined $languages->{'deu'} ); + + # Create test image +- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(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 4f51fe8..947c965 100644 +--- a/t/32_ocropus_in_thread.t ++++ b/t/32_ocropus_in_thread.t +@@ -23,7 +23,7 @@ SKIP: { + skip 'Ocropus not installed', 2 unless Gscan2pdf::Ocropus->setup($logger); + + # Create test image +- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(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 367db1a..1f5e87a 100644 +--- a/t/33_cancel_ocropus.t ++++ b/t/33_cancel_ocropus.t +@@ -20,7 +20,7 @@ SKIP: { + skip 'Ocropus not installed', 2 unless Gscan2pdf::Ocropus->setup($logger); + + # Create test image +- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(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 623c565..47174fa 100644 +--- a/t/351_unpaper.t ++++ b/t/351_unpaper.t +@@ -46,7 +46,7 @@ SKIP: { + + # Create test image + system( +- qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'test.pnm' + ); +diff --git a/t/352_unpaper.t b/t/352_unpaper.t +index 19546b5..4e59861 100644 +--- a/t/352_unpaper.t ++++ b/t/352_unpaper.t +@@ -45,7 +45,7 @@ SKIP: { + + # Create test image + system( +- qw(convert -size 2550x3507 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert -size 2550x3507 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'test.pnm' + ); +diff --git a/t/353_cancel_unpaper.t b/t/353_cancel_unpaper.t +index 841aa94..b15ef68 100644 +--- a/t/353_cancel_unpaper.t ++++ b/t/353_cancel_unpaper.t +@@ -25,12 +25,12 @@ SKIP: { + + # Create test image + system( +- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + '1.pnm' + ); + system( +- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The slower lazy dog"', + '2.pnm' + ); +diff --git a/t/354_unpaper_with_error.t b/t/354_unpaper_with_error.t +index 96a817a..dbfb5d4 100644 +--- a/t/354_unpaper_with_error.t ++++ b/t/354_unpaper_with_error.t +@@ -46,7 +46,7 @@ SKIP: { + # Create test image + my $filename = 'test.png'; + system( +- qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + "label:'The quick brown fox'", + $filename + ); +diff --git a/t/355_unpaper2.t b/t/355_unpaper2.t +index d736df2..57b8d6b 100644 +--- a/t/355_unpaper2.t ++++ b/t/355_unpaper2.t +@@ -23,12 +23,12 @@ SKIP: { + + # Create test image + system( +- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + '1.pnm' + ); + system( +- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The slower lazy dog"', + '2.pnm' + ); +diff --git a/t/356_unpaper_corrupt_image.t b/t/356_unpaper_corrupt_image.t +index 299ef81..1fd50a1 100644 +--- a/t/356_unpaper_corrupt_image.t ++++ b/t/356_unpaper_corrupt_image.t +@@ -52,7 +52,7 @@ SKIP: { + + # Create test image + system( +- qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert -size 2100x2970 +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'test.pnm' + ); +diff --git a/t/357_unpaper_rtl.t b/t/357_unpaper_rtl.t +index 53c5f9d..1c7d5f2 100644 +--- a/t/357_unpaper_rtl.t ++++ b/t/357_unpaper_rtl.t +@@ -24,12 +24,12 @@ SKIP: { + + # Create test image + system( +- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + '1.pnm' + ); + system( +- qw(convert +matte -depth 1 -border 2x2 -bordercolor black -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -border 2x2 -bordercolor black -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The slower lazy dog"', + '2.pnm' + ); +diff --git a/t/358_unpaper_with_warning.t b/t/358_unpaper_with_warning.t +index db7e37b..80db6ec 100644 +--- a/t/358_unpaper_with_warning.t ++++ b/t/358_unpaper_with_warning.t +@@ -26,7 +26,7 @@ SKIP: { + # Create test image + my $filename = 'test.png'; + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + qw(-rotate 20), $filename + ); +diff --git a/t/411_tesseract.t b/t/411_tesseract.t +index 8e53937..279639d 100644 +--- a/t/411_tesseract.t ++++ b/t/411_tesseract.t +@@ -22,7 +22,7 @@ SKIP: { + + # Create b&w test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'test.png' + ); +@@ -40,7 +40,7 @@ SKIP: { + like( $got, qr/f(o|0)x/, 'Tesseract returned "fox"' ); + + # Create colour test image +- system( qw(convert -fill lightblue -pointsize 12 -density 300), ++ system( qw(convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', 'test.png' ); + + ( $got, $messages ) = Gscan2pdf::Tesseract->hocr( +@@ -62,7 +62,7 @@ SKIP: { + + # Create b&w test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + "label:'süß tränenüberströmt'", + 'test.png' + ); +diff --git a/t/412_tesseract_in_thread.t b/t/412_tesseract_in_thread.t +index e7e3fdc..f949c21 100644 +--- a/t/412_tesseract_in_thread.t ++++ b/t/412_tesseract_in_thread.t +@@ -26,7 +26,7 @@ SKIP: { + # which should no longer occur, since v2.8.1 added --dpi to the tesseract + # call + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'test.png' + ); +diff --git a/t/413_cancel_tesseract.t b/t/413_cancel_tesseract.t +index e73721d..aaed6c0 100644 +--- a/t/413_cancel_tesseract.t ++++ b/t/413_cancel_tesseract.t +@@ -23,7 +23,7 @@ SKIP: { + + # Create test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + 'test.tif' + ); +diff --git a/t/414_tesseract_with_error.t b/t/414_tesseract_with_error.t +index 90c7cc0..2122b8d 100644 +--- a/t/414_tesseract_with_error.t ++++ b/t/414_tesseract_with_error.t +@@ -24,7 +24,7 @@ SKIP: { + # Create test image + my $filename = 'test.png'; + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + "label:'The quick brown fox'", + $filename + ); +diff --git a/t/421_cuneiform.t b/t/421_cuneiform.t +index 295143b..23b6689 100644 +--- a/t/421_cuneiform.t ++++ b/t/421_cuneiform.t +@@ -19,7 +19,7 @@ SKIP: { + unless Gscan2pdf::Cuneiform->setup($logger); + + # Create test image +- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(convert +matte -depth 1 -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', 'test.png' ); + + my $got = Gscan2pdf::Cuneiform->hocr( +@@ -31,7 +31,7 @@ SKIP: { + like( $got, qr/The quick brown fox/, 'Cuneiform returned sensible text' ); + + # Create colour test image +- system( qw(convert -fill lightblue -pointsize 12 -density 300), ++ system( qw(convert -fill lightblue -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', 'test.png' ); + + $got = Gscan2pdf::Cuneiform->hocr( +@@ -49,7 +49,7 @@ SKIP: { + + # Create test image + system( +- qw(convert +matte -depth 1 -pointsize 12 -density 300 label:'öÖäÄüÜß' test.png) ++ qw(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 87b64fd..2106442 100644 +--- a/t/422_cuneiform_in_thread.t ++++ b/t/422_cuneiform_in_thread.t +@@ -24,7 +24,7 @@ SKIP: { + Gscan2pdf::Document->setup($logger); + + # Create test image +- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(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 a34d48a..b714e9f 100644 +--- a/t/423_cancel_cuneiform.t ++++ b/t/423_cancel_cuneiform.t +@@ -23,7 +23,7 @@ SKIP: { + Gscan2pdf::Document->setup($logger); + + # Create test image +- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(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 8bef9c0..6308855 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( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(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 1be3131..c21423e 100644 +--- a/t/431_gocr.t ++++ b/t/431_gocr.t +@@ -21,7 +21,7 @@ SKIP: { + Gscan2pdf::Document->setup($logger); + + # Create test image +- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(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 96936e1..9ba96a4 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 cdbb32d..6c90e1a 100644 +--- a/t/433_cancel_gocr.t ++++ b/t/433_cancel_gocr.t +@@ -21,7 +21,7 @@ SKIP: { + Gscan2pdf::Document->setup($logger); + + # Create test image +- system( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(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 abac00c..6f0c5bf 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( qw(convert +matte -depth 1 -pointsize 12 -density 300), ++ system( qw(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 ec38da1..6257e7c 100644 +--- a/t/51_process_chain.t ++++ b/t/51_process_chain.t +@@ -34,7 +34,7 @@ SKIP: { + + # Create b&w test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + qw(-rotate -90 test.pnm) + ); +diff --git a/t/53_process_chain.t b/t/53_process_chain.t +index 7070038..21fbb09 100644 +--- a/t/53_process_chain.t ++++ b/t/53_process_chain.t +@@ -34,7 +34,7 @@ SKIP: { + + # Create b&w test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + qw(-rotate -90 test.pnm) + ); +diff --git a/t/54_process_chain_w_delete.t b/t/54_process_chain_w_delete.t +index 10a9fd3..ff5a4d5 100644 +--- a/t/54_process_chain_w_delete.t ++++ b/t/54_process_chain_w_delete.t +@@ -34,7 +34,7 @@ SKIP: { + + # Create b&w test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + qw(-rotate -90 test.pnm) + ); +diff --git a/t/55_process_chain_w_delete2.t b/t/55_process_chain_w_delete2.t +index e181302..8555042 100644 +--- a/t/55_process_chain_w_delete2.t ++++ b/t/55_process_chain_w_delete2.t +@@ -34,7 +34,7 @@ SKIP: { + + # Create b&w test image + system( +- qw(convert +matte -depth 1 -colorspace Gray -pointsize 12 -density 300), ++ qw(convert +matte -depth 1 -colorspace Gray -font DejaVu-Sans -pointsize 12 -density 300), + 'label:"The quick brown fox"', + qw(-rotate -90 test.pnm) + ); +-- +2.26.2 + diff --git a/gscan2pdf.spec b/gscan2pdf.spec index a477bc3..c5bd02b 100644 --- a/gscan2pdf.spec +++ b/gscan2pdf.spec @@ -3,7 +3,7 @@ %bcond_without gscan2pdf_enables_test Name: gscan2pdf -Version: 2.10.2 +Version: 2.11.0 Release: 1%{?dist} Summary: GUI for producing a multipage PDF from a scan # icons/180_degree.svg: GPLv3 @@ -23,9 +23,9 @@ Source2: gpgkey-463293E4AE33871846F30227B321F203110FCAF3.gpg Patch0: gscan2pdf-2.9.0-Do-not-warn-about-missing-pdftk.patch # Revert to using PDF-API2 because of a bad license of PDF-Builder, # bug #1894911, not upstreamable -Patch1: gscan2pdf-2.10.1-Keep-using-PDF-API2.patch +Patch1: gscan2pdf-2.11.0-Keep-using-PDF-API2.patch # Use a specific font for ImageMagick in tests, bug #1494563 -Patch2: gscan2pdf-2.10.1-Use-a-specific-font-by-ImageMagick.patch +Patch2: gscan2pdf-2.11.0-Use-a-specific-font-by-ImageMagick.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: desktop-file-utils @@ -206,11 +206,17 @@ unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION LOGDIR OCROSCRIPTS \ # glib randomly fails with "GLib-GObject-WARNING **: # ../gobject/gsignal.c:2647: instance '0x559dcdc1e290' has no handler with id # '7415' at t/0602_Dialog_Scan.t line 313.". -rm t/0602_Dialog_Scan.t +rm t/0603_Dialog_Scan.t # ImageMagick reports 255x30 image size rm t/113_save_pdf_with_downsample.t # ??? rm t/1111_save_pdf.t +# Fails with got: '179', expected '296' if not run separately. New test in 2.11.0. +rm t/169_import_scan.t +# Fails with Use of uninitialized value $imagew in multiplication (*) at +# lib/Gscan2pdf/Bboxtree.pm in _pdftotext2boxes() if not run an separatelly. +# The test should be skipped because of no tesseract. Since 2.11.0. +rm t/54_process_chain_w_delete.t xvfb-run -d make test %endif appstream-util validate-relax --nonet \ @@ -241,6 +247,9 @@ fi %{_mandir}/man1/*.1* %changelog +* Mon Jan 18 2021 Petr Pisar - 2.11.0-1 +- 2.11.0 bump + * Fri Dec 18 2020 Petr Pisar - 2.10.2-1 - 2.10.2 bump diff --git a/sources b/sources index f53ee73..0eb62c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gscan2pdf-2.10.2.tar.xz) = 807af9af9c1451f761e1f64a0ebe132fc98252100202c0af0dea53210cd30bed5f4c293a8f5f52b03b493422053420c1506ca32a34515c90b7a5290837bc686a -SHA512 (gscan2pdf-2.10.2.tar.xz.asc) = 635304e0dfeebf0ee60eb1faa40f2b86d0c1dd7b1a45c0da52ae319c3f234f9d968638d77e4e68457c772835f2399a58585edbd213051a17596e856e75bd2576 +SHA512 (gscan2pdf-2.11.0.tar.xz) = afb5849a33d1d89c9ac503a8b85f1adb6d482da6eb2af48682da6bc623ac478f624ebd8255ba38473a7236902e3ba4c73f8a98d96af636d627778b369ca78495 +SHA512 (gscan2pdf-2.11.0.tar.xz.asc) = a27e0ef4cf4793218e075e7df38b18f1c3c05823e405a64dd8f3ead0c4db42ca5776d234be41e5ca3e7c073256d38b5d14fbc5c4d5039dcf0f6ed7efe47fe572