diff options
| author | Remi Collet <remi@remirepo.net> | 2020-06-24 09:30:10 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-06-24 09:30:10 +0200 |
| commit | e06e600c217b884d89bf2f12560103082a922dba (patch) | |
| tree | 407a70ecfe46a684e184952813fd447da55d1f67 | |
| parent | 1d1757f2fda673cad7c4b1afabfac969e8e5fdc5 (diff) | |
test build for upstream fix
| -rw-r--r-- | 147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch | 23 | ||||
| -rw-r--r-- | ImageMagick6.spec | 8 |
2 files changed, 30 insertions, 1 deletions
diff --git a/147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch b/147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch new file mode 100644 index 0000000..c2387ee --- /dev/null +++ b/147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch @@ -0,0 +1,23 @@ +From 147e71502f8f08f986c35bb1387dc0e7543dbcb7 Mon Sep 17 00:00:00 2001 +From: Cristy <mikayla-grace@urban-warrior.org> +Date: Tue, 23 Jun 2020 19:53:43 -0400 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick6/issues/85 + +--- + magick/annotate.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/magick/annotate.c b/magick/annotate.c +index 663a3c4cc..32a08e767 100644 +--- a/magick/annotate.c ++++ b/magick/annotate.c +@@ -327,7 +327,8 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, + height=(size_t) ceil(metrics.ascent-metrics.descent+ + draw_info->interline_spacing-0.5); + if (height == 0) +- height=(size_t) draw_info->pointsize; ++ height=(size_t) ceil(draw_info->pointsize+draw_info->interline_spacing- ++ 0.5); + switch (annotate->gravity) + { + case UndefinedGravity: diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 4b79b0d..3a28c6e 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -71,13 +71,15 @@ Name: %{libname}6 %global move 1 %endif Version: %{VER}.%{Patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An X application for displaying and manipulating images License: ImageMagick Url: http://www.imagemagick.org/ #Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz Source0: https://www.imagemagick.org/download/ImageMagick-%{VER}-%{Patchlevel}.tar.xz +Patch0: https://github.com/ImageMagick/ImageMagick6/commit/147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch + BuildRequires: gcc BuildRequires: gcc-c++ %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -379,6 +381,7 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} +%patch0 -p1 # for %%doc mkdir Magick++/examples @@ -637,6 +640,9 @@ fi %changelog +* Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 6.9.11.21-2 +- test build for upstream fix + * Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 6.9.11.21-1 - update to version 6.9.11 patch level 21 still affected by https://github.com/ImageMagick/ImageMagick6/issues/85 |