Skip to content

Commit a8cfd70

Browse files
Merge dashpay#6011: backport: Merge bitcoin#28097: depends: xcb-proto 1.15.2 - fix ubuntu 24.04
94a8e1a Merge bitcoin#28097: depends: xcb-proto 1.15.2 (fanquake) Pull request description: ## Issue being fixed or feature implemented Resolves build failures with Python 3.12, i.e building on rawhide: ```bash make -C depends -j9 ... make[3]: Nothing to be done for 'install-exec-am'. /usr/bin/mkdir -p '/bitcoin/depends/work/staging/aarch64-unknown-linux-gnu/xcb_proto/1.14.1-4a91ac9dc41/bitcoin/depends/aarch64-unknown-linux-gnu/lib/python3.12/site-packages/xcbgen' /usr/bin/install -c -m 644 __init__.py error.py expr.py align.py matcher.py state.py xtypes.py '/bitcoin/depends/work/staging/aarch64-unknown-linux-gnu/xcb_proto/1.14.1-4a91ac9dc41/bitcoin/depends/aarch64-unknown-linux-gnu/lib/python3.12/site-packages/xcbgen' Traceback (most recent call last): File "<string>", line 2, in <module> ModuleNotFoundError: No module named 'imp' make[3]: *** [Makefile:271: install-pkgpythonPYTHON] Error 1 ``` `imp` was removed in 3.12: https://docs.python.org/3/library/imp.html. ## What was done? Bitcoin backport bitcoin#28097 ## How Has This Been Tested? Run build `depends` with clean - it doesn't fail ## Breaking Changes n/a ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone Top commit has no ACKs. Tree-SHA512: 61415fcc0c86f57d6b124907505102ae5b319c95d6ee0b531ce75fa2370a82bafd7a40b21e24eb7d1ac38ba93d59d9e7b89829667c61f4f4caf46029e6dd1cf7
2 parents df33e74 + 94a8e1a commit a8cfd70

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

depends/packages/xcb_proto.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=xcb_proto
2-
$(package)_version=1.14.1
2+
$(package)_version=1.15.2
33
$(package)_download_path=https://xorg.freedesktop.org/archive/individual/proto
44
$(package)_file_name=xcb-proto-$($(package)_version).tar.xz
5-
$(package)_sha256_hash=f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3
5+
$(package)_sha256_hash=7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed
66

77
define $(package)_config_cmds
88
$($(package)_autoconf)

0 commit comments

Comments
 (0)