diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2022-12-07 19:57:01 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2022-12-10 16:59:39 +0000 |
| commit | bdd768ba16de62a12def9fec6281737f434c67c1 (patch) | |
| tree | 76cfdbdb13d66490f82b787cbebff0b18a4b986d | |
| parent | 83b5e17a62015308c2dac55d8ca7539cb768649f (diff) | |
fontconfig: update to 2.14.1
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1050>
| -rw-r--r-- | recipes/fontconfig.recipe | 4 | ||||
| -rw-r--r-- | recipes/fontconfig/0001-fcobjs-Remove-duplicate-function-prototypes.patch | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/recipes/fontconfig.recipe b/recipes/fontconfig.recipe index d6210fdf..5333aea7 100644 --- a/recipes/fontconfig.recipe +++ b/recipes/fontconfig.recipe @@ -5,10 +5,10 @@ from cerbero.tools.libtool import get_libtool_versions class Recipe(recipe.Recipe): name = 'fontconfig' - version = '2.14.0' + version = '2.14.1' stype = SourceType.TARBALL url = 'https://www.freedesktop.org/software/fontconfig/release/fontconfig-%(version)s.tar.xz' - tarball_checksum = 'dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac' + tarball_checksum = '298e883f6e11d2c5e6d53c8a8394de58d563902cfab934e6be12fb5a5f361ef0' licenses = [{License.MIT: ['COPYING']}] btype = BuildType.MESON meson_options = {'doc': 'disabled', 'tests': 'disabled', 'tools': 'disabled'} diff --git a/recipes/fontconfig/0001-fcobjs-Remove-duplicate-function-prototypes.patch b/recipes/fontconfig/0001-fcobjs-Remove-duplicate-function-prototypes.patch index c542e2e5..4d0dda35 100644 --- a/recipes/fontconfig/0001-fcobjs-Remove-duplicate-function-prototypes.patch +++ b/recipes/fontconfig/0001-fcobjs-Remove-duplicate-function-prototypes.patch @@ -1,4 +1,4 @@ -From 6287527c316a5dfb783b4f82d9b2d9702e9d8728 Mon Sep 17 00:00:00 2001 +From dc83e10f46617a6e0b128caff5dfddd022e1a3b3 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan <nirbheek@centricular.com> Date: Wed, 2 Jun 2021 17:16:41 +0530 Subject: [PATCH] fcobjs: Remove duplicate function prototypes @@ -27,12 +27,12 @@ We don't actually need to auto-detect this value in configure if we let the header define it. --- configure.ac | 20 -------------------- - meson.build | 36 ------------------------------------ + meson.build | 37 ------------------------------------- src/fcobjs.c | 6 ------ - 3 files changed, 62 deletions(-) + 3 files changed, 63 deletions(-) diff --git a/configure.ac b/configure.ac -index da69f8d..fff20f2 100644 +index 60871dc..886471d 100644 --- a/configure.ac +++ b/configure.ac @@ -208,26 +208,6 @@ fi @@ -63,10 +63,10 @@ index da69f8d..fff20f2 100644 # Checks for iconv # diff --git a/meson.build b/meson.build -index f616600..0dd1f69 100644 +index 6453d8c..d038fc4 100644 --- a/meson.build +++ b/meson.build -@@ -256,42 +256,6 @@ endif +@@ -318,43 +318,6 @@ endif # It will automatically fallback to subproject if not found on system gperf = find_program('gperf') @@ -86,7 +86,8 @@ index f616600..0dd1f69 100644 - @1@ - ''' - gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C' -- gperf_snippet = run_command(sh, '-c', gperf_snippet_format.format(gperf.path())) +- gperf_snippet = run_command(sh, '-c', gperf_snippet_format.format(gperf.full_path()), +- check: true) - gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout()) - - if cc.compiles(gperf_test) @@ -127,5 +128,5 @@ index 33bba8d..b0d660f 100644 #include <string.h> -- -2.36.1 +2.38.1 |