X-Recipient: archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 	tests=AWL,BAYES_00
X-Spam-Check-By: sourceware.org
Message-ID: <4A08789A.1000804@x-ray.at>
Date: Mon, 11 May 2009 21:12:26 +0200
From: Reini Urban <rurban AT x-ray DOT at>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de-AT; rv:1.8.1.21) Gecko/20090403 SeaMonkey/1.1.16
MIME-Version: 1.0
To: cygwin AT cygwin DOT com
Subject: Re: icu-3.8-5 patches
References: <4A01FD39 DOT 8060001 AT cornell DOT edu>
In-Reply-To: <4A01FD39.8060001@cornell.edu>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id: <cygwin.cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

Ken Brown schrieb:
> I'm building a program (in cygwin-1.7) that comes with its own version 
> of the icu library.  I'd like to patch the source in the same way that 
> cygwin's icu package does this.  But there seems to be a packaging 
> problem with the icu-3.8-5 source, so that I'm not sure exactly which 
> patches should be applied:
> 
> $ cygport icu-3.8-5.cygport prep
>  >>> Preparing icu-3.8-5
>  >>> Unpacking source icu4c-3_8-src.tgz
> *** Info: applying patch icu-3.8-setBreakType-public.diff:
> patching file common/unicode/rbbi.h
> *** Info: applying patch icu-3.8-regexp-CVE-2007-4770+4771.diff:
> patching file i18n/regexcmp.cpp
> patching file i18n/rematch.cpp
> patching file test/intltest/regextst.h
> patching file test/intltest/regextst.cpp
> patching file common/uvectr32.cpp
> patching file common/uvectr32.h
>  >>> Preparing working source directory
> [...]
> *** ERROR: patch icu-3.8-5.src.patch will not apply
> 
> There is some overlap between the successfully applied patches and those 
> in icu-3.8-5.src.patch, but I don't think either set of patches contains 
> the other.  Can someone clarify for me what the actual source patches 
> should be?

This is easy:
icu-3.8-5.src.patch already contains the two extra patches.

This is harder:
icu-3.8-5.cygwin.patch will also not apply automatically by cygport
due to a cygport problem with SRC_DIR containing a "/".

Workaround:
* rename PATCH_URI to WRONG_PATCH_URI
* check icu/source/source/CYGWIN_PATCHES and move it to
   icu/source/CYGWIN_PATCHES

-- 
Reini Urban
http://phpwiki.org/  http://murbreak.at/

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/