X-Recipient:	archive-cygwin AT delorie DOT com
DomainKey-Signature:	a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:date:from:reply-to:message-id:to:subject
	:in-reply-to:references:mime-version:content-type
	:content-transfer-encoding; q=dns; s=default; b=VlDcQNRHhichcwAb
	AAv1WdxLmk5tyNd38lINrvmzWy+XlV2mGmzHZ/ovMnTgwKhvxXPtGFG31wFYs2Z3
	/9aQ28Kbmh1WGWE70vuz4aCa4mBz3Qet3ASG6JkR4sxYDgK6/8wFRxs+ZqzdhBkg
	dY3yyp/4UMDgsvxsiFET/JZvmMk=
DKIM-Signature:	v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:date:from:reply-to:message-id:to:subject
	:in-reply-to:references:mime-version:content-type
	:content-transfer-encoding; s=default; bh=uEq7DUfNcQ2/IBarV6KpZd
	z8N3s=; b=CxjwqYS14GwWncKU5cFR59aSm8K/pnwefz6nEidhki9+A024o0HzEK
	itPDQu/VvTWB32og6Klvt6eXSBdPM6QhioWOHYiqhec0nznzb5ztyWE3wgULKSpK
	hwHi450Vfwdp3AKk2eDnx0REUo6dXEHQrGRk/nlq+hhXQMF6mjD0I=
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
X-Spam-SWARE-Status:	No, score=1.6 required=5.0 tests=AWL,BAYES_50,FREEMAIL_FROM,KAM_THEBAT,KHOP_THREADED,RDNS_NONE,SPF_SOFTFAIL autolearn=no version=3.3.1
Date:	Mon, 29 Jul 2013 20:39:12 +0400
From:	Andrey Repin <anrdaemon AT freemail DOT ru>
Reply-To:	Andrey Repin <cygwin AT cygwin DOT com>
Message-ID:	<1023078416.20130729203912@mtu-net.ru>
To:	Oliver-Rainer Wittmann <orwittmann AT googlemail DOT com>, cygwin AT cygwin DOT com
Subject:	Re: problem with 'patch' version 2.7.1-1 in Apache OpenOffice build under Windows
In-Reply-To:	<51F6798D.3040905@googlemail.com>
References:	<51F6798D DOT 3040905 AT googlemail DOT com>
MIME-Version:	1.0
X-IsSubscribed:	yes

Greetings, Oliver-Rainer Wittmann!

> I am Oliver-Rainer Wittmann, a software developer working on Apache
> OpenOffice.
> I am not subscribed to this mailing cygwin at cygwin dot com. Thus, 
> please include my mail address in your replies - Thx in advance.

When you're posting to a mailing list, you're expected to read the reply from
a list. Please, don't make a problem for other people out of your personal
preferences.
Yes, I can set up my mailer to send a copy of my reply to a list, but other
people may not have such luxury, and will be forced to do manual work to
manage message destination, if their mail client allow such fiddling at all.

> I just want to inform you that version 2.7.1-1 of 'patch' breaks the
> current Apache OpenOffice build under Windows.
> It is caused by the fact that a non-CRLF patch could not be applied to a 
> CRLF file.

It was a deliberate change to prevent potential damage that could be caused by
such patching.
If you sure want to patch such a file, you can always run d2u on both files to
convert them to consistent line endings. And your source files SHOULD be all
with the same line endings, unless there's a special requirements for it.
(I.e. windows batch files do not work well with LF endings, but then, a patch
file WILL have same endings. Else it just won't work at all.)

> I have seen that this has been already reported on this list - see 
> thread [Bug with Cygwin's 'quilt' is actually in 'patch']

> As Apache OpenOffice is built on different platforms (Windows, MacOS, 
> Linux, ...) and developers are working on different platforms it can 
> happen that patches and files got different line endings. Thus, Apache 
> OpenOffice is hit by the change in new cygwin 'patch'.

Patch file may have any line endings. As long as they are consistent, this is
not an issue.
But this should not be a case for source files, which all SHOULD
have consistent line endings. 

> Question:
> Is it still possible to change the line ending of a certain line in a 
> file from CRLF to non-CRLF with 'patch' version 2.7.1-1?

d2u filename
will strip CR's from a file. Even erratic ones.


--
WBR,
Andrey Repin (anrdaemon AT freemail DOT ru) 29.07.2013, <18:59>

Sorry for my terrible english...


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

- Raw text -