Skip to content

Commit 36073d5

Browse files
committed
Merge bitcoin/bitcoin#33952: depends: update freetype and document remaining bitcoin-qt runtime libs
41e657a guix: add bitcoin-qt runtime libs doc in symbol-check (fanquake) ef4ce19 depends: freetype 2.11.1 (fanquake) Pull request description: Update freetype to `2.11.1`. Updating fontconfig (currently `2.12.6`) to `2.13.1` requires what looks like a hard dep on gperf; leaving that as-is for now. Document expectations in `symbol-check.py`. Closes #29977 (changes are based on discussion there). ACKs for top commit: sedited: ACK 41e657a Tree-SHA512: 71c4ccc442df0b90bebc475003eb325564111b8312c42bc7d7a9c81a2fc166fdc0814c9ddde3cfe562c3c835556e7f97107458b02a07b981b1a199bf65d5ac1d
2 parents f09ae5f + 41e657a commit 36073d5

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

contrib/guix/symbol-check.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626
#
2727
# - libc version 2.34 (https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/)
2828
#
29+
# bitcoin-qt
30+
#
31+
# Ubuntu 22.04 is currently the baseline for ELF_ALLOWED_LIBRARIES:
32+
#
33+
# libfontconfig version 2.13.1 (https://packages.ubuntu.com/jammy/libfontconfig1)
34+
#
35+
# libfreetype version 2.11.1 (https://packages.ubuntu.com/jammy/libfreetype6)
2936

3037
MAX_VERSIONS = {
3138
'GLIBC': {

depends/packages/freetype.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=freetype
2-
$(package)_version=2.11.0
2+
$(package)_version=2.11.1
33
$(package)_download_path=https://download.savannah.gnu.org/releases/$(package)
4-
$(package)_file_name=$(package)-$($(package)_version).tar.xz
5-
$(package)_sha256_hash=8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
4+
$(package)_file_name=$(package)-$($(package)_version).tar.gz
5+
$(package)_sha256_hash=f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b
66
$(package)_build_subdir=build
77
$(package)_patches += cmake_minimum.patch
88

depends/patches/freetype/cmake_minimum.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ build: set minimum required CMake to 3.12
22

33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -97,7 +97,7 @@
5+
@@ -109,7 +109,7 @@
66
# FreeType explicitly marks the API to be exported and relies on the compiler
77
# to hide all other symbols. CMake supports a C_VISBILITY_PRESET property
88
# starting with 2.8.12.

0 commit comments

Comments
 (0)