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

[Barbara Guida]

The following reply was made to PR ports/175776; it has been noted by GNATS.

From: Barbara Guida <barbara.freebsd at gmail.com>
To: Niclas Zeising <zeising at freebsd.org>
Cc: Tsurutani Naoki <turutani at scphys.kyoto-u.ac.jp>, 
 freebsd-x11 at freebsd.org, bug-followup at freebsd.org
Subject: Re: ports/175776: patching x11-servers/xorg-server fails
Date: Sat, 02 Feb 2013 16:50:44 +0100

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Niclas Zeising wrote:
 > 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!
 > 
 
 This one applied successfully for me! (tested with WITH_NEW_XORG=1).
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (FreeBSD)
 
 iQEcBAEBAgAGBQJRDTXUAAoJECfdb9Y99fdQ/14IANVDgK0O85h/N+CQLg0MOfU2
 0ZXQTkeKWAs48kSg02/4vmkvt3byHwAZmeUhhraPdc/hBGgEtl0/ymBsgtSu8ku9
 a05+XcSb4TRajoIXx+TgHGyQWFt+OofnZ1O603aFt1DZEVWHOCwS2M3BZJ0DzFUs
 nRl4t/pVNcXKfak1cCtmAs0IICSCku1w1g3ds4/C+n1gdvh44PspsaREYydHzV/U
 7TxqpiFS7m/EKtYPjSsee3fLuv3qHnZiOpsy+QMiIk9XbXXJJ6wJRMOIpY0/sXXE
 K+Yslw9DGafYqGR7UqRHC/mLqcfZU+5HEFDofIfSfvcFQ90anP+tvi04lrg25ok=
 =oc3I
 -----END PGP SIGNATURE-----