<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">
Great, thanks for taking care of that.<br class="">
<div><br class="">
<blockquote type="cite" class="">
<div class="">On Oct 5, 2023, at 10:42 AM, Herby G <<a href="mailto:herby.gillot@gmail.com" class="">herby.gillot@gmail.com</a>> wrote:</div>
<br class="Apple-interchange-newline">
<div class="">
<div dir="ltr" class="">Apologies, that was a careless response. You are correct, it is indeed `p1`. I took a look:
<div class=""><br class="">
</div>
<div class=""><a href="https://github.com/macports/macports-ports/pull/20721" class="">https://github.com/macports/macports-ports/pull/20721</a><br class="">
</div>
<div class=""><br class="">
</div>
<div class="">The issue is that the final hunk of the patch is invalid. It needed to be edited to match the actual line present in `pith/pine.hlp`.</div>
</div>
<br class="">
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Thu, Oct 5, 2023 at 3:47 AM contextnerror <<a href="mailto:contextnerror@outlook.com" class="">contextnerror@outlook.com</a>> wrote:<br class="">
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div class="">
<div style="overflow-wrap: break-word;" class="">That fails even earlier, and on all of the files instead of just pine.
<div class=""></div>
</div>
<div style="overflow-wrap: break-word;" class="">
<div class=""><br class="">
<div class=""><br class="">
<blockquote type="cite" class="">
<div class="">On Oct 4, 2023, at 10:22 PM, Herby G <<a href="mailto:herby.gillot@gmail.com" target="_blank" class="">herby.gillot@gmail.com</a>> wrote:</div>
<br class="">
<div class="">
<div dir="ltr" class="">Attempt with `patch.pre_args -p0`</div>
<br class="">
<div class="">
<div dir="ltr" class="">On Wed, Oct 4, 2023 at 10:38 PM contextnerror <<a href="mailto:contextnerror@outlook.com" target="_blank" class="">contextnerror@outlook.com</a>> wrote:<br class="">
</div>
<blockquote style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex" class="">
Thanks for that advice.<br class="">
I tried to use the patch from <a href="https://repo.or.cz/alpine.git/patch/701aebc00aff0585ce6c96653714e4ba94834c9c" rel="noreferrer" target="_blank" class="">
https://repo.or.cz/alpine.git/patch/701aebc00aff0585ce6c96653714e4ba94834c9c</a><br class="">
This was with patch.pre_args -p1 applied as well.<br class="">
It’s failing at pith/pine.hlp: "Hunk #1 FAILED at 147.”<br class="">
Do I even need this file? I’m not sure how it’s related.<br class="">
<br class="">
<br class="">
> On Oct 4, 2023, at 6:49 AM, Joshua Root <<a href="mailto:jmr@macports.org" target="_blank" class="">jmr@macports.org</a>> wrote:<br class="">
> <br class="">
> On 4/10/2023 15:05, contextnerror wrote:<br class="">
>> I was hoping to update the portfile for alpine.<br class="">
>> Currently the 2.26 release will not build due to a passfile bug, but this was fixed in a newer commit. (<a href="https://repo.or.cz/alpine.git" rel="noreferrer" target="_blank" class="">https://repo.or.cz/alpine.git</a>)<br class="">
>> I had a few questions about how to implement this:<br class="">
>> - Should I add the changes as patchfiles, or just change the master site to the git repo?<br class="">
>> - Would the version still be 2.26 or something else?<br class="">
>> - Should I also add any of the other new fixes from git?<br class="">
> <br class="">
> Fetching from a VCS should be avoided if possible, since we can't mirror the source in that case, and fetching is more likely to fail on restrictive networks. So probably patchfiles.<br class="">
> <br class="">
> Usually we would not change the version when adding bug fix patches. If the version in the published ports tree were already 2.26 and you added a patch that changes the installed files in any way, you would of course increase the port's revision.<br class="">
> <br class="">
> Normally you don't want to pull in all the changes that exist in an upstream repo, simply because if they were considered ready to use there would be a new release containing them. Some projects have very slow release cycles though, so if that's the case
here, try to get some sense of the risk vs benefit for each change before deciding to incorporate it.<br class="">
> <br class="">
> - Josh<br class="">
<br class="">
</blockquote>
</div>
</div>
</blockquote>
</div>
<br class="">
</div>
</div>
</div>
</blockquote>
</div>
</div>
</blockquote>
</div>
<br class="">
</body>
</html>