Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade tcl/tk from 8.6.12 to 8.6.14 on Unix #495

Merged
merged 9 commits into from
Jan 14, 2025
Merged

Upgrade tcl/tk from 8.6.12 to 8.6.14 on Unix #495

merged 9 commits into from
Jan 14, 2025

Conversation

zanieb
Copy link
Member

@zanieb zanieb commented Jan 14, 2025

Rebase of #313 to only apply to Unix. We'll handle Windows separately in #494.

@zanieb zanieb marked this pull request as ready for review January 14, 2025 18:52
Comment on lines +337 to +343
"tk-windows-bin": {
"url": "https://github.com/python/cpython-bin-deps/archive/c624cc881bd0e5071dec9de4b120cbe9985d8c14.tar.gz",
"size": 9497943,
"sha256": "9b8e77d55f40ceaedd140ccca0daa804f0d43346d5abfcead9b547b5590f82f8",
"version": "8.6.14",
"git_commit": "c624cc881bd0e5071dec9de4b120cbe9985d8c14",
},
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This updated, but not used here yet.

@zanieb zanieb added the dependencies Pull requests that update a dependency file label Jan 14, 2025
Comment on lines -241 to +244
("riscv64-unknown-linux-gnu", vec!["ld-linux-riscv64-lp64d.so.1", "libatomic.so.1"]),
(
"riscv64-unknown-linux-gnu",
vec!["ld-linux-riscv64-lp64d.so.1", "libatomic.so.1"],
),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i started at this a bunch hoping to win at Spot The Difference That Makes It Longer So rustfmt Rewraps It but i lost. weird.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I have no clue. I just accepted it.

@zanieb zanieb merged commit 6f3ab98 into main Jan 14, 2025
326 checks passed
@zanieb zanieb deleted the zb/tcl-tk-split branch January 14, 2025 19:50
This was referenced Jan 14, 2025
zanieb added a commit that referenced this pull request Jan 14, 2025
The upstream build system now requires the latest tcl/tk and we want to
upgrade anyway, so that happens here as well. There are some concerns
about the new zlib/msvcrt dependencies, so I'm limiting these to the
3.14a to see how it goes.

See #495
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants