Skip to content

Commit 6575d35

Browse files
committed
build: Bump Fonconfig version up to 2.12.6
1 parent 57982f4 commit 6575d35

File tree

4 files changed

+8
-71
lines changed

4 files changed

+8
-71
lines changed

depends/packages/fontconfig.mk

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package=fontconfig
2-
$(package)_version=2.12.1
2+
$(package)_version=2.12.6
33
$(package)_download_path=https://www.freedesktop.org/software/fontconfig/release/
44
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
5-
$(package)_sha256_hash=b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
5+
$(package)_sha256_hash=cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
66
$(package)_dependencies=freetype expat
7-
$(package)_patches=remove_char_width_usage.patch gperf_header_regen.patch
7+
$(package)_patches=gperf_header_regen.patch
88

99
define $(package)_set_vars
1010
$(package)_config_opts=--disable-docs --disable-static --disable-libxml2 --disable-iconv
1111
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
1212
endef
1313

1414
define $(package)_preprocess_cmds
15-
patch -p1 < $($(package)_patch_dir)/remove_char_width_usage.patch && \
1615
patch -p1 < $($(package)_patch_dir)/gperf_header_regen.patch
1716
endef
1817

depends/patches/fontconfig/gperf_header_regen.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ diff --git a/src/Makefile.in b/src/Makefile.in
1313
index f4626ad..4ae1b00 100644
1414
--- a/src/Makefile.in
1515
+++ b/src/Makefile.in
16-
@@ -903,7 +903,7 @@ fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
16+
@@ -912,7 +912,7 @@
1717
' - > [email protected] && \
18-
mv -f [email protected] $@ || ( $(RM) [email protected] && false )
18+
mv -f [email protected] fcobjshash.gperf && touch $@ || ( $(RM) [email protected] && false )
1919

20-
-fcobjshash.h: fcobjshash.gperf
20+
-fcobjshash.h: Makefile fcobjshash.gperf
2121
+fcobjshash.h:
22-
$(AM_V_GEN) $(GPERF) -m 100 $< > [email protected] && \
22+
$(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > [email protected] && \
2323
mv -f [email protected] $@ || ( $(RM) [email protected] && false )
2424

depends/patches/fontconfig/remove_char_width_usage.patch

-62
This file was deleted.

doc/dependencies.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
88
| Berkeley DB | [4.8.30](https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 4.8.x | No | | |
99
| Boost | [1.71.0](https://www.boost.org/users/download/) | [1.64.0](https://github.com/bitcoin/bitcoin/pull/22320) | No | | |
1010
| Clang<sup>[ \* ](#note1)</sup> | | [7.0](https://releases.llvm.org/download.html) (C++17 & std::filesystem support) | | | |
11-
| fontconfig | [2.12.1](https://www.freedesktop.org/software/fontconfig/release/) | | No | Yes | |
11+
| Fontconfig | [2.12.6](https://www.freedesktop.org/software/fontconfig/release/) | | No | Yes | |
1212
| FreeType | [2.11.0](https://download.savannah.gnu.org/releases/freetype) | | No | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) (Android only) |
1313
| GCC | | [8.1](https://gcc.gnu.org/) (C++17 & std::filesystem support) | | | |
1414
| glibc | | [2.18](https://www.gnu.org/software/libc/) | | | | |

0 commit comments

Comments
 (0)