From 13604697e46baeae4a59e61166d1d67db1a73380 Mon Sep 17 00:00:00 2001 From: Cristy 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 + * Support URW-base35 fonts. + 2017-09-23 6.9.9-15 Cristy * 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 @@ + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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} "'' + 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: