commit: 814b9f9277c2872dd430a72757dc25925a238492 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Tue Sep 9 16:32:53 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Tue Sep 9 16:32:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=814b9f92
media-libs/fontconfig: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> .../files/fontconfig-2.16.0-endian.patch | 40 ---------------------- .../files/fontconfig-2.16.0-fc_cachedir.patch | 30 ---------------- .../files/fontconfig-2.16.0-pthread.patch | 37 -------------------- 3 files changed, 107 deletions(-) diff --git a/media-libs/fontconfig/files/fontconfig-2.16.0-endian.patch b/media-libs/fontconfig/files/fontconfig-2.16.0-endian.patch deleted file mode 100644 index 744208f84e0f..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.16.0-endian.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/7c082953381038d5c35820cba939047d708bbb5a - -From 7c082953381038d5c35820cba939047d708bbb5a Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <[email protected]> -Date: Mon, 27 Jan 2025 11:24:19 +0900 -Subject: [PATCH] meson: set WORDS_BIGENDIAN - -Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/446 ---- - meson.build | 1 + - src/fcmd5.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9e9993a2..5aacfc5e 100644 ---- a/meson.build -+++ b/meson.build -@@ -181,6 +181,7 @@ conf.set_quoted('PACKAGE_VERSION', meson.project_version()) - conf.set_quoted('PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), meson.project_version())) - conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new') - conf.set_quoted('PACKAGE_URL', '') -+conf.set('WORDS_BIGENDIAN', (host_machine.endian() == 'big').to_int()) - - if host_machine.system() == 'windows' - conf.set('EXEEXT', '.exe') -diff --git a/src/fcmd5.h b/src/fcmd5.h -index 7e8a6e1e..bf507285 100644 ---- a/src/fcmd5.h -+++ b/src/fcmd5.h -@@ -27,7 +27,7 @@ static void MD5Update(struct MD5Context *ctx, const unsigned char *buf, unsigned - static void MD5Final(unsigned char digest[16], struct MD5Context *ctx); - static void MD5Transform(FcChar32 buf[4], FcChar32 in[16]); - --#ifndef WORDS_BIGENDIAN -+#if !defined(WORDS_BIGENDIAN) || !WORDS_BIGENDIAN - #define byteReverse(buf, len) /* Nothing */ - #else - /* --- -GitLab diff --git a/media-libs/fontconfig/files/fontconfig-2.16.0-fc_cachedir.patch b/media-libs/fontconfig/files/fontconfig-2.16.0-fc_cachedir.patch deleted file mode 100644 index 74d6fadbe2e9..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.16.0-fc_cachedir.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/9b864e8ceb480c31cd76ce3fe1d6215f8655ec55 - -From 9b864e8ceb480c31cd76ce3fe1d6215f8655ec55 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <[email protected]> -Date: Mon, 20 Jan 2025 12:08:36 +0900 -Subject: [PATCH] meson: create fc_cachedir at the installation time - -Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/445 ---- - meson.build | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/meson.build b/meson.build -index 4439758d..85968b29 100644 ---- a/meson.build -+++ b/meson.build -@@ -550,6 +550,11 @@ if not meson.is_subproject() - meson.add_dist_script('build-aux/meson-dist-autotools.py') - endif - -+if host_machine.system() != 'windows' -+ install_emptydir(fc_cachedir, -+ install_tag: 'runtime') -+endif -+ - # Summary - doc_targets = get_variable('doc_targets', []) - --- -GitLab diff --git a/media-libs/fontconfig/files/fontconfig-2.16.0-pthread.patch b/media-libs/fontconfig/files/fontconfig-2.16.0-pthread.patch deleted file mode 100644 index df68082cca6e..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.16.0-pthread.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/aad470dad519b6fe3459023b82941b4414b71313 - -From aad470dad519b6fe3459023b82941b4414b71313 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt <[email protected]> -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 - -Signed-off-by: Thomas Devoogdt <[email protected]> ---- - meson.build | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 85968b29..9e9993a2 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') --- -GitLab
