fontconfig: update to 2.15.0 & drop 32 bit

Andreas Wacknitz

2023-12-24 3659d28a98e35debbfa9677af949ed59607cc0a1

fontconfig: update to 2.15.0 & drop 32 bit

 components/library/fontconfig/Makefile

@@ -13,18 +13,16 @@
# Copyright 2015 Alexander Pyhalov
#

BUILD_BITS= 32_and_64
USE_COMMON_TEST_MASTER= no
BUILD_BITS= 64
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        fontconfig
COMPONENT_REVISION=    2
COMPONENT_VERSION=    2.14.2
COMPONENT_VERSION=    2.15.0
COMPONENT_SUMMARY=    Fontconfig - Font configuration and customization library
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= sha256:dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
COMPONENT_ARCHIVE_HASH= sha256:63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e
COMPONENT_PROJECT_URL=    https://www.freedesktop.org/wiki/Software/fontconfig/
COMPONENT_ARCHIVE_URL=     https://www.freedesktop.org/software/fontconfig/release/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=        system/library/$(COMPONENT_NAME)
@@ -36,21 +34,19 @@

PATH= $(PATH.gnu)

gcc_OPT= -O2

COMPONENT_PREP_ACTION=  ( cd $(@D); autoreconf )

# Gperf files should be regenerated
# https://bugs.freedesktop.org/show_bug.cgi?id=101280
COMPONENT_PRE_CONFIGURE_ACTION= ($(RM) $(SOURCE_DIR)/src/fcobjshash.h)
COMPONENT_PRE_CONFIGURE_ACTION= ( $(RM) $(SOURCE_DIR)/src/fcobjshash.h )

CONFIGURE_OPTIONS+= --sysconfdir=$(ETCDIR)
CONFIGURE_OPTIONS+= --with-baseconfigdir=$(ETCDIR)/fonts
CONFIGURE_OPTIONS+= --with-default-fonts='/usr/share/fonts'
CONFIGURE_OPTIONS+= --with-add-fonts='/etc/X11/fontpath.d,/usr/share/ghostscript/fonts,/usr/X11/lib/X11/fonts'
CONFIGURE_OPTIONS+= --with-cache-dir=/var/cache/fontconfig
CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
CONFIGURE_OPTIONS += --with-baseconfigdir=$(ETCDIR)/fonts
CONFIGURE_OPTIONS += --with-default-fonts='/usr/share/fonts'
CONFIGURE_OPTIONS += --with-add-fonts='/etc/X11/fontpath.d,/usr/share/ghostscript/fonts,/usr/X11/lib/X11/fonts'
CONFIGURE_OPTIONS += --with-cache-dir=/var/cache/fontconfig

$(BUILD_DIR)/.fonts_installed: $(INSTALL_32_and_64)
$(BUILD_DIR)/.fonts_installed:    $(INSTALL_64)
    $(RM) -r $(PROTO_DIR)/etc/fonts/conf.d 
    $(RM) -r $(PROTO_DIR)/etc/fonts/conf.avail
    $(MKDIR) $(PROTO_DIR)/etc/fonts/conf.d
@@ -60,7 +56,7 @@
    done
    $(TOUCH) $@

install:    $(INSTALL_32_and_64) $(BUILD_DIR)/.fonts_installed
install:    $(INSTALL_64) $(BUILD_DIR)/.fonts_installed

# This is necessary to pass tests
unexport SHELLOPTS
@@ -69,8 +65,8 @@
REQUIRED_PACKAGES += developer/gperf

# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += library/expat
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/freetype-2

 components/library/fontconfig/fontconfig.p5m

@@ -62,6 +62,7 @@
file path=etc/fonts/conf.avail/11-lcdfilter-default.conf
file path=etc/fonts/conf.avail/11-lcdfilter-legacy.conf
file path=etc/fonts/conf.avail/11-lcdfilter-light.conf
file path=etc/fonts/conf.avail/11-lcdfilter-none.conf
file path=etc/fonts/conf.avail/20-unhint-small-vera.conf
file path=etc/fonts/conf.avail/25-unhint-nonlatin.conf
file path=etc/fonts/conf.avail/30-metric-aliases.conf
@@ -121,6 +122,8 @@
    target=../conf.avail/11-lcdfilter-legacy.conf
link path=etc/fonts/conf.d/11-lcdfilter-light.conf \
    target=../conf.avail/11-lcdfilter-light.conf
link path=etc/fonts/conf.d/11-lcdfilter-none.conf \
    target=../conf.avail/11-lcdfilter-none.conf
link path=etc/fonts/conf.d/20-unhint-small-vera.conf \
    target=../conf.avail/20-unhint-small-vera.conf
link path=etc/fonts/conf.d/25-unhint-nonlatin.conf \
@@ -155,16 +158,6 @@
link path=etc/fonts/conf.d/90-synthetic.conf \
    target=../conf.avail/90-synthetic.conf
file path=etc/fonts/fonts.conf
file path=etc/fonts/fonts.conf.bak
file path=usr/bin/$(MACH64)/fc-cache
file path=usr/bin/$(MACH64)/fc-cat
file path=usr/bin/$(MACH64)/fc-conflist
file path=usr/bin/$(MACH64)/fc-list
file path=usr/bin/$(MACH64)/fc-match
file path=usr/bin/$(MACH64)/fc-pattern
file path=usr/bin/$(MACH64)/fc-query
file path=usr/bin/$(MACH64)/fc-scan
file path=usr/bin/$(MACH64)/fc-validate
file path=usr/bin/fc-cache
file path=usr/bin/fc-cat
file path=usr/bin/fc-conflist
@@ -177,14 +170,10 @@
file path=usr/include/fontconfig/fcfreetype.h
file path=usr/include/fontconfig/fcprivate.h
file path=usr/include/fontconfig/fontconfig.h
link path=usr/lib/$(MACH64)/libfontconfig.so target=libfontconfig.so.1.12.0
link path=usr/lib/$(MACH64)/libfontconfig.so.1 target=libfontconfig.so.1.12.0
file path=usr/lib/$(MACH64)/libfontconfig.so.1.12.0
link path=usr/lib/$(MACH64)/libfontconfig.so target=libfontconfig.so.1.12.1
link path=usr/lib/$(MACH64)/libfontconfig.so.1 target=libfontconfig.so.1.12.1
file path=usr/lib/$(MACH64)/libfontconfig.so.1.12.1
file path=usr/lib/$(MACH64)/pkgconfig/fontconfig.pc
link path=usr/lib/libfontconfig.so target=libfontconfig.so.1.12.0
link path=usr/lib/libfontconfig.so.1 target=libfontconfig.so.1.12.0
file path=usr/lib/libfontconfig.so.1.12.0
file path=usr/lib/pkgconfig/fontconfig.pc
file path=usr/share/doc/fontconfig/fontconfig-devel.pdf
file path=usr/share/doc/fontconfig/fontconfig-devel.txt
file path=usr/share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html

 components/library/fontconfig/manifests/sample-manifest.p5m

@@ -42,6 +42,7 @@
file path=etc/fonts/conf.avail/11-lcdfilter-default.conf
file path=etc/fonts/conf.avail/11-lcdfilter-legacy.conf
file path=etc/fonts/conf.avail/11-lcdfilter-light.conf
file path=etc/fonts/conf.avail/11-lcdfilter-none.conf
file path=etc/fonts/conf.avail/20-unhint-small-vera.conf
file path=etc/fonts/conf.avail/25-unhint-nonlatin.conf
file path=etc/fonts/conf.avail/30-metric-aliases.conf
@@ -101,6 +102,8 @@
    target=../conf.avail/11-lcdfilter-legacy.conf
link path=etc/fonts/conf.d/11-lcdfilter-light.conf \
    target=../conf.avail/11-lcdfilter-light.conf
link path=etc/fonts/conf.d/11-lcdfilter-none.conf \
    target=../conf.avail/11-lcdfilter-none.conf
link path=etc/fonts/conf.d/20-unhint-small-vera.conf \
    target=../conf.avail/20-unhint-small-vera.conf
link path=etc/fonts/conf.d/25-unhint-nonlatin.conf \
@@ -135,16 +138,6 @@
link path=etc/fonts/conf.d/90-synthetic.conf \
    target=../conf.avail/90-synthetic.conf
file path=etc/fonts/fonts.conf
file path=etc/fonts/fonts.conf.bak
file path=usr/bin/$(MACH64)/fc-cache
file path=usr/bin/$(MACH64)/fc-cat
file path=usr/bin/$(MACH64)/fc-conflist
file path=usr/bin/$(MACH64)/fc-list
file path=usr/bin/$(MACH64)/fc-match
file path=usr/bin/$(MACH64)/fc-pattern
file path=usr/bin/$(MACH64)/fc-query
file path=usr/bin/$(MACH64)/fc-scan
file path=usr/bin/$(MACH64)/fc-validate
file path=usr/bin/fc-cache
file path=usr/bin/fc-cat
file path=usr/bin/fc-conflist
@@ -157,14 +150,10 @@
file path=usr/include/fontconfig/fcfreetype.h
file path=usr/include/fontconfig/fcprivate.h
file path=usr/include/fontconfig/fontconfig.h
link path=usr/lib/$(MACH64)/libfontconfig.so target=libfontconfig.so.1.12.0
link path=usr/lib/$(MACH64)/libfontconfig.so.1 target=libfontconfig.so.1.12.0
file path=usr/lib/$(MACH64)/libfontconfig.so.1.12.0
link path=usr/lib/$(MACH64)/libfontconfig.so target=libfontconfig.so.1.12.1
link path=usr/lib/$(MACH64)/libfontconfig.so.1 target=libfontconfig.so.1.12.1
file path=usr/lib/$(MACH64)/libfontconfig.so.1.12.1
file path=usr/lib/$(MACH64)/pkgconfig/fontconfig.pc
link path=usr/lib/libfontconfig.so target=libfontconfig.so.1.12.0
link path=usr/lib/libfontconfig.so.1 target=libfontconfig.so.1.12.0
file path=usr/lib/libfontconfig.so.1.12.0
file path=usr/lib/pkgconfig/fontconfig.pc
file path=usr/share/doc/fontconfig/fontconfig-devel.pdf
file path=usr/share/doc/fontconfig/fontconfig-devel.txt
file path=usr/share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html

 components/library/fontconfig/patches/02.cjk-fonts.conf.patch

@@ -1,144 +1,6 @@
--- fontconfig-2.13.0/conf.d/40-nonlatin.conf.orig    2018-03-08 16:55:27.730705343 +0000
+++ fontconfig-2.13.0/conf.d/40-nonlatin.conf    2018-03-08 16:55:35.234804245 +0000
@@ -47,6 +47,46 @@
         <default><family>serif</family></default>
     </alias>
     <alias>
+        <family>HG-PMinchoL-Sun</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
+        <family>Sun-Michou</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
+        <family>HG-MinchoL-Sun</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
+        <family>IPAPMincho</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
+        <family>IPAMincho</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
+        <family>FZSongTi</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
+        <family>FZMingTi</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
+        <family>KacstQurn</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
+        <family>SunDotum</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
+        <family>AR PL ShanHeiSun Uni</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
         <family>Kochi Mincho</family>
         <default><family>serif</family></default>
     </alias>
@@ -134,6 +174,42 @@
         <default><family>sans-serif</family></default>
     </alias>
     <alias>
+        <family>HG-PGothicB-Sun</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
+        <family>HG-GothicB-Sun</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
+        <family>Sun-Gothic</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
+        <family>IPAPGothic</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
+        <family>IPAGothic</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
+        <family>FZSongTi</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
+        <family>FZMingTi</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
+        <family>KacstQurn</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
+        <family>SunDotum</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
         <family>Kochi Gothic</family>
         <default><family>sans-serif</family></default>
     </alias>
@@ -185,6 +261,10 @@
   Monospace faces
  -->
     <alias>
+        <family>SunDotumChe</family>
+        <default><family>monospace</family></default>
+    </alias>
+    <alias>
         <family>NSimSun</family>
         <default><family>monospace</family></default>
     </alias>
--- fontconfig-2.13.0/conf.d/45-latin.conf.orig    2018-03-08 17:02:42.600777927 +0000
+++ fontconfig-2.13.0/conf.d/45-latin.conf    2018-03-08 17:05:59.840860521 +0000
@@ -47,6 +47,10 @@
         <default><family>serif</family></default>
     </alias>
     <alias>
+        <family>Lucida Bright</family>
+        <default><family>serif</family></default>
+    </alias>
+    <alias>
         <family>Luxi Serif</family>
         <default><family>serif</family></default>
     </alias>
@@ -154,6 +158,10 @@
         <default><family>sans-serif</family></default>
     </alias>
     <alias>
+        <family>Lucida Sans</family>
+        <default><family>sans-serif</family></default>
+    </alias>
+    <alias>
         <family>Luxi Sans</family>
         <default><family>sans-serif</family></default>
     </alias>
@@ -221,6 +229,10 @@
         <default><family>monospace</family></default>
     </alias>
     <alias>
+        <family>Lucida Sans Typewriter</family>
+        <default><family>monospace</family></default>
+    </alias>
+    <alias>
         <family>Luxi Mono</family>
         <default><family>monospace</family></default>
     </alias>
--- fontconfig-2.13.0/conf.d/65-nonlatin.conf.orig    2018-03-08 16:55:20.033418903 +0000
+++ fontconfig-2.13.0/conf.d/65-nonlatin.conf    2018-03-08 16:55:43.090947768 +0000
@@ -9,6 +9,7 @@
--- fontconfig-2.15.0/conf.d/65-nonlatin.conf.orig    2023-03-22 12:36:46.000000000 +0100
+++ fontconfig-2.15.0/conf.d/65-nonlatin.conf    2023-12-23 19:23:31.705731975 +0100
@@ -5,6 +5,7 @@
     <alias>
         <family>serif</family>
         <prefer>
@@ -146,7 +8,7 @@
             <family>Artsounk</family> <!-- armenian -->
             <family>BPG UTF8 M</family> <!-- georgian -->
             <family>Kinnari</family> <!-- thai -->
@@ -31,17 +32,24 @@
@@ -27,10 +28,6 @@
             <family>MS Mincho</family> <!-- han (ja) -->
             <family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
             <family>PMingLiu</family> <!-- han (zh-tw) -->
@@ -156,31 +18,35 @@
-            <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
             <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
             <family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
             <family>Hiragino Mincho ProN</family> <!-- han (ja) - macOS -->
@@ -38,10 +35,19 @@
             <family>Songti TC</family> <!-- han (zh-tw) - macOS -->
             <family>SimSong</family> <!-- han (zh-cn) - macOS -->
             <family>MgOpen Canonica</family>
-            <family>Sazanami Mincho</family>
+            <family>HG-PMinchoL-Sun</family>
+            <family>HG-MinchoL-Sun</family>
+            <family>Sun-Minchou</family>
+            <family>HG-PMinchoL-Sun</family>
+            <family>HG-MinchoL-Sun</family>
             <family>IPAMonaMincho</family>
+            <family>IPAPMincho</family>
             <family>IPAMincho</family>
-            <family>Kochi Mincho</family>
+            <family>Sazanami Mincho</family>
+            <family>Sazanami Gothic</family>
+            <family>FZSongTi</family>
+            <family>FZMingTi</family>
+            <family>KacstQurn</family>
+            <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+            <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+            <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+            <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+            <family>Sazanami Mincho</family>
+            <family>Sazanami Gothic</family>
+            <family>FZSongTi</family>
+            <family>FZMingTi</family>
+            <family>KacstQurn</family>
+            <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+            <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+            <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+            <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
             <family>AR PL SungtiL GB</family>
             <family>AR PL Mingti2L Big5</family>
              <family>AR PL Zenkai Uni</family>
@@ -69,11 +77,14 @@
@@ -69,12 +75,15 @@
              <family>Lohit Kannada</family>
              <family>Lohit Telugu</family>
              <family>Lohit Oriya</family>
              <family>LKLUG</family>
-             <family>LKLUG</family>
+            <family>LKLUG</family>
+            <family>SunDotum</family>
+            <family>Gothic</family>
         </prefer>
@@ -192,17 +58,45 @@
             <family>Nachlieli</family> <!-- hebrew -->
             <family>Lucida Sans Unicode</family>
             <family>Yudit Unicode</family>
@@ -109,6 +120,9 @@
             <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
@@ -104,10 +113,6 @@
             <family>UmePlus P Gothic</family> <!-- han (ja) -->
             <family>Microsoft YaHei</family> <!-- han (zh-cn,zh-tw) -->
             <family>Microsoft JhengHei</family> <!-- han (zh-tw) -->
-            <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
-            <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
-            <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
-            <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
             <family>Hiragino Sans</family> <!-- han (ja) - macOS -->
             <family>PingFang SC</family> <!-- han (zh-cn) - macOS -->
             <family>PingFang TC</family> <!-- han (zh-tw) - macOS -->
@@ -115,14 +120,22 @@
             <family>Hiragino Sans CNS</family> <!-- han (zh-cn) - macOS -->
             <family>Hiragino Sans GB</family> <!-- han (zh-tw) - macOS -->
             <family>MgOpen Modata</family>
             <family>VL Gothic</family>
+             <family>HG-PGothicB-Sun</family>
+             <family>HG-GothicB-Sun</family>
+            <family>Sun-Gothic</family>
             <family>IPAMonaGothic</family>
-            <family>VL Gothic</family>
-            <family>IPAMonaGothic</family>
+            <family>VL Gothic</family>
+            <family>HG-PGothicB-Sun</family>
+            <family>HG-GothicB-Sun</family>
+            <family>IPAMonaGothic</family>
+            <family>IPAPGothic</family>
             <family>IPAGothic</family>
             <family>Sazanami Gothic</family>
@@ -143,17 +157,25 @@
-            <family>Kochi Gothic</family>
+            <family>FZSongTi</family>
+            <family>FZMingTi</family>
+            <family>KacstQurn</family>
             <family>AR PL KaitiM GB</family>
             <family>AR PL KaitiM Big5</family>
-             <family>AR PL ShanHeiSun Uni</family>
+             <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+            <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+            <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
+            <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
              <family>AR PL SungtiL GB</family>
              <family>AR PL Mingti2L Big5</family>
             <family>ＭＳ ゴシック</family>
@@ -151,17 +164,24 @@
              <family>Lohit Telugu</family>
              <family>Lohit Oriya</family>
              <family>LKLUG</family>
@@ -218,7 +112,6 @@
             <family>VL Gothic</family>
+            <family>HG-GothicB-Sun</family>
+            <family>HG-MinchoL-Sun</family>
+            <family>Sun-Gothic</family>
             <family>IPAMonaGothic</family>
             <family>IPAGothic</family>
             <family>Sazanami Gothic</family>
@@ -229,7 +122,7 @@
             <family>AR PL KaitiM GB</family>
             <family>MS Gothic</family> <!-- han (ja) -->
             <family>UmePlus Gothic</family> <!-- han (ja) -->
@@ -167,7 +189,6 @@
@@ -175,7 +195,6 @@
             <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
             <family>NanumGothicCoding</family> <!-- hangul (ko) -->
             <family>NanumGothic</family> <!-- hangul (ko) -->
@@ -237,7 +130,7 @@
             <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
             <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
             <family>TlwgTypo</family> <!-- thai -->
@@ -195,6 +216,10 @@
@@ -202,6 +221,10 @@
             <family>Lohit Telugu</family>
             <family>Lohit Oriya</family>
             <family>LKLUG</family>
@@ -247,4 +140,4 @@
+                        <family>Gothic</family>
         </prefer>
     </alias>
 </fontconfig>
 <!--

 components/library/fontconfig/test/results-32.master

File was deleted

 components/library/fontconfig/test/results-all.master