[Open Office] xmlhelp-port-to-db-4.3.diff seems to not apply

Jonathan Smith smithj at rpath.com
Fri Jan 12 13:27:37 EST 2007


When running make unpack, I get this error [1]. However, when applying 
the patch by hand (right after the build script fails to apply it), it 
works perfectly. I can't seem to figure out what's going on here.

-smithj


[1]
xmlhelp-port-to-db-4.3.diff: testing...( sed 's/^\(@.*\)\r$/\1/' | patch 
-l -p0  -d /home/smithj/build/openoffice.org/ooo-build/build/OOE680_m6 
--dry-run ) < 
/home/smithj/build/openoffice.org/ooo-build/patches/src680/./xmlhelp-port-to-db-4.3.diff
patching file xmlhelp/source/com/sun/star/help/StringDbt.java
Hunk #1 succeeded at 38 (offset 26 lines).
Hunk #3 succeeded at 70 (offset 26 lines).
Hunk #5 succeeded at 128 (offset 26 lines).
Hunk #7 succeeded at 181 (offset 26 lines).
patching file xmlhelp/source/com/sun/star/help/HelpKeyword.java
Hunk #1 succeeded at 38 (offset 29 lines).
Hunk #3 succeeded at 100 (offset 29 lines).
patching file xmlhelp/source/com/sun/star/help/HelpIndexer.java
Hunk #1 succeeded at 124 (offset -27 lines).
Hunk #3 succeeded at 204 with fuzz 1 (offset -27 lines).
Hunk #4 succeeded at 319 (offset 3 lines).
Hunk #5 succeeded at 439 with fuzz 1 (offset 8 lines).
Hunk #6 FAILED at 453.
Hunk #7 FAILED at 477.
Hunk #8 succeeded at 446 (offset -32 lines).
2 out of 8 hunks FAILED -- saving rejects to file 
xmlhelp/source/com/sun/star/help/HelpIndexer.java.rej
patching file xmlhelp/source/com/sun/star/help/HelpURLParameter.java
Hunk #1 succeeded at 230 (offset 35 lines).
Hunk #3 succeeded at 319 (offset 35 lines).
patching file xmlhelp/source/com/sun/star/help/HelpDatabases.java
Hunk #1 succeeded at 260 (offset 35 lines).
Hunk #3 succeeded at 554 (offset 35 lines).
patching file xmlhelp/source/com/sun/star/help/HelpLinker.java
Hunk #1 succeeded at 63 (offset -26 lines).
Hunk #2 succeeded at 394 (offset -2 lines).
Hunk #3 succeeded at 574 (offset -40 lines).
Hunk #4 succeeded at 637 (offset -2 lines).
Hunk #5 succeeded at 704 (offset -34 lines).
Hunk #6 succeeded at 750 (offset -2 lines).
Hunk #7 succeeded at 741 (offset -34 lines).
Testing patch xmlhelp-port-to-db-4.3.diff failed. at 
/home/smithj/build/openoffice.org/ooo-build/patches/apply.pl line 54.
make: *** [stamp/patch.apply] Error 1




More information about the Openoffice mailing list