Merge bitcoin/bitcoin#33537: guix: build bitcoin-qt with static libxcb & utils
96963b888edepends: static libxcb (fanquake)ad06843fabdepends: avoid qdbusviewer in Qt build (fanquake)6848ed56dcdepends: apply Qt patches to fix static libxcb use (fanquake)5f1b016bebdepends: static libxcb-util-image (fanquake)98a2fbbe70depends: static libxkbcommon (fanquake)1412baf772depends: static libxcb-util-wm (fanquake)a4009dadf4depends: static libxcb-keysyms (fanquake)bcfb8679b3depends: static libxcb-render-util (fanquake) Pull request description: Related to https://github.com/bitcoin/bitcoin/pull/33434. Tested on: * Fedora 42: https://github.com/bitcoin/bitcoin/pull/33537#pullrequestreview-3455373185. * Ubuntu 24.04: https://github.com/bitcoin/bitcoin/pull/33537#issuecomment-3533276038. * Debian 13.x: https://github.com/bitcoin/bitcoin/pull/33537#issuecomment-3540923567. ACKs for top commit: hebasto: re-ACK96963b888e, rebased, addressed my comments and adjusted formatting in `symbol-check.py` since my recent [review](https://github.com/bitcoin/bitcoin/pull/33537#pullrequestreview-3456081353). willcl-ark: utACK96963b888eTheCharlatan: ACK96963b888eTree-SHA512: e947bc5b5cb0ec97963bc3f451f8fa6afb2e3699435370798d7a2aaefea7445cbe031d3b642f946f936829fa4cbe4efd2bfacd6b15739da15c3596cc4776b362
This commit is contained in:
10 files changed
+100
-24
No files matched your search
@@ -17,6 +17,7 @@ $(package)_patches += qtbase_plugins_cocoa.patch
|
||||
$(package)_patches += qtbase_skip_tools.patch
|
||||
$(package)_patches += rcc_hardcode_timestamp.patch
|
||||
$(package)_patches += qttools_skip_dependencies.patch
|
||||
$(package)_patches += static_fixes.patch
|
||||
|
||||
$(package)_qttranslations_file_name=$(qt_details_qttranslations_file_name)
|
||||
$(package)_qttranslations_sha256_hash=$(qt_details_qttranslations_sha256_hash)
|
||||
@@ -257,6 +258,7 @@ define $(package)_preprocess_cmds
|
||||
patch -p1 -i $($(package)_patch_dir)/qtbase_avoid_qmain.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/qtbase_platformsupport.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/qtbase_plugins_cocoa.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/static_fixes.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/qtbase_skip_tools.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch
|
||||
endef
|
||||
|
||||
Reference in new issue
Block a user