Bug#987186: unblock: imagemagick/8:6.9.11.60+dfsg-1.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package imagemagick
[ Reason ]
imagemagick creates wrong images making gscan2pdf FTBFS.
[ Impact ]
gscan2pdf would FTBFS in bullseye and imagemagick be broken.
[ Tests ]
I checked that the correct image is generated again and also gscan2pdf
builds successfully and autopkgtests work.
[ Risks ]
The code change is rather minimal, just sanitizing a size of 0, so the
risk is low. Also there are a lot of tests and autopkgtest in other
packages, which all pass and the diff is taken from upstream.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
unblock imagemagick/8:6.9.11.60+dfsg-1.1
diff -Nru imagemagick-6.9.11.60+dfsg/debian/changelog imagemagick-6.9.11.60+dfsg/debian/changelog
--- imagemagick-6.9.11.60+dfsg/debian/changelog 2021-02-01 17:22:02.000000000 +0100
+++ imagemagick-6.9.11.60+dfsg/debian/changelog 2021-04-13 20:58:45.000000000 +0200
@@ -1,3 +1,10 @@
+imagemagick (8:6.9.11.60+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Import upstream patch to fix font size (Closes: #980202).
+
+ -- Jochen Sprickerhof <jspricke@debian.org> Tue, 13 Apr 2021 20:58:45 +0200
+
imagemagick (8:6.9.11.60+dfsg-1) unstable; urgency=high
* New upstream version
diff -Nru imagemagick-6.9.11.60+dfsg/debian/patches/0001-https-github.com-ImageMagick-ImageMagick6-issues-145.patch imagemagick-6.9.11.60+dfsg/debian/patches/0001-https-github.com-ImageMagick-ImageMagick6-issues-145.patch
--- imagemagick-6.9.11.60+dfsg/debian/patches/0001-https-github.com-ImageMagick-ImageMagick6-issues-145.patch 1970-01-01 01:00:00.000000000 +0100
+++ imagemagick-6.9.11.60+dfsg/debian/patches/0001-https-github.com-ImageMagick-ImageMagick6-issues-145.patch 2021-04-13 20:58:25.000000000 +0200
@@ -0,0 +1,32 @@
+From 650f0f7ecfaee42b3da89a04b92b05f27fe786e9 Mon Sep 17 00:00:00 2001
+From: Cristy <mikayla-grace@urban-warrior.org>
+Date: Sat, 10 Apr 2021 12:15:54 -0400
+Subject: [PATCH] https://github.com/ImageMagick/ImageMagick6/issues/145
+
+---
+ magick/annotate.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/magick/annotate.c b/magick/annotate.c
+index 29c8bbe74..20fbf7bb1 100644
+--- a/magick/annotate.c
++++ b/magick/annotate.c
+@@ -1484,6 +1484,15 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
+ metrics->pixels_per_em.y=face->size->metrics.y_ppem;
+ metrics->ascent=(double) face->size->metrics.ascender/64.0;
+ metrics->descent=(double) face->size->metrics.descender/64.0;
++ if (face->size->metrics.ascender == 0)
++ {
++ /*
++ Sanitize buggy ascender and descender values.
++ */
++ metrics->ascent=face->size->metrics.y_ppem;
++ if (face->size->metrics.descender == 0)
++ metrics->descent=face->size->metrics.y_ppem/-3.5;
++ }
+ metrics->width=0;
+ metrics->origin.x=0;
+ metrics->origin.y=0;
+--
+2.31.0
+
diff -Nru imagemagick-6.9.11.60+dfsg/debian/patches/series imagemagick-6.9.11.60+dfsg/debian/patches/series
--- imagemagick-6.9.11.60+dfsg/debian/patches/series 2021-02-01 17:20:25.000000000 +0100
+++ imagemagick-6.9.11.60+dfsg/debian/patches/series 2021-04-13 20:58:35.000000000 +0200
@@ -20,3 +20,4 @@
0020-Fix-a-typo-in-manpage.patch
0021-Finalize-fixing-error-in-html.patch
0022-FIx-error-in-new-upstream-html.patch
+0001-https-github.com-ImageMagick-ImageMagick6-issues-145.patch
Reply to: