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.
--
[email protected] <><, Pseudo Engineer, itinerant idiot
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
