Date: Sat, 02 Feb 2013 13:39:28 +0100 From: Barbara Guida <barbara.freebsd@gmail.com> To: Niclas Zeising <zeising@freebsd.org> Cc: x11@FreeBSD.org Subject: Re: x11-servers/xorg-server: patch failure with "WITH_NEW_XORG=true" Message-ID: <510D0900.5080500@gmail.com> In-Reply-To: <510D061E.1090302@gmail.com> References: <510D027A.2030204@gmail.com> <510D03AC.1050201@gmail.com> <510D0507.2070604@freebsd.org> <510D061E.1090302@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------010001090107080203090005 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Barbara Guida wrote: > Niclas Zeising wrote: >> On 02/02/13 13:16, Barbara Guida wrote: >>> Barbara Guida wrote: >>>> Hi, running make patch -C /usr/ports/x11-servers/xorg-server I'm >>>> getting this error: >>> >>>> ===> Applying extra patch >>>> /usr/ports/x11-servers/xorg-server/files/extra-new-arch-i386 1 out >>>> of 1 hunks failed--saving rejects to >>>> hw/xfree86/common/compiler.h.rej *** [do-patch] Error code 1 >>> >>>> I have WITH_NEW_XORG=true in my /etc/make.conf. >>> >>>> Looking at the files/extra-new-arch-i386 patch (ports/174286), it >>>> seems that it has been created starting from a version of >>>> xorg-server which is different from 1.10.6, hasn't it? >>> >>>> I did the same change in hw/xfree86/common/compiler.h from >>>> xorg-server-1.10.6 and recreated the patch and now the patch is >>>> applied successfully for me. Note that I have not tested it with >>>> clang. >>> >>>> cheers Barbara >>> >>> >>> I just found that this should be the same issue reported in ports/175776 >>> >>> >> >> Yes it is, and it surprises me. I can't reproduce it locally at all. I >> have to look into this more in detail I guess, since two reporters of >> the same issue probbly not is a fluke. How do you usually download the >> ports tree? >> Regards! >> > > I have the same failure in /usr/ports from portsnap and in my svn copy. > If it could be useful for a comparison, I'm sending compiler.h obtained after running make extract. As you can see and as reported by Tsurutani Naoki, the line which needs to be changed is #1374 here. --------------010001090107080203090005--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?510D0900.5080500>