diff options
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | 147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch | 23 | ||||
| -rw-r--r-- | 86.patch | 44 | ||||
| -rw-r--r-- | ImageMagick6.spec | 12 |
4 files changed, 14 insertions, 77 deletions
@@ -1,3 +1,9 @@ -ImageMagick-*.tar.xz -ImageMagick6-*.src.rpm - +clog +package-*.xml +*.tgz +*.tar.bz2 +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch b/147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch deleted file mode 100644 index c2387ee..0000000 --- a/147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch +++ /dev/null @@ -1,23 +0,0 @@ -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/86.patch b/86.patch deleted file mode 100644 index 97b1507..0000000 --- a/86.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c99f35ad120aa9f8cc95f1262b4f5ecf8ef7598a Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 24 Jun 2020 11:06:47 +0200 -Subject: [PATCH] fix #85 regression in DrawSetTextInterlineSpacing - -revert 77849ee5a5f0481e0bfd67f72f6b7e07c5d2ba46 -revert 147e71502f8f08f986c35bb1387dc0e7543dbcb7 - -also fix https://github.com/ImageMagick/ImageMagick/issues/2178 ---- - magick/annotate.c | 7 ++----- - magick/draw.c | 1 + - 2 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/magick/annotate.c b/magick/annotate.c -index 32a08e767..89b06ba36 100644 ---- a/magick/annotate.c -+++ b/magick/annotate.c -@@ -324,11 +324,8 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, - (void) CloneString(&annotate->text,textlist[i]); - if ((metrics.width == 0) || (annotate->gravity != NorthWestGravity)) - (void) GetTypeMetrics(image,annotate,&metrics); -- height=(size_t) ceil(metrics.ascent-metrics.descent+ -- draw_info->interline_spacing-0.5); -- if (height == 0) -- height=(size_t) ceil(draw_info->pointsize+draw_info->interline_spacing- -- 0.5); -+ height=(ssize_t) (metrics.ascent-metrics.descent+ -+ draw_info->interline_spacing+0.5); - switch (annotate->gravity) - { - case UndefinedGravity: -diff --git a/magick/draw.c b/magick/draw.c -index 5950d6ff2..194a9ee27 100644 ---- a/magick/draw.c -+++ b/magick/draw.c -@@ -5781,6 +5781,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info) - draw_info->pointsize=12.0; - if (fabs(clone_info->pointsize) >= MagickEpsilon) - draw_info->pointsize=clone_info->pointsize; -+ draw_info->interline_spacing=draw_info->pointsize; - draw_info->undercolor.opacity=(Quantum) TransparentOpacity; - draw_info->border_color=clone_info->border_color; - draw_info->compose=OverCompositeOp; diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 8fe3f52..18d2bfc 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 6.9.11 -%global Patchlevel 21 +%global Patchlevel 22 %global incsuffixe -6 %global libsuffixe -6.Q16 %bcond_without tests @@ -71,16 +71,13 @@ Name: %{libname}6 %global move 1 %endif Version: %{VER}.%{Patchlevel} -Release: 3%{?dist} +Release: 1%{?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 -Patch1: https://patch-diff.githubusercontent.com/raw/ImageMagick/ImageMagick6/pull/86.patch - BuildRequires: gcc BuildRequires: gcc-c++ %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -382,8 +379,6 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} -%patch0 -p1 -%patch1 -p1 # for %%doc mkdir Magick++/examples @@ -642,6 +637,9 @@ fi %changelog +* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 6.9.11.22-1 +- update to version 6.9.11 patch level 22 + * Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 6.9.11.21-3 - add fix from https://github.com/ImageMagick/ImageMagick6/pull/86 |