Date: Sat, 02 Feb 2013 13:11:38 +0100 From: Barbara Guida <barbara.freebsd@gmail.com> To: x11@FreeBSD.org Subject: x11-servers/xorg-server: patch failure with "WITH_NEW_XORG=true" Message-ID: <510D027A.2030204@gmail.com>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------080003050700080007040503 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----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----- --------------080003050700080007040503 Content-Type: text/x-patch; name="xorg-server.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xorg-server.diff" Index: x11-servers/xorg-server/files/extra-new-arch-i386 =================================================================== --- x11-servers/xorg-server/files/extra-new-arch-i386 (revision 311421) +++ x11-servers/xorg-server/files/extra-new-arch-i386 (working copy) @@ -1,11 +1,11 @@ ---- hw/xfree86/common/compiler.h.orig 2012-05-17 19:09:03.000000000 +0200 -+++ hw/xfree86/common/compiler.h 2013-01-18 13:59:18.366436857 +0100 -@@ -1335,7 +1335,7 @@ +--- hw/xfree86/common/compiler.h.orig 2011-06-11 18:55:47.000000000 +0200 ++++ hw/xfree86/common/compiler.h 2013-02-02 12:34:00.000000000 +0100 +@@ -1371,7 +1371,7 @@ - #if !defined(__SUNPRO_C) - #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) --#ifdef GCCUSESGAS -+#if defined(GCCUSESGAS) || defined(__clang__) + # if !defined(__SUNPRO_C) + # if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) +-# ifdef GCCUSESGAS ++# if defined(GCCUSESGAS) || defined(__clang__) /* * If gcc uses gas rather than the native assembler, the syntax of these --------------080003050700080007040503 Content-Type: application/octet-stream; name="xorg-server.diff.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="xorg-server.diff.sig" iQEcBAABAgAGBQJRDQJ6AAoJECfdb9Y99fdQpKwH/3KSsiJ2dxHdkcCO0z0eWvnFUX4f+ASC zxa0mM1mmpaJLzZCQFuDt2WAriGmfhyp7rD/+7RigfnpCw795eMrf2O2pPYBAE6tZS0yglhQ REX9Zf4EU0u/6qRi39np6W/YZeopzq69vftcrKRHP/mSy299XgJpfgx2ei4Zbm5pSoOcGzx1 BEsihEQnHvcwAf/9U9qsm/DvoqQlywg6KFIxR9CikdV//J7aiEmafPHWiLN8kI+59M4fmXmQ PuJpC1qYOh1eQWZFBiAzwv1lAaoolGJCD8YLYi9hk5wDwhsI4gfcqmAF3Sx3d4B5jVD2i761 0358UtzIqFi5xanAifYwHO4= --------------080003050700080007040503--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?510D027A.2030204>