Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

tmux 2.1 patch #45230

Closed
wants to merge 5 commits into from
Closed

tmux 2.1 patch #45230

wants to merge 5 commits into from

Conversation

indiesquidge
Copy link
Contributor

Patch for the Tmux 2.1 issue tmux/tmux#150
In response to closed issue #45217

@@ -22,6 +22,10 @@ class Tmux < Formula
depends_on "pkg-config" => :build
depends_on "libevent"

# This fixes the Tmux 2.1 update that broke the ability to use select-pane [-LDUR]
# to switch panes when in a maximized pane
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add a link to the patch in the comment: https://github.com/tmux/tmux/issues/150#issuecomment-149466158

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You got it.

@indiesquidge
Copy link
Contributor Author

@bfontaine, I'm not entirely sure what to make of the failed build on Jenkins. It seems like the details of the failure aren't even clear on from Jenkin itself (failed to determine). Gleaning from the logs, it appears that it had an

ERROR: Error cloning remote repo 'origin'

After which it appears to fail because of admin privileges to agree to the Xcode license

Agreeing to the Xcode/iOS license requires admin privileges, please re-run as root via sudo.

And retries the cloning process a few times before finally failing out. I'm guessing this isn't a failure I can handle. Let me know if there is anything I need to do.

UPDATE: Seems like all PRs submitted six or less hours ago are failing this build. Something must be up on Homebrew's end with the CI.

@dunn
Copy link
Contributor

dunn commented Oct 22, 2015

Yeah, we updated Xcode on the CI machines and things went a little goofy. We'll re-qeue this once everything's definitely back to normal.

@indiesquidge
Copy link
Contributor Author

Awesome, thanks for letting me know :)

@@ -22,6 +22,10 @@ class Tmux < Formula
depends_on "pkg-config" => :build
depends_on "libevent"

# This fixes the Tmux 2.1 update that broke the ability to use select-pane [-LDUR]
# to switch panes when in a maximized pane https://github.com/tmux/tmux/issues/150#issuecomment-149466158
patch :DATA
Copy link
Contributor

Choose a reason for hiding this comment

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

Since the patch has been committed we should only apply it to the stable build, and we can also use it directly:

stable do
  url "https://github.com/tmux/tmux/releases/download/2.1/tmux-2.1.tar.gz"
  sha256 "31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176"

  patch do
    url "https://github.com/tmux/tmux/commit/a05c27a7e1c4d43709817d6746a510f16c960b4b.diff"
    sha256 "👻"
  end
end

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think I have updated the file correctly. Let me know if something else needs to be done!


patch do
url "https://github.com/tmux/tmux/commit/a05c27a7e1c4d43709817d6746a510f16c960b4b.diff"
sha256 "👻"
Copy link
Member

Choose a reason for hiding this comment

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

As mentioned: this needs updated.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ahaha, sorry. I should have made it clear that the ghost was a placeholder for the real SHA256.

@bfontaine
Copy link
Contributor

@rakkesh Add the -L option to follow the redirections 😉

curl -sL https://github.com/tmux/tmux/commit/a05c27a7e1c4d43709817d6746a510f16c960b4b.diff | shasum -a 256

@indiesquidge
Copy link
Contributor Author

Thanks to everyone who has been helping me out on this PR, I really appreciate it!

@dunn
Copy link
Contributor

dunn commented Oct 25, 2015

Since you've got the stable url and sha in the stable do block, you can remove lines 4 and 5 now.

@rakkesh
Copy link
Contributor

rakkesh commented Oct 26, 2015

Remove the url and sha256 from top of the file (lines 4 and 5), not from stable do block. Also, move stable do block above bottle do block. You can refer to a gist of tmux recipe here - https://gist.github.com/anonymous/e49e8844e198637057d1 .

@indiesquidge
Copy link
Contributor Author

Thanks, @rakkesh. Would you mind explaining why the stable block needs to be above the bottle block?

@DomT4
Copy link
Member

DomT4 commented Oct 26, 2015

Clarity, largely. It makes it clear the bottles apply to stable.

@rakkesh
Copy link
Contributor

rakkesh commented Oct 27, 2015

@indiesquidge to verify whether your changes comply with Homebrew standards, run

$ brew audit --strict <formula_name>

@indiesquidge
Copy link
Contributor Author

@rakkesh I ran brew audit --strict tmux and looks like no offenses were detected

@rakkesh
Copy link
Contributor

rakkesh commented Oct 27, 2015

👍🏽

@dunn
Copy link
Contributor

dunn commented Oct 28, 2015

Merged in bd1b373, thanks!

@dunn dunn closed this in bd1b373 Oct 28, 2015
@Homebrew Homebrew locked and limited conversation to collaborators Jul 10, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants