Re: [Libreoffice] Changing patches
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. Thanks for the hints on the build structure, I'll wrap my head around it soon, I hope :) Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Changing patches
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 patch. However, I got conflicts: .. > Am I missing a step? Yes :-) if you run: 'build verbose=1' inside that directory you'll see the steps: cd ./unxlngi6.pro/misc/build && ( gzip -d -c /opt/OpenOffice/HEAD/src/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz | tar -xvf -) && touch so_unpacked_icc .. make writeable... /usr/bin/perl /opt/OpenOffice/loffice/solenv/bin/leconvert.pl unix ./unxlngi6.pro/misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h ./unxlngi6.pro/misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp ./unxlngi6.pro/misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h ./unxlngi6.pro/misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp && touch ./unxlngi6.pro/misc/icc_convert_unx_flag cd ./unxlngi6.pro/misc/build && cat ../../..//SampleICC-1.3.2.patch | patch -p2 && touch so_patched_icc .. cd ./unxlngi6.pro/misc/build && cat ../../..//SampleICC-1.3.2.patch | patch -p2 && touch so_patched_icc And then it converts some files back: presumably the mix of DOS and UNIX line endings poisons some versions of patch / diff, so ... it might make some sense :-) I guess you want to operate on the patch in that middle state by manually leconverting those files (?). Thanks ! Michael. -- michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Changing patches
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. 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. 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 patch. However, I got conflicts: ./Contrib/ICC_utils/Stubs.h.rej ./Contrib/ICC_utils/Vetters.cpp.rej ./IccProfLib/IccTagProfSeqId.cpp.rej Am I missing a step? Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Changing patches
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) was added by me in, IIRC, 2007 when the PDF/A support was added. The icc stuff is used to generate the PDF/A-1a sRGB color profile at build time, as I wrote in this README file: http://opengrok.go-oo.org/xref/libs-extern/icc/ I don't think there is a --with-system-icc because icc it's not used at run-time, only the generated profile is, included in the PDF generation logic. As to find a way to change the includes, ATM I can't be of much help since the patch changed from 2007 to now, and I didn't follow the patch adaptation currently under way in LibO, that is, the one Thomas and others are carrying on. beppec56 -- Kind Regards, Giuseppe Castagno Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu beppec56 at openoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Changing patches
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 the Solaris case, but I don't think that sys/errno.h is > standardized and thus prefer to make it include on all > non-Windows platforms instead. What do you think? sounds good to me. > The next question is how to change this, since the sys/errno.h include > gets added by one of the patches coming with LO. You probably already > have a tried-and-true workflow for this, what is it? :) 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. 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. HTH, Michael. -- michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
