From owner-freebsd-x11@FreeBSD.ORG Sat Feb 2 15:50:43 2013 Return-Path: Delivered-To: freebsd-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 3074AD1B; Sat, 2 Feb 2013 15:50:43 +0000 (UTC) (envelope-from barbara.freebsd@gmail.com) Received: from mail-ee0-f46.google.com (mail-ee0-f46.google.com [74.125.83.46]) by mx1.freebsd.org (Postfix) with ESMTP id 5B7998DC; Sat, 2 Feb 2013 15:50:41 +0000 (UTC) Received: by mail-ee0-f46.google.com with SMTP id e49so2605397eek.33 for ; Sat, 02 Feb 2013 07:50:41 -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 :content-transfer-encoding; bh=OWY+dQcPvfLoB9pOC9f0HxtNqpkjpk5QvjP0JmXQ7Gw=; b=cgXB3pUbs3wMwqFKNcHTr59Zh9S+yhkG4k7fJ9g1N4zxt0yZd3IUp2kzzDThD5t0Mx eLdjvwO7SheieqWjH0uPN4UCsK4KIE3Z8O0hJ/qM2DTulMP1T8I3xRZOtK7+9WcliHN1 ioY8sYYxD3C63rSyHYcr65ubP38snYy6XBdOLI7jMckAFV9c+fPWkNjPmYfVhfgntPVK J+LzXcVIiv62kym+yqugKMrZfZv0tmgJIQWDSqlQZb2rnX2fgSJi8DHLOHRES8Xh3omc +EF079v4A/+TqwLm0MTHlvnByaXqPmY6MKbHll2dCKQCJQAW5n6thQYzWqSXJsNDbKrS dI0A== X-Received: by 10.14.4.194 with SMTP id 42mr52406727eej.35.1359820241129; Sat, 02 Feb 2013 07:50:41 -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 q5sm18014576eep.11.2013.02.02.07.50.39 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 02 Feb 2013 07:50:40 -0800 (PST) Message-ID: <510D35D4.3080306@gmail.com> Date: Sat, 02 Feb 2013 16:50:44 +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: ports/175776: patching x11-servers/xorg-server fails References: <510D0463.9030004@freebsd.org> <201302021252.AA00132@h115.65.228.10.32118.vlan.kuins.net> <510D273C.9070907@freebsd.org> <510D2FF5.9080302@gmail.com> <510D3348.8030001@freebsd.org> In-Reply-To: <510D3348.8030001@freebsd.org> X-Enigmail-Version: 1.5.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Tsurutani Naoki , freebsd-x11@freebsd.org, bug-followup@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 15:50:43 -0000 -----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 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-----