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.

Sign up for GitHub

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

Jump to bottom

gpatch: add gpatch binary to avoid conflict with macOS patch #174687

Merged
merged 6 commits into from
Oct 22, 2024
Merged

gpatch: add gpatch binary to avoid conflict with macOS patch #174687

merged 6 commits into from
Oct 22, 2024

Conversation

kit-ty-kate
Copy link
Contributor

  • Have you followed the guidelines for contributing?
  • Have you ensured that your commits follow the commit style guide?
  • Have you checked that there aren't other open pull requests for the same formula update/change?
  • Have you built your formula locally with HOMEBREW_NO_INSTALL_FROM_API=1 brew install --build-from-source <formula>, where <formula> is the name of the formula you're submitting?
  • Is your test running fine brew test <formula>, where <formula> is the name of the formula you're submitting?
  • Does your build pass brew audit --strict <formula> (after doing HOMEBREW_NO_INSTALL_FROM_API=1 brew install --build-from-source <formula>)? If this is a new formula, does it pass brew audit --new <formula>?

This ensures there is a simple way to distinguish between macOS patch (/usr/bin/patch) and homebrew gpatch. Macports installs its version as gpatch and so does BSDs but Homebrew seems to be the only that does not do that.
This PR adds a link rather than rename the binary to keep backward compatibility with the old behaviour.

@github-actions github-actions bot added the deprecated license Formula uses a deprecated SPDX license which should be updated label Jun 16, 2024
@carlocab carlocab added CI-no-bottles Merge without publishing bottles and removed deprecated license Formula uses a deprecated SPDX license which should be updated labels Jun 16, 2024
@github-actions github-actions bot added the deprecated license Formula uses a deprecated SPDX license which should be updated label Jun 17, 2024
SMillerDev
SMillerDev reviewed Jun 17, 2024
View reviewed changes
Formula/g/gpatch.rb Outdated Show resolved Hide resolved
@github-actions github-actions bot added the autosquash Automatically squash pull request commits according to Homebrew style. label Jun 17, 2024
@github-actions github-actions bot removed the autosquash Automatically squash pull request commits according to Homebrew style. label Jun 17, 2024
SMillerDev
SMillerDev reviewed Jun 19, 2024
View reviewed changes
Formula/g/gpatch.rb Outdated Show resolved Hide resolved
@github-actions github-actions bot added the autosquash Automatically squash pull request commits according to Homebrew style. label Jun 19, 2024
@jhwoodyatt
Copy link

Does this patch work if gpatch is installed keg-only?

@github-actions github-actions bot removed the autosquash Automatically squash pull request commits according to Homebrew style. label Jul 1, 2024
@kit-ty-kate
Copy link
Contributor Author

Does this patch work if gpatch is installed keg-only?

this is a good question. Does any of the homebrew maintainers know if it's possible to change the behaviour of a package in a keg-only context?

@github-actions GitHub Actions
Copy link
Contributor

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@github-actions github-actions bot added the stale No recent activity label Jul 25, 2024
@kit-ty-kate
Copy link
Contributor Author

not stale. Waiting for answer

@github-actions github-actions bot removed the stale No recent activity label Jul 26, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@github-actions github-actions bot added the stale No recent activity label Aug 16, 2024
@kit-ty-kate
Copy link
Contributor Author

not stale. Waiting for answer

@github-actions github-actions bot removed the stale No recent activity label Aug 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 7, 2024

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@github-actions github-actions bot added the stale No recent activity label Sep 7, 2024
@kit-ty-kate
Copy link
Contributor Author

not stale. Waiting for answer from the maintainers

@github-actions github-actions bot removed the stale No recent activity label Sep 11, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 2, 2024

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@github-actions github-actions bot added the stale No recent activity label Oct 2, 2024
@kit-ty-kate
Copy link
Contributor Author

not stale. Waiting for answer from the maintainers

@carlocab carlocab removed the CI-no-bottles Merge without publishing bottles label Oct 22, 2024
@github-actions GitHub Actions
Copy link
Contributor

🤖 An automated task has requested bottles to be published to this PR.

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Oct 22, 2024
@BrewTestBot BrewTestBot added this pull request to the merge queue Oct 22, 2024
Merged via the queue into Homebrew:master with commit 35ca53e Oct 22, 2024
15 checks passed
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Oct 22, 2024
@kit-ty-kate
Lookup at gpatch before patch on macOS now that both homebrew and mac…
0fc233a 
…ports expose gpatch as gpatch

Homebrew changed behaviour in Homebrew/homebrew-core#174687
@kit-ty-kate kit-ty-kate mentioned this pull request Oct 22, 2024
Open
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Oct 22, 2024
@kit-ty-kate
Lookup at gpatch before patch on macOS now that both homebrew and mac…
9d0e84f 
…ports expose gpatch as gpatch

Homebrew changed behaviour in Homebrew/homebrew-core#174687
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Oct 28, 2024
@kit-ty-kate
Lookup at gpatch before patch on macOS now that both homebrew and mac…
7c1d171 
…ports expose gpatch as gpatch

Homebrew changed behaviour in Homebrew/homebrew-core#174687
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Nov 12, 2024
@kit-ty-kate
Update the tests after Homebrew/homebrew-core#174687
7aabd3f
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Nov 12, 2024
@kit-ty-kate
Update the tests now that homebrew renamed the GNU patch binary to gp…
ef39310 
…atch (see Homebrew/homebrew-core#174687)
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Nov 12, 2024
@kit-ty-kate
Update the tests now that homebrew renamed the GNU patch binary to gp…
22917d2 
…atch (see Homebrew/homebrew-core#174687)
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Nov 12, 2024
@kit-ty-kate
Update the tests now that homebrew renamed the GNU patch binary to gp…
c6e2b0c 
…atch (see Homebrew/homebrew-core#174687)
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Nov 13, 2024
@kit-ty-kate
Update the tests now that homebrew renamed the GNU patch binary to gp…
b3ed73c 
…atch (see Homebrew/homebrew-core#174687)
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Nov 13, 2024
@kit-ty-kate
Update the github action scripts now that homebrew renamed the GNU pa…
4e99ad3 
…tch binary to gpatch (see Homebrew/homebrew-core#174687)
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Nov 13, 2024
@kit-ty-kate
Lookup at gpatch before patch on macOS now that both homebrew and mac…
3e6f1f6 
…ports expose gpatch as gpatch

Homebrew changed behaviour in Homebrew/homebrew-core#174687
kit-ty-kate added a commit to kit-ty-kate/opam that referenced this pull request Nov 13, 2024
@kit-ty-kate
Update the tests now that homebrew renamed the GNU patch binary to gp…
284b807 
…atch (see Homebrew/homebrew-core#174687)
rjbou pushed a commit to rjbou/opam that referenced this pull request Nov 14, 2024
@kit-ty-kate @rjbou
Update the github action scripts now that homebrew renamed the GNU pa…
565711f 
…tch binary to gpatch (see Homebrew/homebrew-core#174687)
@rjbou rjbou mentioned this pull request Nov 14, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SMillerDev SMillerDev SMillerDev left review comments

@MikeMcQuaid MikeMcQuaid MikeMcQuaid left review comments

@p-linnane p-linnane p-linnane approved these changes

@github-actions github-actions[bot] github-actions[bot] approved these changes

Assignees
No one assigned
Labels
CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@kit-ty-kate @jhwoodyatt @iMichka @MikeMcQuaid @SMillerDev @p-linnane @BrewTestBot @carlocab