x11-servers/xorg-server: patch failure with "WITH_NEW_XORG=true"

Barbara Guida barbara.freebsd at gmail.com
Sat Feb 2 12:11:37 UTC 2013


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQEcBAEBAgAGBQJRDQJ2AAoJECfdb9Y99fdQPNEIAO6UFL3GS2RUV1JMjA80vXIw
Om8/LfSPMJ8Fv3wpPQ0EFGtpif3m8E2M6+PNfhiRNO1/6VUEq6SK+CCAjT+SWCbs
7vjR04WYGKKyj/axbaq4cXtxveimbyCTCZK66fkUaRs6snGIIe14YWkztxYoXojr
4+TicqYHdJjHbn6PKC/UZo5mtlDWEtYHLYlJ1kRLNlA3lBBsileQPcKE55uD572h
IrpVdGd3TPacDX9OQ2x4DUt+CwjlAiOvnCzqb/6rmIV5iKDk27gDBONGqwWSG5nB
bJDHskhAjO7ElEX4bQukKlznoZSzfDq4t8OhSka38fr6J3uEnoUTiJFUMUT8Dbo=
=Tx5p
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: xorg-server.diff
Type: text/x-patch
Size: 1224 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-x11/attachments/20130202/b23435cb/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: xorg-server.diff.sig
Type: application/octet-stream
Size: 287 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-x11/attachments/20130202/b23435cb/attachment.obj>


More information about the freebsd-x11 mailing list