Re: patches for Darwin /MacOSX
SciFi <[email protected]>
| Newsgroups | gmane.comp.xfree86.devel |
|---|---|
| Message-ID | <[email protected]> |
On Thu, 05 Apr 2007 23:24:23 -0400, Yves de Champlain wrote: > > Le 07-04-05 à 20:29, SciFi a écrit : > >> On Wed, 04 Apr 2007 12:56:32 -0600, Marc Aurele La France wrote: >>> On Wed, 4 Apr 2007, Yves de Champlain wrote: >>>> I just posted many patches in bugzilla for Darwin/MacOSX. >>> >>>> http://bugs.xfree86.org/show_bug.cgi?id=1680 >>>> http://bugs.xfree86.org/show_bug.cgi?id=1681 >>> >>> Some of the issues you address have already been resolved since >>> 4.6.99.20, but I'll be going through these in the next little while. >>> >>> Thanks for the patches! >>> >>> Marc. >>> >>> +---------------------------------- >>> +----------------------------------+ >>> | Marc Aurele La France | work: 1-780-492-9310 | >>> | Academic Information and | fax: 1-780-492-1729 | >>> | Communications Technologies | email: [email protected] | >>> | 352 General Services Building >>> +----------------------------------+ >>> | University of Alberta >>> | | >>> | Edmonton, Alberta | Standard disclaimers apply >>> | >>> | T6G 2H1 >>> | | >>> | CANADA >>> | | >>> +---------------------------------- >>> +----------------------------------+ >>> XFree86 developer and VP. ATI driver and X server internals. >> >> Hello, >> >> We're not seeing any of these darwin changes in the CVS repo when >> following the directions at http://www.xfree86.org/cvs/ using the >> anoncvs/pserver method. I've been running the latest cvs client >> available at savannah.nongnu.org and much much more latest code (not >> Apple's backlevel stuff). We're just not seeing any of these changes >> coming thru a "cvs up" at all. > > These changes are not, as far as I know, in cvs. I just posted some > patches in bugzilla. > > When some XFree86 committer review them, then maybesome will get through > to cvs. > > If you want to try them already, fetch them from bugzilla and do the > patchwork ;-) > > yves Thanks for replying. I did grab your patches from both bugreports and ran patch with --dry-run on them to see that some of them now fail: [...] |--- programs/Xserver/Imakefile.orig 2007-04-04 00:55:28.000000000 -0400 |+++ programs/Xserver/Imakefile 2007-04-04 01:04:09.000000000 -0400 -------------------------- Patching file programs/Xserver/Imakefile using Plan A... Hunk #1 succeeded at 1603 (offset 7 lines). Hunk #2 succeeded at 1616 (offset 7 lines). Hunk #3 succeeded at 1627 (offset 7 lines). Hunk #4 succeeded at 1638 (offset 7 lines). Hunk #5 succeeded at 1646 (offset 7 lines). Hunk #6 FAILED at 1654. 1 out of 6 hunks FAILED -- saving rejects to file programs/Xserver/Imakefile.rej [...] |--- config/cf/darwin.cf.orig 2007-04-03 15:47:21.000000000 -0400 |+++ config/cf/darwin.cf 2007-04-04 09:40:43.000000000 -0400 -------------------------- Patching file config/cf/darwin.cf using Plan A... Hunk #1 succeeded at 29. Hunk #2 succeeded at 107. Hunk #3 FAILED at 169. Hunk #4 succeeded at 316 (offset 18 lines). 1 out of 4 hunks FAILED -- saving rejects to file config/cf/darwin.cf.rej [...] |--- programs/Xserver/hw/darwin/darwinKeyboard.c.orig 2007-04-03 16:10:12.000000000 -0400 |+++ programs/Xserver/hw/darwin/darwinKeyboard.c 2007-04-03 16:10:52.000000000 -0400 -------------------------- Patching file programs/Xserver/hw/darwin/darwinKeyboard.c using Plan A... Hunk #1 FAILED at 64. 1 out of 1 hunk FAILED -- saving rejects to file programs/Xserver/hw/darwin/darwinKeyboard.c.rej [...] |--- programs/Xserver/hw/darwin/Imakefile.orig 2007-04-03 16:19:32.000000000 -0400 |+++ programs/Xserver/hw/darwin/Imakefile 2007-04-03 16:20:10.000000000 -0400 -------------------------- Patching file programs/Xserver/hw/darwin/Imakefile using Plan A... Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- saving rejects to file programs/Xserver/hw/darwin/Imakefile.rej [...] |--- programs/Xserver/hw/darwin/quartz/Imakefile.orig 2007-04-04 09:40:54.000000000 -0400 |+++ programs/Xserver/hw/darwin/quartz/Imakefile 2007-04-04 09:41:55.000000000 -0400 -------------------------- Patching file programs/Xserver/hw/darwin/quartz/Imakefile using Plan A... Hunk #1 FAILED at 39. 1 out of 1 hunk FAILED -- saving rejects to file programs/Xserver/hw/darwin/quartz/Imakefile.rej [...] |--- programs/Xserver/hw/darwin/quartz/XServer.m.orig 2007-04-04 07:25:15.000000000 -0400 |+++ programs/Xserver/hw/darwin/quartz/XServer.m 2007-04-04 07:26:04.000000000 -0400 -------------------------- Patching file programs/Xserver/hw/darwin/quartz/XServer.m using Plan A... Hunk #1 FAILED at 91. 1 out of 1 hunk FAILED -- saving rejects to file programs/Xserver/hw/darwin/quartz/XServer.m.rej [...] The failed patches are probably due to the cvs repo being changed in those areas since xf-4_6_99_20 came out, as Marc mentioned. I see that my local cvs copy has these already applied: > CVSROOT: /home/x-cvs > Module name: xc > Changes by: [email protected]. 07/04/02 17:21:15 > > Log message: > 128. Update Darwin port with selected changes from X.Org and a liberal > sprinkling of build fixes (Marc La France, with help from > Frank J. R. Hanstick). [1] > CVSROOT: /home/x-cvs > Module name: xc > Changes by: [email protected]. 07/04/02 17:47:07 > > Log message: > Previous commit should have removed these. and everything up to including this: > CVSROOT: /home/x-cvs > Module name: xc > Changes by: [email protected]. 07/04/04 12:28:39 > > Log message: > 131. Fix installation of xkbcomp 'dir' files (Marc La France). But I have yet to see these come thru (as of "right now as I post this msg"): > CVSROOT: /home/x-cvs > Module name: xc > Changes by: [email protected]. 07/04/05 09:09:00 > > Log message: > 132. Address vulnerabilities CVE-2006-0747, CVE-2006-1861, CVE-1006-2661, > CVE-2007-1003, CVE-2007-1351, CVE-2007-1352 and CVE-2007-1667 > (Josh Bressers, Chris Evans, Sean Larsson, iDefense, Matthieu Herrb, > Marc La France). which probably aren't exactly related to darwin anyway... I was hoping 128 thru 131 would help the build & install issues I ran into, but I got stuck in some different places afterwards IIRC. I do have logs and remember most what I did to fix things up to that point. Are you able to sync with cvs head and rework your patches? I'll give it a try myself. Just want to also mention that I knew to back-up Apple's code in /usr/X11R6 and /etc/X11, because we install the new build right on top of Apple's there to keep their closed modules intact, and then hand-edit a few places under /etc/X11 to re-insert Apple's settings down there. I do wish Apple would open-up quartz-wm, I suppose OroborOSX could replace it to keep the Mac+X11 features comingled. ;) Thanks for reading. I'll come back later for status.