build: Bump Fontconfig version up to 2.12.6 #23495
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @theuni |
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
This was referenced Nov 13, 2021
Closed
|
Concept ACK Mind that we link fontconfig dynamically to Although I'm kind of confused here. I don't actually know how It links to major version 1, which is a link 1.12 on my system, which is in package |
On master, Fontconfig 2.12.1: $ readelf -d src/qt/bitcoin-qt | grep libfontconfig
0x0000000000000001 (NEEDED) Shared library: [libfontconfig.so.1]With this PR, Fontconfig 2.12.6: $ readelf -d src/qt/bitcoin-qt | grep libfontconfig
0x0000000000000001 (NEEDED) Shared library: [libfontconfig.so.1]There are no changes. |
|
Yes. It seems so. Hence my concept ACK. |
|
Rebased 9199acc -> 6575d35 (pr23495.01 -> pr23495.02) due to the conflict with #23489. |
Guix builds: |
fanquake
approved these changes
Dec 9, 2021
There was a problem hiding this comment.
ACK 6575d35 - from the best I can determine this doesn't have any versioning / ABI implications. The ABI difference between 2.12.1 and 2.12.6 is two symbol additions, neither of which are used by Qt. Fontconfig seems to be better at maintaining backwards compatibility compared to a library like Freetype.
Bumping this just to remove a patching step is ~0.
Guix Build:
bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
474c6225d9e6e65070b476cc0ad91a38529175f10abea6c9741a1ef390f67e65 guix-build-6575d354c817/output/aarch64-linux-gnu/SHA256SUMS.part
e482bb2491d83142d83a3faa4c6d48ed7c6e74a4aec2cf63d9b43ef45e900ff6 guix-build-6575d354c817/output/aarch64-linux-gnu/bitcoin-6575d354c817-aarch64-linux-gnu-debug.tar.gz
bc6bcff5db37c2bdc5987e442631967d1f9e42ccbf4feed6fb448b4d994ee823 guix-build-6575d354c817/output/aarch64-linux-gnu/bitcoin-6575d354c817-aarch64-linux-gnu.tar.gz
684d3238a6caeeaeffd2de299c485921f00630ba815022a1df3312c2ea4a4655 guix-build-6575d354c817/output/arm-linux-gnueabihf/SHA256SUMS.part
2e0a2ee3fa45dd1797dad47013b77c04ddeb584ae4bca2d6b5cadac3e30eaa9c guix-build-6575d354c817/output/arm-linux-gnueabihf/bitcoin-6575d354c817-arm-linux-gnueabihf-debug.tar.gz
28000e2f07b3386eb196acb7dac67ee38289befb3f4eb595a5a444dfa7febe43 guix-build-6575d354c817/output/arm-linux-gnueabihf/bitcoin-6575d354c817-arm-linux-gnueabihf.tar.gz
024fb99ce017932b6eae675325f38046f1d98a5798fa5fd88f09bc98a5b2eb66 guix-build-6575d354c817/output/dist-archive/bitcoin-6575d354c817.tar.gz
5b2f058d59c09aa1cdadc7b5f2ee96bc105f90e1996ca758a071a0505b975169 guix-build-6575d354c817/output/powerpc64-linux-gnu/SHA256SUMS.part
9cfcd2f711a203d8c789e7e46d8179ccb2000a646c1e5ec42d4e86294e765a99 guix-build-6575d354c817/output/powerpc64-linux-gnu/bitcoin-6575d354c817-powerpc64-linux-gnu-debug.tar.gz
4b9662c3d2e974551f72c711464bed9da5a6373b1644bc53f907041a76e85a8f guix-build-6575d354c817/output/powerpc64-linux-gnu/bitcoin-6575d354c817-powerpc64-linux-gnu.tar.gz
d8007f2455054a4a64ac59cf0820da4e0a81a5aa84fe4eb67ac7fabc279666e5 guix-build-6575d354c817/output/powerpc64le-linux-gnu/SHA256SUMS.part
511059d4dd2c07d29ffc28ea783d658c11f90433498f3df5dac30e2851d98bef guix-build-6575d354c817/output/powerpc64le-linux-gnu/bitcoin-6575d354c817-powerpc64le-linux-gnu-debug.tar.gz
f5ff89b72bb4a2b9f5700afacb8251d925bc2670c5ebe5daf039e4682cfe7bc7 guix-build-6575d354c817/output/powerpc64le-linux-gnu/bitcoin-6575d354c817-powerpc64le-linux-gnu.tar.gz
91294cefd5a482509e2cb423a52d7e36ca95511d8ecf847bb2e9ad4d4a1b31c2 guix-build-6575d354c817/output/riscv64-linux-gnu/SHA256SUMS.part
5e05025245d148f78b742417b96ab401cc395c6ed7ae5057cc99edbb24accc74 guix-build-6575d354c817/output/riscv64-linux-gnu/bitcoin-6575d354c817-riscv64-linux-gnu-debug.tar.gz
d57faa017014c47a87c3c3a162b8211bd242d4bb08db6c5b1e764f814f331d0b guix-build-6575d354c817/output/riscv64-linux-gnu/bitcoin-6575d354c817-riscv64-linux-gnu.tar.gz
966b488564b1fe2fac229fda60d3a08d18db02f83e22cc91bb1bc29c1e6f28cc guix-build-6575d354c817/output/x86_64-apple-darwin19/SHA256SUMS.part
d990ad4f6dc72010c2629ff17a81738797d1f13ec1b260fdf5ea96de50a54afe guix-build-6575d354c817/output/x86_64-apple-darwin19/bitcoin-6575d354c817-osx-unsigned.dmg
3113559412db44c7e616a819f8876963d2ff102ceeec3dea424e13ed46cd9e3f guix-build-6575d354c817/output/x86_64-apple-darwin19/bitcoin-6575d354c817-osx-unsigned.tar.gz
37870810e3dbf945a4edee4ade1974cc779e27e1626d1bbca730d381780e6154 guix-build-6575d354c817/output/x86_64-apple-darwin19/bitcoin-6575d354c817-osx64.tar.gz
3635235203fd1852b04546bfabd9c29e439e90e4071f900c36aa5e0581c2c2a7 guix-build-6575d354c817/output/x86_64-linux-gnu/SHA256SUMS.part
765022859970d9f5c8b5130229006707f9a05c7f0e6858f50db8f32a27f99798 guix-build-6575d354c817/output/x86_64-linux-gnu/bitcoin-6575d354c817-x86_64-linux-gnu-debug.tar.gz
4d75aeca4ea15e26a4a12276ea89ac7b719dc6e72916a0aaa04b5d6e46b2a95d guix-build-6575d354c817/output/x86_64-linux-gnu/bitcoin-6575d354c817-x86_64-linux-gnu.tar.gz
e8fda7896052036ec1dd743e34e7dde3263ad2d0bc1dbad57ef3070460454777 guix-build-6575d354c817/output/x86_64-w64-mingw32/SHA256SUMS.part
7c8b26e715e05a0a54b092f1eda33feb54c59dac010bc3ec6815d9a00588d9c4 guix-build-6575d354c817/output/x86_64-w64-mingw32/bitcoin-6575d354c817-win-unsigned.tar.gz
a4419ca84e4b0b367642ed75a0c60f3f1fcc6908033cd5bc0498e30beed44a5e guix-build-6575d354c817/output/x86_64-w64-mingw32/bitcoin-6575d354c817-win64-debug.zip
c1d3b68945e3d60e116c45a6524d33570473bffbbb5b17e8d1963e6798b826ff guix-build-6575d354c817/output/x86_64-w64-mingw32/bitcoin-6575d354c817-win64-setup-unsigned.exe
9da550c946c775ace330eda3bc34f3978507c31964fbf9a88ea1730378779057 guix-build-6575d354c817/output/x86_64-w64-mingw32/bitcoin-6575d354c817-win64.zip
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Dec 10, 2021
6575d35 build: Bump Fonconfig version up to 2.12.6 (Hennadii Stepanov) Pull request description: This PR gets rid of `remove_char_width_usage.patch`. Some additional observations: 1. Newer Fontconfig versions (2.13.0 and 2.13.1) introduce a new dependency, `uuid`, in the [`7b48fd3dd406b926f0e5240b211f72197ed538a9`](https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/7b48fd3dd406b926f0e5240b211f72197ed538a9) commit 2. In Fonconfig 2.13.1 (the current stable) excludes the `fcobjshash.h` from the distributive archive (see [`31269e3589e0e6432d12f55db316f4c720a090b5`](https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/31269e3589e0e6432d12f55db316f4c720a090b5)), that makes our `gperf_header_regen.patch` unusable, and requires `gperf` as a dependency. ACKs for top commit: fanquake: ACK 6575d35 - from the best I can determine this doesn't have any versioning / ABI implications. The ABI difference between 2.12.1 and 2.12.6 is two symbol additions, neither of which are used by Qt. Fontconfig seems to be better at maintaining backwards compatibility compared to a library like Freetype. Tree-SHA512: 36780a0c5a658469697e524d682ebab56c320cb04f8297bc215f4552f183d4f560501fb0a869982fd9053d4a2d571c7fd971d8f5e96c9da9a9d142c485e3baa4
RandyMcMillan
pushed a commit
to RandyMcMillan/mempool-tab
that referenced
this pull request
Dec 23, 2021
a51e552 build: Bump Fonconfig version up to 2.12.6 (Hennadii Stepanov) Pull request description: This PR gets rid of `remove_char_width_usage.patch`. Some additional observations: 1. Newer Fontconfig versions (2.13.0 and 2.13.1) introduce a new dependency, `uuid`, in the [`7b48fd3dd406b926f0e5240b211f72197ed538a9`](https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/7b48fd3dd406b926f0e5240b211f72197ed538a9) commit 2. In Fonconfig 2.13.1 (the current stable) excludes the `fcobjshash.h` from the distributive archive (see [`31269e3589e0e6432d12f55db316f4c720a090b5`](https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/31269e3589e0e6432d12f55db316f4c720a090b5)), that makes our `gperf_header_regen.patch` unusable, and requires `gperf` as a dependency. ACKs for top commit: fanquake: ACK a51e552 - from the best I can determine this doesn't have any versioning / ABI implications. The ABI difference between 2.12.1 and 2.12.6 is two symbol additions, neither of which are used by Qt. Fontconfig seems to be better at maintaining backwards compatibility compared to a library like Freetype. Tree-SHA512: 36780a0c5a658469697e524d682ebab56c320cb04f8297bc215f4552f183d4f560501fb0a869982fd9053d4a2d571c7fd971d8f5e96c9da9a9d142c485e3baa4
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR gets rid of
remove_char_width_usage.patch.Some additional observations:
uuid, in the7b48fd3dd406b926f0e5240b211f72197ed538a9commitfcobjshash.hfrom the distributive archive (see31269e3589e0e6432d12f55db316f4c720a090b5), that makes ourgperf_header_regen.patchunusable, and requiresgperfas a dependency.