Re: [Libreoffice] Changing patches

2010-10-19 Thread Thomas Klausner
On Tue, Oct 19, 2010 at 06:09:33AM +0100, Michael Meeks wrote: > I guess you want to operate on the patch in that middle state by > manually leconverting those files (?). That's a lot of effort -- I manually fixed the patch, I've been working with patches long enough :) -- and pushed. Thank

Re: [Libreoffice] Changing patches

2010-10-18 Thread Michael Meeks
Hi Thomas, On Mon, 2010-10-18 at 23:40 +0200, Thomas Klausner wrote: > I tried untarring the SampleIcc distfile and then just applying > clone/libs-extern/icc/SampleICC-1.3.2.patch on top of it using patch > -p2 inside the directory, as a first step so that I could change it > and generate a new p

Re: [Libreoffice] Changing patches

2010-10-18 Thread Thomas Klausner
On Mon, Oct 18, 2010 at 05:45:56PM +0100, Michael Meeks wrote: > We have to edit the patch; icc is one of our 'external' components, so > we have the pristine source archive, and then patch it with our internal > patch as part of the build. > > So - we would need to alter the patch. Th

Re: [Libreoffice] Changing patches

2010-10-18 Thread Giuseppe Castagno
Hi Michael, Thomas, ... So - we would need to alter the patch. That leads to some diffs of diffs problem, but ... hopefully there is some --with-system-icc variant that could be used, if indeed the patches don't change its behaviour in some unpleasant way. That piece of software (icc

Re: [Libreoffice] Changing patches

2010-10-18 Thread Michael Meeks
Hi Thomas, On Mon, 2010-10-18 at 17:43 +0200, Thomas Klausner wrote: > One of the issues I see is in SampleICC, where Vetters.cpp includes > on Solaris and on all other non-Windows. riight - hmm. > On NetBSD, it also needs to include errno.h to compile. I could add an > #if NetBSD to t

[Libreoffice] Changing patches

2010-10-18 Thread Thomas Klausner
Hi! One of the issues I see is in SampleICC, where Vetters.cpp includes on Solaris and on all other non-Windows. On NetBSD, it also needs to include errno.h to compile. I could add an #if NetBSD to the Solaris case, but I don't think that sys/errno.h is standardized and thus prefer to make it i