-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
edid-decode: update to 20230831 #20270
Conversation
You've also completely reformatted the portfile's whitespace, which makes it hard to see the non-whitespace changes. If you want to change the whitespace, please separate this into two commits: one that only changes the whitespace, and one that only does non-whitespace changes. If you're changing the whitespace, please add a blank line after the modeline. You've added |
I did this because I was instructed on a previous PR that the whitespace in the Portfile must be aligned to a tabstop of 4.
I was under the impression that commits must be squashed for a PR, is this not the case?
Should I patch the Makefile for now, or should I wait until an upstream fix is applied for this update? |
@ryandesign I've sent a patchfile to the maintainer Hans Verkuil to use CXXFLAGS instead of CFLAGS. For now, to keep things clean I've created a new branch that simply revises the existing version (20230804) to specify C++11 mode, apply the CXXFLAGS patchfile, and add a blank line after the modeline to satisfy Also, does the entire Portfile need to use the same alignment for columns, or only within each blank-line-delimited "section"? If the former, then I can create a further PR to adjust the tabstops to match each other. |
You should squash any commits that aren't relevant to someone looking at the changes in the future, like tweaks or fixes people request. Whitespace modifications should indeed be made in a distinct commit if possible so people can look at the substantive changes more easily. |
Awesome, thank you for the guidance! Should I create a new clean PR as I outlined here or just amend this PR? |
You can just force push a new set of commits onto this PR. It's better that way so that the history of the request is available to those reviewing it. |
ping @wwalexander |
I wouldn't say "must", but it is strongly preferred. It is what the modeline says. And the port was already aligned at 4-space tabstops before your changes. If the only reason why you were increasing the width of column 1 was to accommodate the length of "configure.cxxflags-append" then the usual solution is to wrap that line instead, e.g.: configure.cxxflags-append \
-std=c++11
As it says in the PR checklist, commits should be minimized. Per the linked documentation in the guide, that means "one commit per logical change". If your PR contains one logical change (e.g. update a port to a new version), there should be one commit for that. We don't want, for example, to see a PR where you submit an update, CI fails, and then you make another commit to fix the CI failure. Those two should be squashed into one since they are part of the single logical task of updating the port. However, if you have multiple logical changes in your PR, such as in this case 1. updating the port and 2. adjusting whitespace, there should be multiple separate commits. Often, multiple obvious small logical commits will be combined into one commit, but extensive whitespace changes should always be in a commit by themselves because otherwise you cannot easily see from a diff what non-whitespace changes were made.
If you can figure out a patch that works, you can add it here. Put the URL where you submit the patch to the maintainer at the top of the patchfile so that it can be followed up on later. If the developer already has a patch for it, you can use theirs, and put the URL where you found it at the top of the patchfile. |
* add blank line after modeline as specified by `port lint --nitpick` * move destroot args to separate lines References: https://trac.macports.org/ticket/67934
* patch Makefile to use CXXFLAGS instead of CFLAGS * specify C++ 2011 to support building on older machines References: https://trac.macports.org/ticket/67934
* update to 20230831
320f591
to
c85c6d2
Compare
I've created a new set of commits that's hopefully more readable and useful.
I've added a patch to this port to make the Makefile use CXXFLAGS.
I originally sent the patch directly to the author's email, but it may have gotten lost in the shuffle. Waiting on approval to join the project's mailing list but I'll send the patch there and add a link within the patchfile as soon as I can. |
Also, add configure and compiler options to specify C++11 on older systems as detailed in https://trac.macports.org/ticket/67934
Description
Type(s)
Tested on
macOS 13.5.1 22G90 arm64
Xcode 14.3.1 14E300c
Verification
Have you
port lint --nitpick
?sudo port test
?sudo port -vst install
?