[ooo-build] patching issues

[Andreas Radke]

I'm having problems applying the patches:

< /tmp/go-openoffice/trunk/src/ooo-build-3.1.0.98.2/patches/dev300/./sfx2-check-existing-template-dirs.diff patch  -l -p0  -d /tmp/go-openoffice/trunk/src/ooo-build-3.1.0.98.2/build/ooo310-m17 > /dev/null
done.
copy sfx2-check-existing-template-dirs.diff -> /tmp/go-openoffice/trunk/src/ooo-build-3.1.0.98.2/build/ooo310-m17/applied_patches/0082-sfx2-check-existing-template-dirs.diff

svtools-zero-GetColumnCount.diff: testing...< /tmp/go-openoffice/trunk/src/ooo-build-3.1.0.98.2/patches/dev300/./svtools-zero-GetColumnCount.diff patch  -l -p0  -d /tmp/go-openoffice/trunk/src/ooo-build-3.1.0.98.2/build/ooo310-m17 --dry-run 
patching file svtools/source/contnr/fileview.cxx
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file svtools/source/contnr/fileview.cxx.rej
patching file svtools/source/contnr/svtabbx.cxx
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file svtools/source/contnr/svtabbx.cxx.rej
Testing patch svtools-zero-GetColumnCount.diff failed. at /tmp/go-openoffice/trunk/src/ooo-build-3.1.0.98.2/patches/apply.pl line 97.
make: *** [stamp/patch.apply] Fehler 1



[andyrtr at workstation64 trunk]$ grep fileview.cxx src/ooo-build-3.1.0.98.2/patches/dev300/*
src/ooo-build-3.1.0.98.2/patches/dev300/svtools-unsort-template-dialogentries.diff: extern ::rtl::OUString CreateExactSizeText_Impl( sal_Int64 nSize ); // fileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/svtools-unsort-template-dialogentries.diff:--- svtools/source/contnr/fileview.cxx.old	2009-04-02 11:06:15.000000000 +0000
src/ooo-build-3.1.0.98.2/patches/dev300/svtools-unsort-template-dialogentries.diff:+++ svtools/source/contnr/fileview.cxx	2009-04-06 16:41:53.000000000 +0000
src/ooo-build-3.1.0.98.2/patches/dev300/svtools-zero-GetColumnCount.diff:Index: svtools/source/contnr/fileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/svtools-zero-GetColumnCount.diff:--- svtools/source/contnr/fileview.cxx	(revision 269278)
src/ooo-build-3.1.0.98.2/patches/dev300/svtools-zero-GetColumnCount.diff:+++ svtools/source/contnr/fileview.cxx	(revision 269279)
src/ooo-build-3.1.0.98.2/patches/dev300/vosremoval-mutex.diff:diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/vosremoval-mutex.diff:--- filter/source/xsltdialog/xmlfileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/vosremoval-mutex.diff:+++ filter/source/xsltdialog/xmlfileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/vosremoval-mutex.diff:diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/vosremoval-mutex.diff:--- svtools/source/contnr/fileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/vosremoval-mutex.diff:+++ svtools/source/contnr/fileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/vosremoval-timer.diff:diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/vosremoval-timer.diff:--- svtools/source/contnr/fileview.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/vosremoval-timer.diff:+++
svtools/source/contnr/fileview.cxx

[andyrtr at workstation64 trunk]$ grep svtabbx.cxx src/ooo-build-3.1.0.98.2/patches/dev300/*
src/ooo-build-3.1.0.98.2/patches/dev300/svtools-zero-GetColumnCount.diff:Index: svtools/source/contnr/svtabbx.cxx
src/ooo-build-3.1.0.98.2/patches/dev300/svtools-zero-GetColumnCount.diff:--- svtools/source/contnr/svtabbx.cxx	(revision 269278)
src/ooo-build-3.1.0.98.2/patches/dev300/svtools-zero-GetColumnCount.diff:+++ svtools/source/contnr/svtabbx.cxx	(revision 269279)

seems some patches overlap each other?

-Andy (buidling ArchLinux)