Pulled into server-1.10-branch as well (normally I like patches to stew in master for a while, but it's already been shipping in Solaris, Fedora, and XQuartz...)
4bfb22e..5752cc4 server-1.10-branch -> server-1.10-branch On Jun 1, 2011, at 6:47 PM, Keith Packard wrote: > On Wed, 01 Jun 2011 18:39:43 -0700, Keith Packard <[email protected]> wrote: >> On Thu, 2 Jun 2011 10:51:36 +1000, Dave Airlie <[email protected]> wrote: >>> On Thu, Jun 2, 2011 at 10:40 AM, Alan Coopersmith >>> <[email protected]> wrote: >>>> For what it's worth, this patch solved a crash reported by a user of my >>>> 1.10.1 >>>> packages when he ran xsetroot, so I'm pulling it into my 1.10.x packages >>>> and >>>> would also like to see it in 1.10-branch as well once it lands in master. >>>> >>>> (I pulled the patch from >>>> http://cgit.freedesktop.org/~daniels/xserver/commit/?id=0701a18b51213ae588cbe82069c0b6eefb8deae7 >>>> - but there is mismatching indentation in that version.) >>> >>> Already have it in Fedora xserver tree, not sure what part of the >>> process is getting in the way of this being in master already. >> >> Daniel pulled it into his tree and seemed interested in shepherding this >> into master, but hasn't sent a pull request for his tree (there are lots >> of unreviewed patches sitting there underneath the crash fix). >> >> I'll go ahead and apply it to master. > > I cherry picked this from Daniel's tree as the mail message had been > scrambled a bit. > db228d3..c5b72fd master -> master > > Btw, I think there's another bug in InitRootWindow: > > } else if (pScreen->canDoBGNoneRoot && bgNoneRoot) { > pWin->backgroundState = XaceBackgroundNoneState(pWin); > pWin->background.pixel = pScreen->whitePixel; > backFlag |= CWBackPixmap; > > That should probably use CWBackPixel instead of CWBackPixmap. > > -- > [email protected] _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
