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

Add txt2tags and change manpages of some programs #31786

Merged
merged 3 commits into from Jul 10, 2021

Conversation

meator
Copy link
Contributor

@meator meator commented Jul 3, 2021

General

Have the results of the proposed changes been tested?

  • I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
  • I generally don't use the affected packages but briefly tested this PR

Does it build and run successfully?

(Please choose at least one native build and, if supported, at least one cross build. More are better.)

  • I built this PR locally for my native architecture, (x86_64-glibc)
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • aarch64-musl
    • armv7l
    • armv6l-musl

This pull request adds the txt2tags package, adds a manpage and a missing file to grml-zsh-config and removes the pre-generated manpage in xdgmenumaker.

The txt2tag package was supposed to be added, but was rejected because it only had a python2 version at the time. There is a python3 version now, so I want to add it here. The xdgmenumaker package has to include a precompiled version of its manpage in files/, because the txt2tags package isn't in the repo (more info here). This pull request removes the premade manpage. And it adds the manpage of grml-zsh-config, which depends on txt2tags, into the package. It also adds the etc/zsh/keephack file to grml-zsh-config.

@meator
Copy link
Contributor Author

meator commented Jul 3, 2021

I have no idea why the x86_64-musl check fails. The package builds successfully, the do_check is the problem. I can not do the check locally in crossbuild. I will look into it later.

@meator meator changed the title Add txt2tags and change manpages of some programs Add txt2tag` and change manpages of some programs Jul 3, 2021
@meator meator changed the title Add txt2tag` and change manpages of some programs Add txt2tags and change manpages of some programs Jul 3, 2021
@meator
Copy link
Contributor Author

meator commented Jul 3, 2021

I fixed it. Thanks @paper42!

Copy link
Member

@Chocimier Chocimier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for following up, removing prebuild files from repo is a gain.

srcpkgs/txt2tags/template Outdated Show resolved Hide resolved
@meator
Copy link
Contributor Author

meator commented Jul 4, 2021

Should I leave the revision of xdgmenumaker as is?

meator added 3 commits July 9, 2021 21:19
This commit adds the python3 version of txt2tags.
The pre-generated man page is not needed anymore, because txt2tags is in the
repo. More info at void-linux#14645.
This commit generates the grmlzshrc(5) man page via txt2tags and adds
it to the package and adds the etc/zsh/keephack file  into the
package.
@Chocimier
Copy link
Member

Manpage changed minimally, it's okay to revbump.

@Chocimier Chocimier merged commit 307c840 into void-linux:master Jul 10, 2021
@meator meator deleted the txt2tags branch July 12, 2021 06:32
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 10, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants