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

Upstream merge #217

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Upstream merge #217

wants to merge 8 commits into from

Conversation

Ckath
Copy link
Contributor

@Ckath Ckath commented Jul 14, 2021

gets repo synced with upstream again, not a lot going on besides some vanity things like the colorscheme change. a lot of the changes ended up being all related to their automatic updating. and refacturing stuff to new files for no good reason.

would be good to see if I missed anything or if this breaks anything, but I highly doubt it with these few things.

it was by choice that I didnt add the commits with git am in favor of git apply. besides personal preference with the --reject handling I'm also not sure if the audacity commitors would appreciate having their name tagged onto this repos commit history.
maybe good to decide a standard way to go about these upstream merges, for now just went with the generated commit titles from the upstream patch script. they can always be squash merged away.

  • I made sure the code compiles on my machine
  • I made sure there are no unnecessary changes in the code
  • I made sure the title of the PR reflects the core meaning of the issue you are solving
  • I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
  • I have confirmed that my code does not introduce intentional security flaws

@Ckath
Copy link
Contributor Author

Ckath commented Jul 14, 2021

I left out most of the ones doing anything with the buildsystem as well since theres still ongoing efforts to bin it or at least get rid of conan so merging anything related to that would have been pointless

@namazso
Copy link

namazso commented Jul 17, 2021

for licensing reasons original authors should probably be kept

@Ckath
Copy link
Contributor Author

Ckath commented Jul 17, 2021

would mentioning them in the commits be enough? or here in the pr?
or does that only hold up if I 1:1 the commits with original authors

@namazso
Copy link

namazso commented Jul 17, 2021

Well, the point is that they are in fact the copyright holders here with GPL. Best would probably be just keeping the authorship on the commits intact.

@MarinaGryphon
Copy link

Well, the point is that they are in fact the copyright holders here with GPL. Best would probably be just keeping the authorship on the commits intact.

GPL does not require attribution by default, but you can require it as a separate requirement, IIRC.

@mariaWitch
Copy link
Contributor

I will be adding multiple patches from upstream into this patch. (As well as a general update to the gitignore.)

@Ckath Ckath mentioned this pull request May 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants