-
-
Notifications
You must be signed in to change notification settings - Fork 12.4k
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
tcl-tk: fixes #12114 for python and #12808 for python3 by bumping tcl-tk version #15950
tcl-tk: fixes #12114 for python and #12808 for python3 by bumping tcl-tk version #15950
Conversation
Don't worry about the audit issue. However, this version will need to go in a |
Can do. Can you please point me to a good example of a |
|
I put the 8.6.7 stuff in a |
Formula/tcl-tk.rb
Outdated
bottle do | ||
sha256 "de26155e0b2fee960af4791d39e3d6c79421c635c0a914be8a0254ff28f4fad2" => :sierra | ||
sha256 "9481cea8f38c644eb12f6a42463082469f1e91fe7616b167fbda46ded9bef336" => :el_capitan | ||
sha256 "f137c8176792d8363989981c2f3838f8edee73738a02bf899caddd8460abdd86" => :yosemite | ||
end | ||
|
||
devel do |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually let's make this head do
since there's no 8.6.7-rc tag yet
Formula/tcl-tk.rb
Outdated
bottle do | ||
sha256 "de26155e0b2fee960af4791d39e3d6c79421c635c0a914be8a0254ff28f4fad2" => :sierra | ||
sha256 "9481cea8f38c644eb12f6a42463082469f1e91fe7616b167fbda46ded9bef336" => :el_capitan | ||
sha256 "f137c8176792d8363989981c2f3838f8edee73738a02bf899caddd8460abdd86" => :yosemite | ||
end | ||
|
||
devel do | ||
url "https://github.com/tcltk/tcl/archive/a29278e79c748bfaf8766c486eb93eca7ad586be.tar.gz" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
url "https://github.com/tcltk/tcl.git", :branch => "core_8_6_7_rc"
Formula/tcl-tk.rb
Outdated
bottle do | ||
sha256 "de26155e0b2fee960af4791d39e3d6c79421c635c0a914be8a0254ff28f4fad2" => :sierra | ||
sha256 "9481cea8f38c644eb12f6a42463082469f1e91fe7616b167fbda46ded9bef336" => :el_capitan | ||
sha256 "f137c8176792d8363989981c2f3838f8edee73738a02bf899caddd8460abdd86" => :yosemite | ||
end | ||
|
||
devel do | ||
url "https://github.com/tcltk/tcl/archive/a29278e79c748bfaf8766c486eb93eca7ad586be.tar.gz" | ||
version "8.6.7" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this line please
Formula/tcl-tk.rb
Outdated
devel do | ||
url "https://github.com/tcltk/tcl/archive/a29278e79c748bfaf8766c486eb93eca7ad586be.tar.gz" | ||
version "8.6.7" | ||
sha256 "90202b013184fea551a5800404f572b1b4cbadaebc60dfaa6516a7d8ad837fff" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this line please
Formula/tcl-tk.rb
Outdated
sha256 "90202b013184fea551a5800404f572b1b4cbadaebc60dfaa6516a7d8ad837fff" | ||
|
||
resource "tk" do | ||
url "https://github.com/tcltk/tk/archive/8aecb568ca2896cfae4253ead2fe62442d977b55.tar.gz" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
url "https://github.com/tcltk/tk.git", :branch => "core_8_6_7_rc"
Formula/tcl-tk.rb
Outdated
|
||
resource "tk" do | ||
url "https://github.com/tcltk/tk/archive/8aecb568ca2896cfae4253ead2fe62442d977b55.tar.gz" | ||
version "8.6.7" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this line please
Formula/tcl-tk.rb
Outdated
resource "tk" do | ||
url "https://github.com/tcltk/tk/archive/8aecb568ca2896cfae4253ead2fe62442d977b55.tar.gz" | ||
version "8.6.7" | ||
sha256 "3c4f38783f2fca6e0b4e9152279fbc0576e63cbbd8024e47a006497dd8db4379" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this line please
Formula/tcl-tk.rb
Outdated
@@ -58,7 +73,7 @@ def install | |||
|
|||
cd "unix" do | |||
system "./configure", *args | |||
system "make", "TK_LIBRARY=#{lib}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Originally I thought that passing an explicit TK_LIBRARY
might be what was causing the icon files to install to the lib. But what I found over the course of about a dozen test builds is that it makes no difference to any part of the build whether that argument is there or not.
Since it wasn't doing anything, and seems like a potential source of issues, I removed it.
Changing from I did manage to get the |
@telamonian that may be a CC @MikeMcQuaid it sounds like superenv is allowing |
Maybe? I know at least half of what went wrong with superenv First, I had to remove the I also had to change line 214 in
to
Basically, If there's a security concern to removing the forward slash from the end of the check, maybe |
@telamonian this reminds me of |
Okay, merged all of the changes and tested them. There's no revision spec in there at the moment, so that's not a problem, but you do still definitely need to hack the The |
@telamonian I'm fine with using |
@telamonian you'll need to squash this down to a single commit so that the |
Trying to get the tcltk devs to release a tag when I want them to sounds about as futile as me trying to convince you to bring back the |
@telamonian you might be surprised. It's "only" a beta/rc/alpha/pre/whatever tag you'd be asking for. |
I'm not really that familiar with squash. I was looking through the docs, and there seem to be a lot of choices. Also, I hadn't realized that I managed to pull in 95 unrelated commits when I fixed those conflicts. What's the best practice for squashing in this situation? I assume that I'm not going to want to preserve my entire git log. |
@telamonian you can follow the steps here #15721 (comment) |
7b45e63
to
300d60e
Compare
@telamonian it looks like upstream has posted 8.6.7rc0 on SourceForge, so we can use that for devel, if you'd like to refresh this PR. |
@telamonian ping |
I'll take care of this tonight. I assume you didn't merge a week ago because of the HEAD related issues in
|
Right.
Yes.
Yes. |
…y adding devel build. Also removes semi-function HEAD build
All done/tested. Let me know if anything else is needed before the new tcl-tk can be merged. |
@telamonian Thanks for your first contribution to Homebrew! Without people like you submitting PRs we couldn't run this project. You rock! |
to a version in which the upstream has fixed the relevant bugs.
Hopefully this is a better attempt at a fix than my last one (#15855).
brew install --build-from-source <formula>
, where<formula>
is the name of the formula you're submitting?brew audit --strict <formula>
(after doingbrew install <formula>
)?So apparently all of the trouble that people have been having with
brew python install --with-tcl-tk
andbrew python3 install --with-tcl-tk
(#12114 and #12808) is due to a whole mess of bugs in the upstream that have apparently all been fixed.However, there's still no official release aside from the version of 8.6.6 that was put out last year. So what I've done is to update the formula so that it pulls from the core_8_6_7_rc branch in which all of the relevant fixes have been applied. After installing tcl-tk with the updated formula and then building python2/3 with
--with-tcl-tk
,brew test
passes for both pythons, and both ofopen an application window as expected, so everything seems good.
The one remaining hiccup is that
brew audit --strict
is still picking up a single error. This is due to the fact that tk now installs a couple of icon files (Tk.icns
andTk.tiff
) in/usr/local/opt/tcl-tk/lib
alongside the libraries, and audit really doesn't like that. I looked through theconfigure
andmakefile
files in tk, and the installation of the icons into the library appears to be intended behavior on the part of the tcltk devs. How should I fix this?