rpms
/
ImageMagick
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 6.9.9-22

This commit is contained in:
Michael Cronenworth 2017-11-07 09:26:37 -06:00
parent 2bae7e647b
commit 145e7b231d
4 changed files with 6 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
/ImageMagick-6.9.9-19.tar.xz
/ImageMagick-6.9.9-22.tar.xz

248
ImageMagick-6.9.9-15-urw-fonts.patch
View File

@ -1,248 +0,0 @@
From 13604697e46baeae4a59e61166d1d67db1a73380 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 27 Sep 2017 16:36:33 -0400
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/782
---
ChangeLog | 3 +++
Makefile.in | 18 +++++++++-----
config/Makefile.am | 2 ++
config/type-urw-base35.xml.in | 50 +++++++++++++++++++++++++++++++++++++
-configure | 58 +++++++++++++++++++++++++++++++++++++++++--
configure.ac | 44 ++++++++++++++++++++++++++++++++
6 files changed, 167 insertions(+), 8 deletions(-)
create mode 100644 config/type-urw-base35.xml.in
diff --git a/ChangeLog b/ChangeLog
index 1cd60e59de..e78b0b027b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-09-28 6.9.9-16 Cristy <quetzlzacatenango@image...>
+ * Support URW-base35 fonts.
+
2017-09-23 6.9.9-15 Cristy <quetzlzacatenango@image...>
* Release ImageMagick version 6.9.9-15, GIT revision 12079:839a14e43:20170923.
diff --git a/Makefile.in b/Makefile.in
index 885289d095..2ebc4b02b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -301,12 +301,12 @@ CONFIG_CLEAN_FILES = common.shi config/configure.xml \
config/MagickCore.dox config/MagickWand.dox \
config/Magick++.dox config/type-apple.xml \
config/type-dejavu.xml config/type-ghostscript.xml \
- config/type-windows.xml config/type.xml ImageMagick.spec \
- Magick++/bin/Magick++-config magick/ImageMagick.pc \
- Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \
- magick/Magick-config magick/MagickCore-config \
- magick/MagickCore.pc magick/version.h magick.sh \
- PerlMagick/check.sh PerlMagick/default/Magick.pm \
+ config/type-urw-base35.xml config/type-windows.xml \
+ config/type.xml ImageMagick.spec Magick++/bin/Magick++-config \
+ magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc \
+ Magick++/lib/Magick++.pc magick/Magick-config \
+ magick/MagickCore-config magick/MagickCore.pc magick/version.h \
+ magick.sh PerlMagick/check.sh PerlMagick/default/Magick.pm \
PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL \
PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm \
PerlMagick/quantum/quantum.xs PerlMagick/quantum/typemap \
@@ -2510,6 +2510,7 @@ am__DIST_COMMON = $(srcdir)/ImageMagick.spec.in \
$(top_srcdir)/config/type-apple.xml.in \
$(top_srcdir)/config/type-dejavu.xml.in \
$(top_srcdir)/config/type-ghostscript.xml.in \
+ $(top_srcdir)/config/type-urw-base35.xml.in \
$(top_srcdir)/config/type-windows.xml.in \
$(top_srcdir)/config/type.xml.in \
$(top_srcdir)/magick/ImageMagick.pc.in \
@@ -2958,6 +2959,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
type_include_files = @type_include_files@
+urw_base35_font_dir = @urw_base35_font_dir@
windows_font_dir = @windows_font_dir@
topincludedir = @includedir@/magick
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
@@ -3107,6 +3109,7 @@ configlib_DATA = \
config/type-apple.xml \
config/type-dejavu.xml \
config/type-ghostscript.xml \
+ config/type-urw-base35.xml \
config/type-windows.xml
CONFIG_EXTRA_DIST = \
@@ -3131,6 +3134,7 @@ CONFIG_EXTRA_DIST = \
config/type-apple.xml.in \
config/type-dejavu.xml.in \
config/type-ghostscript.xml.in \
+ config/type-urw-base35.xml.in \
config/type-windows.xml.in \
config/type.xml.in
@@ -5304,6 +5308,8 @@ config/type-dejavu.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-
cd $(top_builddir) && $(SHELL) ./config.status $@
config/type-ghostscript.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-ghostscript.xml.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+config/type-urw-base35.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-urw-base35.xml.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
config/type-windows.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-windows.xml.in
cd $(top_builddir) && $(SHELL) ./config.status $@
config/type.xml: $(top_builddir)/config.status $(top_srcdir)/config/type.xml.in
diff --git a/config/Makefile.am b/config/Makefile.am
index 342c9710bb..78953df417 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -45,6 +45,7 @@ configlib_DATA = \
config/type-apple.xml \
config/type-dejavu.xml \
config/type-ghostscript.xml \
+ config/type-urw-base35.xml \
config/type-windows.xml
CONFIG_EXTRA_DIST = \
@@ -69,5 +70,6 @@ CONFIG_EXTRA_DIST = \
config/type-apple.xml.in \
config/type-dejavu.xml.in \
config/type-ghostscript.xml.in \
+ config/type-urw-base35.xml.in \
config/type-windows.xml.in \
config/type.xml.in
diff --git a/config/type-urw-base35.xml.in b/config/type-urw-base35.xml.in
new file mode 100644
index 0000000000..993613ef01
--- /dev/null
+++ b/config/type-urw-base35.xml.in
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE typemap [
+ <!ELEMENT typemap (type)+>
+ <!ATTLIST typemap xmlns CDATA #FIXED ''>
+ <!ELEMENT type EMPTY>
+ <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+ family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+ fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+ name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+ version CDATA #IMPLIED weight CDATA #REQUIRED>
+]>
+<!--
+ ImageMagick URW-base35 font configuration.
+-->
+<typemap>
+ <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWGothic-Book.afm" glyphs="@urw_base35_font_dir@URWGothic-Book.t1"/>
+ <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWGothic-BookOblique.afm" glyphs="@urw_base35_font_dir@URWGothic-BookOblique.t1"/>
+ <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWGothic-Demi.afm" glyphs="@urw_base35_font_dir@URWGothic-Demi.t1"/>
+ <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWGothic-DemiOblique.afm" glyphs="@urw_base35_font_dir@URWGothic-DemiOblique.t1"/>
+ <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWBookman-Demi.afm" glyphs="@urw_base35_font_dir@URWBookman-Demi.t1"/>
+ <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWBookman-DemiItalic.afm" glyphs="@urw_base35_font_dir@URWBookman-DemiItalic.t1"/>
+ <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWBookman-Light.afm" glyphs="@urw_base35_font_dir@URWBookman-Light.t1"/>
+ <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWBookman-LightItalic.afm" glyphs="@urw_base35_font_dir@URWBookman-LightItalic.t1"/>
+ <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusMonoPS-Refular.afm" glyphs="@urw_base35_font_dir@NimbusMonoPS-Regular.t1"/>
+ <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusMonoPS-Bold.afm" glyphs="@urw_base35_font_dir@NimbusMonoPS-Bold.t1"/>
+ <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusMonoPS-Italic.afm" glyphs="@urw_base35_font_dir@NimbusMonoPS-Italic.t1"/>
+ <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusMonoPS-BoldItalic.afm" glyphs="@urw_base35_font_dir@NimbusMonoPS-BoldItalic.t1"/>
+ <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-Regular.afm" glyphs="@urw_base35_font_dir@NimbusSans-Regular.t1"/>
+ <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-Regular.afm" glyphs="@urw_base35_font_dir@NimbusSans-Regular.t1"/>
+ <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-Bold.afm" glyphs="@urw_base35_font_dir@NimbusSans-Bold.t1"/>
+ <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-Italic.afm" glyphs="@urw_base35_font_dir@NimbusSans-Italic.t1"/>
+ <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-BoldItalic.afm" glyphs="@urw_base35_font_dir@NimbusSans-BoldItalic.t1"/>
+ <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="type1" metrics="@urw_base35_font_dir@NimbusSansNarrow-Regular.afm" glyphs="@urw_base35_font_dir@NimbusSansNarrow-Regular.t1"/>
+ <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="type1" metrics="@urw_base35_font_dir@NimbusSansNarrow-Oblique.afm" glyphs="@urw_base35_font_dir@NimbusSansNarrow-Oblique.t1"/>
+ <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="type1" metrics="@urw_base35_font_dir@NimbusSansNarrow-Bold.afm" glyphs="@urw_base35_font_dir@NimbusSansNarrow-Bold.t1"/>
+ <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="type1" metrics="@urw_base35_font_dir@nNimbusSansNarrow-BdOblique.afm" glyphs="@urw_base35_font_dir@NimbusSansNarrow-BdOblique.t1"/>
+ <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@C059-Roman.afm" glyphs="@urw_base35_font_dir@C059-Roman.t1"/>
+ <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@C059-Italic.afm" glyphs="@urw_base35_font_dir@C059-Italic.t1"/>
+ <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@C059-Bold.afm" glyphs="@urw_base35_font_dir@C059-Bold.t1"/>
+ <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@C059-BdIta.afm" glyphs="@urw_base35_font_dir@C059-BdIta.t1"/>
+ <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@P052-Roman.afm" glyphs="@urw_base35_font_dir@P052-Roman.t1"/>
+ <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@P052-Italic.afm" glyphs="@urw_base35_font_dir@P052-Italic.t1"/>
+ <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@P052-Bold.afm" glyphs="@urw_base35_font_dir@P052-Bold.t1"/>
+ <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@P052-BoldItalic.afm" glyphs="@urw_base35_font_dir@P052-BoldItalic.t1"/>
+ <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusRoman-Regular.afm" glyphs="@urw_base35_font_dir@NimbusRoman-Regular.t1"/>
+ <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusRoman-Bold.afm" glyphs="@urw_base35_font_dir@NimbusRoman-Bold.t1"/>
+ <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusRoman-Italic.afm" glyphs="@urw_base35_font_dir@NimbusRoman-Italic.t1"/>
+ <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusRoman-BoldItalic.afm" glyphs="@urw_base35_font_dir@NimbusRoman-BoldItalic.t1"/>
+ <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@StandardSymbolsPS.afm" glyphs="@urw_base35_font_dir@StandardSymbolsPS.t1" version="2.0" encoding="AdobeCustom"/>
+</typemap>
diff --git a/configure.ac b/configure.ac
index 0ce59c6da8..a8fb752919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2728,6 +2728,22 @@ AC_SUBST(TIFF_LIBS)
dnl ===========================================================================
#
+# Set URW Base35 font directory.
+#
+AC_ARG_WITH([urw-base35-font-dir],
+ [AC_HELP_STRING([--with-urw-base35-font-dir=DIR],
+ [URW-base35 font directory])],
+ [with_urw_base35_font_dir=$withval],
+ [with_urw_base35_font_dir='default'])
+
+if test "$with_urw_base35_font_dir" != 'default'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-urw-base35-font-dir=$with_urw_base35_font_dir "
+fi
+
+
+dnl ===========================================================================
+
+#
# Check for WEBP delegate library.
#
AC_ARG_WITH(webp,
@@ -3274,6 +3290,27 @@ case "${build_os}" in
;;
esac
+# URW-base35 fonts.
+AC_MSG_CHECKING(for URW-base35 fonts directory)
+urw_base35_font_dir=''
+if test "${with_urw_base35_font_dir}" != 'default'; then
+ urw_base35_font_dir="${with_urw_base35_font_dir}/"
+else
+ for font_dir in "${prefix}/share/urw-base35/fonts/" '/usr/share/fonts/urw-base35/'; do
+ if test -f "${font_dir}StandardSymbolsPS.t1"; then
+ urw_base35_font_dir="${font_dir}"
+ break 1
+ fi
+ done
+fi
+if test "${urw_base35_font_dir}x" != 'x'; then
+ type_include_files="${type_include_files} "'<include file="type-urw-base35.xml" />'
+ AC_MSG_RESULT([$urw_base35_font_dir])
+else
+ AC_MSG_RESULT([not found!]);
+fi
+AC_SUBST(urw_base35_font_dir)
+
# Windows fonts.
AC_MSG_CHECKING(for Windows fonts directory)
windows_font_dir=''
@@ -3856,6 +3893,11 @@ if test "${ghostscript_font_dir}x" != 'x'; then
result_ghostscript_font_dir=$ghostscript_font_dir
fi
+result_urw_base35_font_dir='none'
+if test "${urw_base35_font_dir}x" != 'x'; then
+ result_urw_base35_font_dir=$urw_base35_font_dir
+fi
+
result_windows_font_dir='none'
if test "${windows_font_dir}x" != 'x'; then
result_windows_font_dir=${windows_font_dir}
@@ -3875,6 +3917,7 @@ AC_CONFIG_FILES([\
config/type-apple.xml \
config/type-dejavu.xml \
config/type-ghostscript.xml \
+ config/type-urw-base35.xml \
config/type-windows.xml \
config/type.xml \
ImageMagick.spec \
@@ -3979,6 +4022,7 @@ matches your expectations.
Apple fonts --with-apple-font-dir=$with_apple_font_dir $result_apple_font_dir
Dejavu fonts --with-dejavu-font-dir=$with_dejavu_font_dir $result_dejavu_font_dir
Ghostscript fonts --with-gs-font-dir=$with_gs_font_dir $result_ghostscript_font_dir
+ URW-base35 fonts --with-urw-base35-font-dir=$with_urw_base35_font_dir $result_urw_base35_font_dir
Windows fonts --with-windows-font-dir=$with_windows_font_dir $result_windows_font_dir
X11 Configuration:

5
ImageMagick.spec
View File

@ -1,5 +1,5 @@
%global VER 6.9.9
%global Patchlevel 19
%global Patchlevel 22
Name: ImageMagick
%if 0%{?fedora} >= 27
@ -315,6 +315,9 @@ make %{?_smp_mflags} check
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
* Tue Nov 07 2017 Michael Cronenworth <mike@cchtml.com> - 1:6.9.9.22-1
- Update to 6.9.9-22
* Wed Oct 11 2017 Michael Cronenworth <mike@cchtml.com> - 1:6.9.9.19-1
- Update to 6.9.9-19

2
sources
View File

@ -1 +1 @@
SHA512 (ImageMagick-6.9.9-19.tar.xz) = f73efdd4fab52ba90d4ab13626ff153ca74a7134090f199f1618fef172c537132bd27b243ea40640bcb83e2d2a4c19edd1af83c752722ca2a2d20526fbd6cc34
SHA512 (ImageMagick-6.9.9-22.tar.xz) = 960f854246c4a58ca4c85fd5f6e74c15b8296371e1dceb80b1390db351e929653702cbb634ad176fd8321b6bb97018833278097319e15421990be96a3f74de66