check Ubuntu URW font path

ImageMagick · Sep 16, 2024 · 06a2806 · 06a2806
1 parent 7875b24
commit 06a2806
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/configure b/configure
@@ -5143,7 +5143,7 @@ MAGICK_PATCHLEVEL_VERSION=17
 
 MAGICK_VERSION=6.9.13-17
 
-MAGICK_GIT_REVISION=27250f437:20240915
+MAGICK_GIT_REVISION=7875b2453:20240915
 
 
 # Substitute library versioning
@@ -36385,8 +36385,8 @@ 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/' '/usr/share/fonts/type1/urw-base35/'; do
-    if test -f "${font_dir}StandardSymbolsPS.t1"; then
+  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
+    if test -f "${font_dir}URWGothic-Book.otf"; then
       urw_base35_font_dir="${font_dir}"
       break 1
     fi

diff --git a/configure.ac b/configure.ac
@@ -3322,8 +3322,8 @@ 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/' '/usr/share/fonts/type1/urw-base35/'; do
-    if test -f "${font_dir}StandardSymbolsPS.t1"; then
+  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
+    if test -f "${font_dir}URWGothic-Book.otf"; then
       urw_base35_font_dir="${font_dir}"
       break 1
     fi