Fixed in r1827202... there were some EOL gremlins in the patch-file which caused patch to barf
> On Mar 14, 2018, at 10:11 AM, Jim Jagielski <j...@jagunet.com> wrote: > > I am getting the below error: > > ============= > Building module lucene > ============= > > Entering /Users/jim/src/asf/AOO420/main/lucene > > missing header for unified diff at line 3 of patch > patching file lucene-2.9.4/common-build.xml > Reversed (or previously applied) patch detected! Assume -R? [n] y > patching file lucene-2.9.4/common-build.xml > Reversed (or previously applied) patch detected! Assume -R? [n] y > patching file lucene-2.9.4/contrib/analyzers/common/build.xml > Reversed (or previously applied) patch detected! Assume -R? [n] y > (Stripping trailing CRs from patch.) > patching file lucene-2.9.4/contrib/analyzers/smartcn/build.xml > Hunk #1 FAILED at 23. > 1 out of 1 hunk FAILED -- saving rejects to file > lucene-2.9.4/contrib/analyzers/smartcn/build.xml.rej > dmake: Error code 1, while making > './unxmaccx.pro/misc/build/so_patched_so_lucene' > > > The rejected patch is: > > % cat > lucene/unxmaccx.pro/misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml.rej > > *************** > *** 23,30 **** > Smart Chinese Analyzer > </description> > > - <property name="javac.source" value="1.4" /> > - <property name="javac.target" value="1.4" /> > > <property name="build.dir" > location="../../../build/contrib/analyzers/smartcn" /> > <property name="dist.dir" > location="../../../dist/contrib/analyzers/smartcn" /> > --- 23,30 ---- > Smart Chinese Analyzer > </description> > > + <property name="javac.source" value="1.6" /> > + <property name="javac.target" value="1.6" /> > > <property name="build.dir" > location="../../../build/contrib/analyzers/smartcn" /> > <property name="dist.dir" > location="../../../dist/contrib/analyzers/smartcn" /> > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org > For additional commands, e-mail: dev-h...@openoffice.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
