From owner-freebsd-openoffice@FreeBSD.ORG Fri Sep 28 04:11:48 2007 Return-Path: Delivered-To: freebsd-openoffice@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9756A16A46C for ; Fri, 28 Sep 2007 04:11:48 +0000 (UTC) (envelope-from maho.nakata@gmail.com) Received: from an-out-0708.google.com (an-out-0708.google.com [209.85.132.251]) by mx1.freebsd.org (Postfix) with ESMTP id 4370613C44B for ; Fri, 28 Sep 2007 04:11:48 +0000 (UTC) (envelope-from maho.nakata@gmail.com) Received: by an-out-0708.google.com with SMTP id c14so637160anc for ; Thu, 27 Sep 2007 21:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:date:message-id:to:cc:subject:from:in-reply-to:references:x-mailer:mime-version:content-type:content-transfer-encoding:sender; bh=5u7wlcvMiZNQ/ppptCQSdXQ8rO7KOI2wkiq74l786I8=; b=Z987jySYtVBK/M/RzsBgYSktoj5ZKa5fOisYVTIQvYv8sWqAP71d46ZnXFlq2HmmmYlLjASy7uhXwf+2m2FQ4DPKeBCdCoo1nIiezZWjQnOhPn/5dime9FXtxK+THGgq8fq+pedkv9ka3NyKjms05IqXULqX4GQK9ddXKIpqvZQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:date:message-id:to:cc:subject:from:in-reply-to:references:x-mailer:mime-version:content-type:content-transfer-encoding:sender; b=tfXlwayHpXMRjvuKp+Kn1zw9lTyJ6pN+YkyNe4oKFYsViaoHUxveDvynzpVgVTHb7X1Y6rd5G9AFskPzQ/9056E7joPsHASohlBIW7MjRMRyDT4d20s7y/oxJXoOv/O1cwZn1PGGYcLcv8DAGxXoPBevOWkpveYykoNDcYBvlLM= Received: by 10.90.83.14 with SMTP id g14mr4526169agb.1190952707319; Thu, 27 Sep 2007 21:11:47 -0700 (PDT) Received: from localhost ( [134.160.214.85]) by mx.google.com with ESMTPS id 13sm3447731wrl.2007.09.27.21.11.43 (version=SSLv3 cipher=OTHER); Thu, 27 Sep 2007 21:11:46 -0700 (PDT) Date: Fri, 28 Sep 2007 13:11:41 +0900 (JST) Message-Id: <20070928.131141.124084225.chat95@mac.com> To: truckman@FreeBSD.org From: Maho NAKATA In-Reply-To: <200709260411.l8Q4BD69011520@gw.catspoiler.org> References: <200709260411.l8Q4BD69011520@gw.catspoiler.org> X-Mailer: Mew version 5.2 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: Maho NAKATA Cc: maho@FreeBSD.org, freebsd-openoffice@FreeBSD.org Subject: Re: Build of 2.3.0 on 6-stable fails X-BeenThere: freebsd-openoffice@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting OpenOffice to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Sep 2007 04:11:48 -0000 From: Don Lewis Subject: Re: Build of 2.3.0 on 6-stable fails Date: Tue, 25 Sep 2007 21:11:13 -0700 (PDT) > The trigger is WITH_TTF_BYTECODE_ENABLED=yes, which causes the patch > file files/optpatch-freetype to be applied to the freetype-2.2.1.patch > file in the OO source. The freetype-2.2.1.patch patch file was > apparently changed for the OO 2.3.0 release, and the optpatch-freetype > patch file in the port was not updated to match. Right. > Where things get interesting is that the patch program applies the first > chunk of optpatch-freetype and doesn't reject it, even though the lines > being changed don't match those in the patch. This causes the first > four chunks of freetype-2.2.1.patch to be applied to the wrong file in > the freetype source and to be rejected. This apparently confuses > gpatch, causing it to think that the rest of the chunks of > freetype-2.2.1.patch have already been applied. :) thanks for clarifying about that. > Here's a patch to a patch to a patch that should fix this problem: Huge thanks, and as this will never be covered by JCA, I can directly commit it to our FBSD port cvs repo. Please verify. All the best, -- Nakata Maho (maho@FreeBSD.org)