dev-util/quilt: fix broken patch

[hanetzer]

As it currently stands with USE="-graphviz" quilt-0.66-no-graphviz.patch
does not apply to the source tree. Fixed that and adjusted the patch to
be -p1 applicable.

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Signed-off-by: Marty E. Plummer hanetzer@startmail.com

[gentoo-bot]

Copyright policy change

Please note that on 2018-09-15 Trustees have approved new Gentoo copyright policy. All contributions made to Gentoo need to follow this policy. If you include the Signed-off-by line in your commit message, you indicate that you have read the policy and agree to its terms. For more detailed explanation, please see the new Gentoo copyright policy explained article.

Pull Request assignment

Submitter: @hanetzer
Areas affected: ebuilds
Packages affected: dev-util/quilt

dev-util/quilt: mpagano

At least one of the listed packages is maintained entirely by non-GitHub developers!

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.

---

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

[arthurzam]

I think a better version is:
use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
(I think ${PN}-0.66 is better than ${P} for future versions can easier reuse, and the version in the patch name represents the first version in which it is used)

[hanetzer]

true that. Also, just realized my in-use ::gentoo tree was out of date relative to my dev tree,
so this had already been fixed.

[gyakovlev]

@mpagano please take a look

[hanetzer]

@gyakovlev @mpagano this issue was actually already fixed, but it would probably
be a good idea to adjust the patch to -p1 and be explicit about the version as @arthurzam
mentioned above.

[gyakovlev]

ah, I should update then.
Hit that failure yesterday.

[a17r]

Why all those unrelated line changes in the patch?

[hanetzer]

@a17r Honestly, I just did USE=graphviz ebuild quilt-0.66.ebuild clean prepare (to unpack without
that patch applied), cd'd to ${S} and used quilt new, quilt edit to prep this patch (I was misreading
the emerge output as the patch didn't apply, not that it didn't exist) and manually did the edits in the
what I thought was broken patch. I'm fairly certain said patch had a bit of fuzz in the original one.

[a17r]

USE=-graphviz ebuild quilt-0.66.ebuild prepare applies fine here, what are you trying to fix?

Probably the bug that led to this was fixed in commit 9d80e44 already. That limits this PR to cosmetic changes only, and it is imo not worth your time to make you redo the patch file to remove the useless churn in order to get it mergeable.

[hanetzer]

@a17r mostly the point is to move it from p0 to p1 now (since I was apparently just out of date on
my live in-use tree), I honestly don't mind redoing the patch. Please reopen, because if I force push
over it with it closed, it won't be reopenable.

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2019-04-29 20:56 UTC
Newest commit scanned: e1aa9d6
Status: ✅ good

No issues found