From owner-freebsd-x11@FreeBSD.ORG Sat Feb 2 12:39:34 2013 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E1AEB723; Sat, 2 Feb 2013 12:39:34 +0000 (UTC) (envelope-from barbara.freebsd@gmail.com) Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com [74.125.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 24785F0C; Sat, 2 Feb 2013 12:39:33 +0000 (UTC) Received: by mail-ee0-f44.google.com with SMTP id l10so2561620eei.31 for ; Sat, 02 Feb 2013 04:39:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:cc :subject:references:in-reply-to:x-enigmail-version:content-type; bh=ijmZMvNagD8V8M/eEWqBAwDZiaf6lN5jVpD7MaeBYS0=; b=QYMc1bZzzD53sEKPHDV/3cDz0/vfAa/J17SLMqCoVpMp+w1bBN3k0v7UrxbTw9Z01D thCOspdqKOic3yw/8IzJcBQdhfwDuOUly9Q+cF2khv73KASf2CMRqAwzdb2yOTcPm2IG W8powbgNPfds0gk8s4x9KAgqdiwp5kdIyuQ+mmTbT4nI62oxAxJ2qOfTLAkl7gt5X4gN 5q6gHaniIfIdn9SpjGgN84yuGZ3PJk9sc9pbtioW8T2FQyMzS4lp/nWBamN0TPml3hne 6op/OCbx0TSy1UtIeKr3XXgtWjnGdIxQlp63DJYC1UUW40wR1Rd9D374RjyrQF/Ktiuu uhVA== X-Received: by 10.14.218.7 with SMTP id j7mr51076234eep.0.1359808766900; Sat, 02 Feb 2013 04:39:26 -0800 (PST) Received: from satanasso.local.net (host36-121-dynamic.117-80-r.retail.telecomitalia.it. [80.117.121.36]) by mx.google.com with ESMTPS id q42sm8104533eem.14.2013.02.02.04.39.24 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 02 Feb 2013 04:39:25 -0800 (PST) Message-ID: <510D0900.5080500@gmail.com> Date: Sat, 02 Feb 2013 13:39:28 +0100 From: Barbara Guida User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:18.0) Gecko/20100101 Firefox/18.0 SeaMonkey/2.15 MIME-Version: 1.0 To: Niclas Zeising Subject: Re: x11-servers/xorg-server: patch failure with "WITH_NEW_XORG=true" References: <510D027A.2030204@gmail.com> <510D03AC.1050201@gmail.com> <510D0507.2070604@freebsd.org> <510D061E.1090302@gmail.com> In-Reply-To: <510D061E.1090302@gmail.com> X-Enigmail-Version: 1.5.0 Content-Type: multipart/mixed; boundary="------------010001090107080203090005" X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: x11@FreeBSD.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 12:39:35 -0000 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--