search type1 folder for type1 fonts

ImageMagick · Nov 4, 2024 · 188dff1 · 188dff1
1 parent 461ae22
commit 188dff1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/configure b/configure
@@ -5202,7 +5202,7 @@ MAGICK_PATCHLEVEL_VERSION=18
 
 MAGICK_VERSION=6.9.13-18
 
-MAGICK_GIT_REVISION=579a80e2e:20241103
+MAGICK_GIT_REVISION=461ae2232:20241103
 
 
 # Substitute library versioning
@@ -37369,7 +37369,7 @@ 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/" "${prefix}/share/fonts/opentype/urw-base35" '/usr/share/fonts/urw-base35/' '/usr/share/fonts/opentype/urw-base35/' '/usr/share/fonts/type1/urw-base35/'; do
+  for font_dir in "${prefix}/share/urw-base35/fonts/" "${prefix}/share/fonts/opentype/urw-base35" '/usr/share/fonts/urw-base35/' '/usr/share/fonts/opentype/urw-base35/'; do
     if test -f "${font_dir}URWGothic-Book.otf"; then
       urw_base35_font_dir="${font_dir}"
       break 1
@@ -37393,7 +37393,7 @@ urw_base35_type1_font_dir=''
 if test "${with_urw_base35_type1_font_dir}" != 'default'; then
   urw_base35_type1_font_dir="${with_urw_base35_type1_font_dir}/"
 else
-  for font_dir in "${prefix}/share/urw-base35/fonts/" "${prefix}/share/fonts/opentype/urw-base35" '/usr/share/fonts/urw-base35/' '/usr/share/fonts/opentype/urw-base35/' '/usr/share/fonts/type1/urw-base35/'; do
+  for font_dir in "${prefix}/share/urw-base35/fonts/" "${prefix}/share/fonts/type1/urw-base35" '/usr/share/fonts/urw-base35/' '/usr/share/fonts/type1/urw-base35/'; do
     if test -f "${font_dir}URWGothic-Book.t1"; then
       urw_base35_type1_font_dir="${font_dir}"
       break 1

diff --git a/configure.ac b/configure.ac
@@ -3337,7 +3337,7 @@ 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/" "${prefix}/share/fonts/opentype/urw-base35" '/usr/share/fonts/urw-base35/' '/usr/share/fonts/opentype/urw-base35/' '/usr/share/fonts/type1/urw-base35/'; do
+  for font_dir in "${prefix}/share/urw-base35/fonts/" "${prefix}/share/fonts/opentype/urw-base35" '/usr/share/fonts/urw-base35/' '/usr/share/fonts/opentype/urw-base35/'; do
     if test -f "${font_dir}URWGothic-Book.otf"; then
       urw_base35_font_dir="${font_dir}"
       break 1
@@ -3358,7 +3358,7 @@ urw_base35_type1_font_dir=''
 if test "${with_urw_base35_type1_font_dir}" != 'default'; then
   urw_base35_type1_font_dir="${with_urw_base35_type1_font_dir}/"
 else
-  for font_dir in "${prefix}/share/urw-base35/fonts/" "${prefix}/share/fonts/opentype/urw-base35" '/usr/share/fonts/urw-base35/' '/usr/share/fonts/opentype/urw-base35/' '/usr/share/fonts/type1/urw-base35/'; do
+  for font_dir in "${prefix}/share/urw-base35/fonts/" "${prefix}/share/fonts/type1/urw-base35" '/usr/share/fonts/urw-base35/' '/usr/share/fonts/type1/urw-base35/'; do
     if test -f "${font_dir}URWGothic-Book.t1"; then
       urw_base35_type1_font_dir="${font_dir}"
       break 1