Roderich, Have more or less figured out how to invoke Patch, this is the output it produced: Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ru PAR-Packer-1.013\myldr\Makefile.PL PAR-Packer-1.013_patched\myldr\Makefile.PL |--- PAR-Packer-1.013\myldr\Makefile.PL Thu Jan 26 19:51:55 2012 |+++ PAR-Packer-1.013_patched\myldr\Makefile.PL Tue Apr 10 15:08:37 2012 -------------------------- Patching file Makefile.PL using Plan A... Hunk #1 FAILED at 113. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.PL.rej Hmm... The next patch looks like a unified diff to me... can't find file to patch at input line 27 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- |NOOP)'; | } else { |diff -ru PAR-Packer-1.013\myldr\winres\pp.rc PAR-Packer-1.013_patched\myldr\winres\pp.rc |--- PAR-Packer-1.013\myldr\winres\pp.rc Thu Jan 26 19:51:55 2012 |+++ PAR-Packer-1.013_patched\myldr\winres\pp.rc Tue Apr 10 14:25:10 2012 -------------------------- File to patch: Skip this patch? [y] Skipping patch. Hunk #1 ignored at 5. 1 out of 1 hunk ignored Hmm...missing header for unified diff at line 37 of patch The next patch looks like a unified diff to me... can't find file to patch at input line 37 Perhaps you should have used the -p or --strip option? File to patch: Skip this patch? [y] Skipping patch. Hmm...missing header for unified diff at line 38 of patch The next patch looks like a unified diff to me... can't find file to patch at input line 38 Perhaps you should have used the -p or --strip option? and on and on... Regards DAS
On 1 October 2012 17:12, David Sedar <dave.se...@gmail.com> wrote: > Roderich, > I have installed cpan 'patch' 0.14 (and 'diff' for good measure). > However not sure when and where I should invoke it. > Running it before or after 'perl makefile.pl' and 'dmake' > in the PAR-Packer-1.013 folder produces the same output: > 'patching file Makefile.PL' > 'Assertion failed: hunk, file .\src\patch\2.5.9\patch-2.5.9-src\patch.c, > line 354' > 'This application has requested the Runtime to terminate it in an unusual > way, > Please contact the application's support team for more information' > > Could you please clarify what I am doing wrong > Regards > DAS > > On 30 September 2012 12:02, David Sedar <dave.se...@gmail.com> wrote: > >> Roderich, >> Many thanks for the diff file, but I am rather a newbie: >> exactly how do I apply it? >> Regards >> DAS >> >> On 29 September 2012 19:19, Roderich Schupp < >> roderich.sch...@googlemail.com> wrote: >> >>> On Sat, Sep 29, 2012 at 7:24 PM, David Sedar <dave.se...@gmail.com> >>> wrote: >>> > I can see the error, what is the fix please? >>> >>> Apply the attached patch (it's already in my source repository, but I >>> haven't made >>> a release yet). >>> >>> Cheers, Roderich >>> >> >> >