ports/175776: patching x11-servers/xorg-server fails

[Niclas Zeising]

On 02/02/13 16:25, Barbara Guida wrote:
> Niclas Zeising wrote:
>> On 02/02/13 13:52, Tsurutani Naoki wrote:
>>> xorg-server-1.10.6_2,1 xorg-vfbserver-1.10.6_1,1 are installed. 
>>> All the Xorg related ports are installed after setting
>>> "WITH_NEW_XORG=1".
>>>
>>> Niclas Zeising <zeising at freebsd.org> wrote:
>>>
>>>> On 02/02/13 13:09, Tsurutani Naoki wrote:
>>>>> Thank you for your reply.
>>>>>
>>>>> Both files on my host are just same with that on SVN
>>>>> repository you pointed. I think only
>>>>> "files/extra-new-arch-i386" is used with "WITH_NEW_XORG=1". 
>>>>> The file "hw/xfree86/common/compiler.h" made by "make
>>>>> extract" differs from the one expeced by the patch file (see
>>>>> line 1335 and 1371). Is there anything wrong on my host or on
>>>>> my thought ?
>>>>>
>>>>
>>>> Only extra-new-arch-i386 is used when compiling with
>>>> WITH_NEW_XORG. Both patches fixes the same issue, but in
>>>> different versions of xorg-server, the old and the new.  Which
>>>> version of xorg-server are getting built?  Is it the correct
>>>> one?  As I previously said, I can't reproduce this issue, and
>>>> I've been running builds for different freebsd versions of i386
>>>> both with old and new xorg during the night without problems. 
>>>> Regards! -- Niclas Zeising
>>>>
>>>
> 
>> Hi! I finally managed to reproduce this, and a patch is in the
>> works.  Can you please try the attached patch?  Remember to apply
>> it with patch -E to remove empty files. Regards!
> 
> 
> It seems that extra-arch-i386 from (1) is missing, it's not created by
> the patch.
> 
> (1) @ line #13 of new patch
> +EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
> 
> 

Here is an updated patch.  Apparently, by default svn does not include
copied files in diffs, which caught me by surprise.
Regards!
-- 
Niclas Zeising
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ports.xorg-server.clangfix.diff
Type: text/x-patch
Size: 3261 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-x11/attachments/20130202/6c201ae5/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 834 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/freebsd-x11/attachments/20130202/6c201ae5/attachment.sig>