On Thu, Aug 06, 2015 at 03:30:58PM +0200, Marek Chalupa wrote: > Hi, > > On 08/06/2015 01:49 PM, Davide Bettio wrote: > >Hello, > > > >On 2015-08-06 10:37, Marek Chalupa wrote: > >>the patch does not apply in the first place: > >> > >>Applying: Extend WAYLAND_DISPLAY and name parameter semantics to > >>support absolute paths. > >>fatal: corrupt patch at line 15 > >>Repository lacks necessary blobs to fall back on 3-way merge. > >>Cannot fall back to three-way merge. > > > >I hope the patch in my last mail can be applied. > >If it doesn't can you give me any hint about what should be fixed? > > Unfortunately, the patch still does not apply. Do you use git > send-email? Because it looks like the lines in the patch are > wrapped, not matching the code.
Yeah, the line wrapping for this patch is messed up. git send-email would be worth trying. Bryce > Regards, > Marek > > >>On line 756 before this new code we check if XDG_RUNTIME_DIR is set in > >>the environment and if it is not we return an error. But when you use > >>absolute path, you don't need XDG_RUNTIME_DIR to be set. > > > >v3 fixes this issue. > > > >>The same XDG_RUNTIME_DIR thing in this function. > >> > > > >This is going to be changed by another patch so if you don't mind I'm > >not going to change this if all the other patches are going to be accepted. > > > >Bye, > >Davide Bettio. > > > _______________________________________________ > wayland-devel mailing list > wayland-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
