From patchwork Thu Apr 24 13:43:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8625 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Zjxyy21zFz3xPk for ; Thu, 24 Apr 2025 13:44:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Zjxys2qFfz3lm for ; Thu, 24 Apr 2025 13:44:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Zjxyq4wDqz338x for ; Thu, 24 Apr 2025 13:44:03 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Zjxym57V8z336H for ; Thu, 24 Apr 2025 13:44:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Zjxym3d2Hz32R; Thu, 24 Apr 2025 13:44:00 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1745502240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/gtKWgsufyw9AMdbz+vn2foxwslPtpiI/8UBkBAfnMI=; b=5zRfrPfOtkrpyjssmw5oACtONNBM1t1Hlw3qh/GMH4hdJIU1mYO7We9rERgXc7dVt/jfU1 38KOwhvJ+KmtAQAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1745502240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/gtKWgsufyw9AMdbz+vn2foxwslPtpiI/8UBkBAfnMI=; b=a72F5h6GrNrdc2KC5bHmmacvaHYvdR/8v6oPRiT8P/arcuQvukHmfBIpacvJU3E8iHc5uj zG8NFdqHGHL1DC3SLf23iAqzux9rlvB2L0yVAcCLQPdER+AeeYhzkvyo+K7xUEb1jTcThg mHzwJ82MQgNvHK/4E424FX5u8793z5fPIa7G6ZoQyo+6fYR9yWoRrSrgQ6Vdw6ddChvBvb dbmWa2h9u4HMi56ahIW5tfLxHMysnBdD+6N9KuPEkEjW7IfAdICrhRUGo3rCsrUK1SORfl OCvVIo1fpu/yZHl13hZT/tqPM7rxN6Y6uquRx/GRuhP7q2F8DzsDkVjYz9eW7A== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] fontconfig: Update to version 2.16.2 Date: Thu, 24 Apr 2025 15:43:46 +0200 Message-ID: <20250424134354.3440212-4-adolf.belka@ipfire.org> In-Reply-To: <20250424134354.3440212-1-adolf.belka@ipfire.org> References: <20250424134354.3440212-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - 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 --- config/rootfiles/common/fontconfig | 2 +- lfs/fontconfig | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) 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)