Subject: X11 R6 patches adjusted for fix-04
To: None <port-sparc@netbsd.org>
From: Greg Earle <earle@isolar.Tujunga.CA.US>
List: port-sparc
Date: 09/03/1994 21:05:57
Having decided that it was about time I got off my *ss and did something
useful for the project (however small), I redid the R6 NetBSD/SPARC patches
so they could be applied to an R6 patched up through fix-04.

Not that this is any big deal, of course, since it turned out there were only
3 things that went wrong with the originals:

(1) The first two patches to xc/config/imake/imake.c have already been made
    in fix-04, so they can be taken out.  Yay!

(2) The fix to sunIo.c failed because a few lines were added in a Consortium
    fix right before the actual changed line, making the surrounding context
    lines wrong.

(3) The fixes to sunCfb.c worked, but they were off by 13 lines, so I re-gen'd
    the patch.

Thanks to the wonders of "gzip -9" it's only 80 uuencoded lines, so
hopefully no one will be too pissed off if I include them here.  (This e-mail
thus becomes 5.8 K total, hope no one's paying by the byte (-: )

Hope this is useful.

	- Greg

P.S. Many, many thanks to the Oz team for making these in the first place!!!

----------------------------- >8  Cut here  8< -----------------------------
begin 644 X11R6_NetBSD_sparc_patches.fix-04.gz
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
9\/KTY/S@%,TT9D]XM?G%?P!1$K7=9"\``"<_
`
end

------------------------------------------------------------------------------