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

addpkg(x11/rnote): 0.11.0 #21524

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

addpkg(x11/rnote): 0.11.0 #21524

wants to merge 1 commit into from

Conversation

EDLLT
Copy link

@EDLLT EDLLT commented Sep 20, 2024

Fixes #17655

Thanks @Biswa96 @TomJo2000 @Doublonmousse @romanovj @askorbinovaya-kislota and everyone else for your help

@EDLLT
Copy link
Author

EDLLT commented Sep 20, 2024

Seems like it needs tabs for indentation
I need to sleep now, I'll probably fix it tmrw

Copy link
Member

@TomJo2000 TomJo2000 left a 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.

x11-packages/rnote/build.sh Show resolved Hide resolved
x11-packages/rnote/build.sh Outdated Show resolved Hide resolved
x11-packages/rnote/build.sh Outdated Show resolved Hide resolved
x11-packages/rnote/build.sh Outdated Show resolved Hide resolved
x11-packages/rnote/build.sh Outdated Show resolved Hide resolved
x11-packages/rnote/remove-rodio-audio.patch Outdated Show resolved Hide resolved
x11-packages/rnote/build.sh Outdated Show resolved Hide resolved
@TomJo2000
Copy link
Member

Almost forgot the most important thing.

A huge thanks to you for your work and contribution.

Copy link
Member

@TomJo2000 TomJo2000 left a 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.

x11-packages/rnote/build.sh Outdated Show resolved Hide resolved
x11-packages/rnote/build.sh Outdated Show resolved Hide resolved
x11-packages/rnote/build.sh Outdated Show resolved Hide resolved
x11-packages/rnote/build.sh Outdated Show resolved Hide resolved
@TomJo2000
Copy link
Member

Alright I have it building locally.
And I've done most of the cleanup I mentioned above.
Will be pushing that shortly.

@TomJo2000
Copy link
Member

TomJo2000 commented Sep 21, 2024

Alright, I'm gonna go get some sleep, but to recap.

  • Build script is cleaned up
  • upstream gettext version is synced to our gettext package
  • gettext-sys crate version gets automatically fetched from crates.io
  • and we're building both the CLI and GUI.

We have a couple non-critical housekeeping items still open, mostly related to PulseAudio support.
And I'd appreciate it if you could do some on-device testing with the CI built rnote package.

To that end;


(This is a pre-written, saved reply.)
If you want to test this PR please download the appropriate DEB package(s)
from the build artifacts of the associated PR's latest CI run.
Screenshot_20240619_232413

After downloading the build artifact, make sure to unzip and un-tar it.

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

Copy link
Member

@TomJo2000 TomJo2000 left a 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

@EDLLT EDLLT force-pushed the rnote branch 5 times, most recently from 90e56c2 to 93d66c7 Compare September 22, 2024 17:47
@EDLLT
Copy link
Author

EDLLT commented Sep 22, 2024

I think that's about it.
Changed maintainer to me and made gettext work with the patches regardless of its version.
I will now test building locally before squashing everything into one commit

@TomJo2000
Copy link
Member

TomJo2000 commented Sep 22, 2024

I've removed the now redundant gettext_version variable,
revised the comments in the __fetch_gettext_rs() function
and added committer attribution for Biswa and myself.

You will need to rebase your development branch using git -c pull.rebase=true pull again before making further changes.

Also please make sure to use git push --force-with-lease=rnote when pushing, to not accidentally clobber changes.

@EDLLT
Copy link
Author

EDLLT commented Sep 22, 2024

git push --force-with-lease=rnote

Should I squash everything into one commit now?
I don't think there's anything left and my local build was successful

@TomJo2000
Copy link
Member

TomJo2000 commented Sep 22, 2024

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.
Since we have 4 commits that would be git rebase -i HEAD~4.

The rebase queue gets walked through from top to bottom.
So we want to pick the 1st commit, and squash the other 3.

The final commit message should just be:

addpkg(x11/rnote): 0.11.0

Co-authored-by: Biswapriyo Nath <[email protected]>
Co-authored-by: TomIO <[email protected]>

@EDLLT EDLLT changed the title fix(x11/rnote): Fix compilation addpkg(x11/rnote): 0.11.0 Sep 22, 2024
Co-authored-by: EDllT <[email protected]>
Co-authored-by: TomIO <[email protected]>
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.

[Package]: rnote
3 participants