diff options
| author | fanquake <fanquake@gmail.com> | 2023-09-05 15:39:13 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-09-05 15:39:58 +0100 |
| commit | 0df8f98d654291c08b9fe6cb11ec1685828f1504 (patch) | |
| tree | c1c8256780a770d577ed570e2ac27c3c62d8663c | |
| parent | a537cb0b8780c53c8af425709d4c939b9ec79057 (diff) | |
| parent | 66b2b109ebed522817716f73f9490d62d3d9af04 (diff) | |
Merge bitcoin/bitcoin#28410: [24.x] depends: xcb-proto 1.15.2
66b2b109ebed522817716f73f9490d62d3d9af04 depends: xcb-proto 1.15.2 (fanquake)
Pull request description:
Resolves build failures under Python 3.12, i.e building on rawhide:
```bash
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.
Github-Pull: #28097
Rebased-From: 7cb88c8b46723d306b96953a6a60c90a4ab211e3
Also being backported for 25.x in #28047.
ACKs for top commit:
hebasto:
ACK 66b2b109ebed522817716f73f9490d62d3d9af04
Tree-SHA512: 5364c5ced3004bc08a9c8f96e2b3abae3e31b3f0e7b1d10f83ff997f19b314d4d14c2a780ed02e793771c23091f8f02137cf7f5404627f2bd218c8726ae3228f
| -rw-r--r-- | depends/packages/xcb_proto.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/depends/packages/xcb_proto.mk b/depends/packages/xcb_proto.mk index 9be822506d..6e1c5a10a8 100644 --- a/depends/packages/xcb_proto.mk +++ b/depends/packages/xcb_proto.mk @@ -1,8 +1,8 @@ package=xcb_proto -$(package)_version=1.14.1 +$(package)_version=1.15.2 $(package)_download_path=https://xorg.freedesktop.org/archive/individual/proto $(package)_file_name=xcb-proto-$($(package)_version).tar.xz -$(package)_sha256_hash=f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3 +$(package)_sha256_hash=7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed define $(package)_config_cmds $($(package)_autoconf) |