incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ariel Constenla-Haile <arie...@apache.org>
Subject Re: svn commit: r1236722 [1/2] - /incubator/ooo/trunk/main/icc/SampleICC-1.3.2.patch
Date Fri, 27 Jan 2012 20:55:06 GMT
On Fri, Jan 27, 2012 at 03:45:34PM -0000, pfg@apache.org wrote:
> Author: pfg
> Date: Fri Jan 27 15:45:33 2012
> New Revision: 1236722
> 
> URL: http://svn.apache.org/viewvc?rev=1236722&view=rev
> Log:
> Use unified diff: it's smaller and easier to read.
> 
> Modified:
>     incubator/ooo/trunk/main/icc/SampleICC-1.3.2.patch
 

this breaks:

make writeable...
/usr/bin/perl
/mnt/build/openoffice/apache/trunk/main/solenv/bin/leconvert.pl unix
./unxlngx6/misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h
./unxlngx6/misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp
./unxlngx6/misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h
./unxlngx6/misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp &&
touch ./unxlngx6/misc/icc_convert_unx_flag
cd ./unxlngx6/misc/build && cat ../../..//SampleICC-1.3.2.patch | patch
-p2 && touch so_patched_icc
patching file SampleICC-1.3.2/Contrib/CmdLine/Makefile.in
patching file SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp
patching file SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h
patching file SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in
patching file SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h
patching file SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file
SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp.rej
patching file SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h
patching file SampleICC-1.3.2/Contrib/Makefile.in
patching file SampleICC-1.3.2/IccProfLib/IccCmm.cpp
patching file SampleICC-1.3.2/IccProfLib/IccIO.cpp
patching file SampleICC-1.3.2/IccProfLib/IccIO.h
patching file SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp
patching file SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp
patching file SampleICC-1.3.2/IccProfLib/IccProfLibConf.h
patching file SampleICC-1.3.2/IccProfLib/IccProfile.cpp
patching file SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp
patching file SampleICC-1.3.2/IccProfLib/IccTagLut.cpp
patching file SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp
patching file SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp
patching file SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h
Reversed (or previously applied) patch detected!  Assume -R? [n]

ERROR: error 65280 occurred while making /mnt/build/openoffice/apache/trunk/main/icc


Regards
-- 
Ariel Constenla-Haile
La Plata, Argentina

Mime
View raw message