From 6baca88959bf14b7d7ef409ce1628c699bcc40c1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Jul 2025 18:54:17 +0200 Subject: [PATCH] package/fontconfig: bump version to 2.17.1 Removed patch which is included in this release. Switched _SITE to gitlab: https://lists.freedesktop.org/archives/fontconfig/2025-March/007154.html Release notes: 2.16.1: https://lists.freedesktop.org/archives/fontconfig/2025-March/007154.html 2.16.2: https://lists.freedesktop.org/archives/fontconfig/2025-April/007168.html 2.17.0: https://lists.freedesktop.org/archives/fontconfig/2025-June/007224.html 2.17.1: https://lists.freedesktop.org/archives/fontconfig/2025-July/007229.html Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- ...explicitly-check-for-pthread-support.patch | 37 ------------------- package/fontconfig/fontconfig.hash | 4 +- package/fontconfig/fontconfig.mk | 4 +- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 package/fontconfig/0001-meson.build-explicitly-check-for-pthread-support.patch diff --git a/package/fontconfig/0001-meson.build-explicitly-check-for-pthread-support.patch b/package/fontconfig/0001-meson.build-explicitly-check-for-pthread-support.patch deleted file mode 100644 index ca394ab7d5..0000000000 --- a/package/fontconfig/0001-meson.build-explicitly-check-for-pthread-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3c9de31dda1a1d44fade7a61e66c989178d6c2a4 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Sun, 26 Jan 2025 10:15:39 +0100 -Subject: [PATCH] meson.build: explicitly check for pthread support - -Tested using buildroot. The br-arm-full-nothread fails -because meson assumes thread support when cross-compiling. - -Dependency threads found: YES unknown (cached) -Has header "pthread.h" : NO - -Upstream: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/aad470dad519b6fe3459023b82941b4414b71313 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 4439758..07e242b 100644 ---- a/meson.build -+++ b/meson.build -@@ -383,8 +383,10 @@ endif - - if host_machine.system() != 'windows' - thread_dep = dependency('threads') -- conf.set('HAVE_PTHREAD', 1) -- deps += [thread_dep] -+ if thread_dep.found() and cc.has_header('pthread.h') -+ conf.set('HAVE_PTHREAD', 1) -+ deps += [thread_dep] -+ endif - endif - - fc_templatedir = get_option('template-dir') --- -2.43.0 - diff --git a/package/fontconfig/fontconfig.hash b/package/fontconfig/fontconfig.hash index b9c95d40b2..e6f2e0771c 100644 --- a/package/fontconfig/fontconfig.hash +++ b/package/fontconfig/fontconfig.hash @@ -1,5 +1,5 @@ -# From https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.16.0.tar.xz.sha256sum -sha256 6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220 fontconfig-2.16.0.tar.xz +# From https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/2.17.1/fontconfig-2.17.1.tar.xz.sha256sum +sha256 9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541 fontconfig-2.17.1.tar.xz # Locally calculated sha256 51a51aa9823704fd90bccc616cdd17ebabb5b2b3e9cbde886ca02c7002288067 COPYING diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 7ac8872e82..d9f5dbefad 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -4,8 +4,8 @@ # ################################################################################ -FONTCONFIG_VERSION = 2.16.0 -FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release +FONTCONFIG_VERSION = 2.17.1 +FONTCONFIG_SITE = https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/$(FONTCONFIG_VERSION) FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.xz FONTCONFIG_INSTALL_STAGING = YES FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \