gui-apps/waybar: fix compilation with libfmt-8 #21506
Conversation
This PR applies a patch to waybar to build with libfmt-8. The upstream fix is already accepted, but not merged. Upstream: Alexays/Waybar#1144 Closes: https://bugs.gentoo.org/797649 Signed-off-by: Jonas Toth <gentoo@jonas-toth.eu>
Pull Request assignmentSubmitter: @JonasToth gui-apps/waybar: @JonasToth, @gentoo/proxy-maint Linked bugsBugs linked: 797649 In order to force reassignment and/or bug reference scan, please append Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide |
gentoo-bot
added
self-maintained
Pull request CI reportReport generated at: 2021-07-02 13:10 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
| diff --git a/include/util/format.hpp b/include/util/format.hpp | ||
| index 288d8f0..61e8c85 100644 |
There was a problem hiding this comment.
Rather than put the upstream link in the commit message it'd be nice to have it in the patch itself (to show its origin), add the bgo link in it too. Links in commit message also annoyingly notify upstream's issue with every rebase on github.
I could do it myself on merge but be nice to strip useless metadata too, e.g. these "diff --git" or index lines repeated through the patch, the sed in the devmanual[1] is handy for (and so is that whole page).
Also, looks like upstream's PR was merged, so may want to update the commit message for that too.
[1] https://devmanual.gentoo.org/ebuild-writing/misc-files/patches/index.html
There was a problem hiding this comment.
Also, just noticed both patches are identical.
It's okay to have 1 patch with a mismatching version used for both.
| @@ -50,6 +50,8 @@ DEPEND=" | |||
| " | |||
| RDEPEND="${DEPEND}" | |||
|
|
|||
| PATCHES=( "${FILESDIR}/${P}-fmt-8.0.0.patch" ) | |||
There was a problem hiding this comment.
Just a nitpick, not necessary but it's nice to have the patch on its own line, fits better with what other ebuilds do and easier to add more or remove without restyling, e.g.
PATCHES=(
file.patch
)
|
Well, the other one got merged first, so please rebase too :) Again, no need for revbumps for a build failure, so keep the new revision rather than revbump again. |
|
Tank you, I am on vacation right now, so the changes will need a few more days. But at the end of the week this pr should be ready :) |
@JonasToth In that case I could finish the little changes there is to do if you ack, considering this is broken in ~arch right now may be better not to wait too long. |
|
Yes, I am fine with that. I have no way to do this until at least Saturday. Thank you very much! |
This PR applies a patch to waybar to build with libfmt-8.
The upstream fix is already accepted, but not merged.
Upstream: Alexays/Waybar#1144
Closes: https://bugs.gentoo.org/797649
Signed-off-by: Jonas Toth gentoo@jonas-toth.eu