X-Authentication-Warning: delorie.com: mail set sender to djgpp-bounces using -f X-Received: by 10.224.172.66 with SMTP id k2mr13527283qaz.4.1373041207745; Fri, 05 Jul 2013 09:20:07 -0700 (PDT) X-Received: by 10.49.4.201 with SMTP id m9mr251252qem.15.1373041207733; Fri, 05 Jul 2013 09:20:07 -0700 (PDT) Newsgroups: comp.os.msdos.djgpp Date: Fri, 5 Jul 2013 09:20:07 -0700 (PDT) In-Reply-To: Complaints-To: groups-abuse AT google DOT com Injection-Info: glegroupsg2000goo.googlegroups.com; posting-host=65.13.115.246; posting-account=p5rsXQoAAAB8KPnVlgg9E_vlm2dvVhfO NNTP-Posting-Host: 65.13.115.246 References: <713e6460-511d-4b27-a9a5-b07cc63fd02d AT googlegroups DOT com> User-Agent: G2/1.0 MIME-Version: 1.0 Message-ID: Subject: Re: HimemX patch (was Re: Rebuilding 2.04 from source) From: rugxulo AT gmail DOT com Injection-Date: Fri, 05 Jul 2013 16:20:07 +0000 Content-Type: text/plain; charset=ISO-8859-1 Bytes: 3322 Lines: 45 To: djgpp AT delorie DOT com DJ-Gateway: from newsgroup comp.os.msdos.djgpp Reply-To: djgpp AT delorie DOT com Errors-To: nobody AT delorie DOT com X-Mailing-List: djgpp AT delorie DOT com X-Unsubscribes-To: listserv AT delorie DOT com Precedence: bulk Hi, On Tuesday, July 2, 2013 5:52:32 AM UTC-5, Rod Pemberton wrote: > wrote in message > > news:fd61ee1c-d350-4961-aa09-a18014165080 AT googlegroups DOT com... > > > I'm sure it's easy to build, but my weak attempts to > > do so failed. (Well, the patch failed, which could mean > > my own failure, but generally I know that such tools > > are quite frail and picky, so I don't know.) I could > > probably patch by hand if necessary. "It's always > > something!" :-) > > Ok. I packaged up a new version. Just for completeness (at always seeing such annoying issues), here's the deal: ============================================= (Fri Jul 05, 11:09 AM) /tmp/doydoy # cat blah.sh #!/bin/sh md5sum [hH]imem* sed -i~ -e '1,/BEGIN---cut-here--/d' -e '/END---cut-here--/,$d' himem_rp.dif unzip -qja Himem332.zip SOURCE/HIMEMX.ASM patch -l HIMEMX.ASM himem_rp.dif -o himemx.rod unzip -qjao himem334-unofficial-rp.zip SOURCE/HIMEMX.ASM diff -was HIMEMX.ASM himemx.rod (Fri Jul 05, 11:10 AM) /tmp/doydoy # blah.sh 7ded523745ae836452402e402f02a11b Himem332.zip 866e5d607f18b6bda49ab54f621d2e0f himem334-unofficial-rp.zip 22ae67d811af236c5496c53e383a9b2b himem_rp.dif patching file HIMEMX.ASM Files HIMEMX.ASM and himemx.rod are identical ============================================= I don't use patch as much as diff, hence why I wasn't remembering the -l switch to ignore whitespace (same as diff -w). But yes, also source and patch must (apparently) match in line endings too. Instead of manually running dos2unix, here I just let Info-Zip fix that for me (-a to auto-convert). This seems unavoidable, however, as some files (e.g. GNU makefiles or Python or whatever) are sensitive to changes in whitespace and might break otherwise.