-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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
addpkg(x11/rnote): 0.11.0 #21524
addpkg(x11/rnote): 0.11.0 #21524
Conversation
Seems like it needs tabs for indentation |
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.
This looks very close to being done,
I do have a couple housekeeping items we need to take care of though.
(This is a pre-written, saved reply.)
Also please make sure to keep your commits squashed.
For adding to a single commit you can use git commit --amend
.
Since you already have multiple commits on your branch though,
you'll need to squash those with git rebase -i HEAD~<n>
first.
(Where <n>
is the number of commits you want to modify.
Please make sure to only modify your commits.)
https://www.baeldung.com/ops/git-squash-commits#1-squash-the-last-x-commits
Since squashing or amending commits changes the git history you will need to force push any such changes.
e.g. git push --force
,
or preferably git push --force-with-lease=branchname
to make sure you aren't clobbering any refs you haven't fetched locally yet.
Almost forgot the most important thing. A huge thanks to you for your work and contribution. |
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.
Missed a couple things on the initial pass.
Alright I have it building locally. |
d4b97ba
to
3945e03
Compare
Alright, I'm gonna go get some sleep, but to recap.
We have a couple non-critical housekeeping items still open, mostly related to PulseAudio support. To that end; (This is a pre-written, saved reply.) After downloading the build artifact, make sure to Detailed instructions, if needed.
# finding out what architecture you need
# architecture is just below the TERMUX_VERSION
termux-info
# e.g.
# [...]
# TERMUX_MAIN_PACKAGE_FORMAT=debian
# TERMUX_VERSION=0.118.0
# TERMUX__USER_ID=0
# Packages CPU architecture:
# aarch64
# [...]
# =======================
# make sure `unzip` and `tar` are installed using
pkg install unzip tar
# unzip the artifact (if you have a different architecture this might be arm, i686 or x86_64 instead)
unzip debs-aarch64-*.zip
# untar the artifact
tar xf debs-aarch64-*.tar
# You should now have a debs/ directory in your current working directory
# Install the packages from the local source using
pkg install -- ./debs/*.deb
# to clean up, you can remove the debs/ directory, .tar file and .zip file
rm -rfi debs debs-aarch64-*.zip debs-aarch64-*.tar |
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.
And since the remaining items aren't what I'd consider critical, let me change my review to an approval.
By the way, if you would like to make further contributions on this branch make sure to first rebase your local copy using:
git -c pull.rebase=true pull
90e56c2
to
93d66c7
Compare
I think that's about it. |
I've removed the now redundant You will need to rebase your development branch using Also please make sure to use |
Should I squash everything into one commit now? |
Either you or I can do that, but I think it'd be good practice for you. The rebase queue gets walked through from top to bottom. The final commit message should just be:
|
When will this package be merged |
Should be good to merge. |
Co-authored-by: EDllT <[email protected]> Co-authored-by: TomIO <[email protected]>
Fixes #17655
Thanks @Biswa96 @TomJo2000 @Doublonmousse @romanovj @askorbinovaya-kislota and everyone else for your help