From: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu, 24 Apr 2025 13:43:46 +0000 (+0200)
Subject: fontconfig: Update to version 2.16.2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=406ab3f286dd6ed8427f29534f686ddaeefe6e80;p=ipfire-2.x.git

fontconfig: Update to version 2.16.2

- Update from version 2.16.0 to 2.16 2
- Update of rootfile
- Default build system has been moved from autotools to meson. Autotools will likely be
   removed in next version.
- Changelog
    2.16.2
      meson: do not require libintl if nls feature is disabled
      ci: Add back Android build in a common way
      ci: drop Language to make sure they are applied as default style
      ci: Change the default build system to meson
      ci: Stop on fail anyway
      ci: default to clean-build
      ci: detect OS from os-release if no FC_DISTRO_NAME is set
      ci: add missing dependency of pytest
      ci: Set more timeout for pytest
      ci: fix too many open files on test
      ci: add missing dependency of requests
      meson: Use Requires.private instead of Requires
      Upgrade bindgen in Fontations enabled Rust builds
      [Fontations] Add internal PatternBuilder abstraction
      meson: don't force build of a shared library
      meson.build: define a 'c' standard for the project (C99 and C11)
    2.16.1
      meson: create fc_cachedir at the installation time
      meson: set WORDS_BIGENDIAN
      ci: get back MinGW build to rawhide
      meson: make sure config.h contains config-fixups.h for OSX
      Reformatting with clang-format
      ci: Add a workflow to check the coding style
      ci: workaround conflict between systemd and systemd-standalone-sysusers
      conf.d: Add Adwaita Sans as system-ui
      ci: disable  job tentatively
      ci: Add a release workflow
      [Fontations] Allow linkage to internals in tests
      meson.build: explicitly check for pthread support

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/fontconfig b/config/rootfiles/common/fontconfig
index 713fda601..76cee2dfd 100644
--- a/config/rootfiles/common/fontconfig
+++ b/config/rootfiles/common/fontconfig
@@ -36,7 +36,7 @@ usr/bin/fc-validate
 #usr/include/fontconfig/fcfreetype.h
 #usr/include/fontconfig/fcprivate.h
 #usr/include/fontconfig/fontconfig.h
-#usr/lib/libfontconfig.la
+#usr/lib/libfontconfig.a
 #usr/lib/libfontconfig.so
 usr/lib/libfontconfig.so.1
 usr/lib/libfontconfig.so.1.15.0
diff --git a/lfs/fontconfig b/lfs/fontconfig
index 6b7af145a..01c211b17 100644
--- a/lfs/fontconfig
+++ b/lfs/fontconfig
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.16.0
+VER        = 2.16.2
 SUMMARY    = Library for configuring and customizing font access
 
 THISAPP    = fontconfig-$(VER)
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 48d6fcbfe83f0a4c026a4f90d864a4195805e04cc6dd486bd18d68caa8b55fd51fc37822781298152d363b70dc103c9f8b216f6dc0193b2b192eb35565482ec4
+$(DL_FILE)_BLAKE2 = 24fdbfc573d1a97e08fc159b91e24b77ddeb646e59ab62bb154b18f07383103a8b1e00c635299e1209fb5965dc889b8ab8f5d7228083af1a916978fa69c71136
 
 install : $(TARGET)
 
@@ -71,12 +71,13 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-docs
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && meson setup \
+					--prefix=/usr \
+					--sysconfdir=/etc \
+					--localstatedir=/var \
+					-D doc=disabled \
+					builddir/
+	cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
+	cd $(DIR_APP) && ninja -C builddir/ install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)