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:to:cc:subject:message-id:reply-to
	:references:mime-version:content-type:in-reply-to; q=dns; s=
	default; b=cvqfahP9UjhKp/EoD2K92MFS7FwpmXOw3VufnSmGUVEFRT5w6Rt2H
	XvpbmUa9WLqd1O2EpElMqk9+OmwoaEGGbjG4Lh+0JMmoTb6t9aqE2Qx75n1Xzt7c
	Bl3kNDBFYGhBMqqE10xNBhSZeUrU6jM5popVSB/Jdmurt5pxpVOvBA=
Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm
Sender: cygwin-owner@cygwin.com
Mail-Followup-To: cygwin@cygwin.com
Date: Mon, 29 Jul 2013 17:19:52 +0200
From: Corinna Vinschen <corinna-cygwin@cygwin.com>
To: cygwin@cygwin.com
Cc: Oliver-Rainer Wittmann <orwittmann@googlemail.com>
Subject: Re: problem with 'patch' version 2.7.1-1 in Apache OpenOffice build under Windows
Message-ID: <20130729151952.GC4166@calimero.vinschen.de>
Reply-To: cygwin@cygwin.com
Mail-Followup-To: cygwin@cygwin.com,	Oliver-Rainer Wittmann <orwittmann@googlemail.com>
References: <51F6798D.3040905@googlemail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <51F6798D.3040905@googlemail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)

I forgot the CC in my first reply, sorry.  I extended my reply a bit.

On Jul 29 16:17, Oliver-Rainer Wittmann wrote:
> Hi,
> 
> 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.
> 
> 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.

dos2unix?

> 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'.
> 
> 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?

This is an upstream choice.  What you can do:

- Use dos2unix.

- Use a temporary text mount
  http://cygwin.com/cygwin-ug-net/using-utils.html#mount

- Discuss with the patch maintainers why they refuse to patch a UNIX
  file with a DOS patch and vice versa.
  
  I guess it's a problem with mixing the line endings.  If you have a
  file with UNINX line endings and a patch containing DOS lines, what is
  the end result supposed to be?  Are the CRs to be kept intact or not?
  Since patch doesn't know what the input is about, there's no way to be
  sure what behaviour is right or wrong.  Something like that.


Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat

--
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