- outdated

Changed files:
    openoffice.org-73257.patch -> 1.2
    openoffice.org-STL-lib64.diff -> 1.2
    openoffice.org-apply.patch -> 1.5
    openoffice.org-curl.diff -> 1.3
    openoffice.org-gcc-Wextra.patch -> 1.3
    openoffice.org-hunspell.diff -> 1.5
    openoffice.org-java16.patch -> 1.2
    openoffice.org-neon.diff -> 1.4
    openoffice.org-nolfs_hack.patch -> 1.2
    openoffice.org-stl-amd64.patch -> 1.4
    openoffice.org-stl5_fix.patch -> 1.2

diff --git a/openoffice.org-73257.patch b/openoffice.org-73257.patch
deleted file mode 100644 (file)
index 3527bfb..0000000
--- a/openoffice.org-73257.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-undo this patch, breaks build on i686
-
-Making: ../../../unxlngi4.pro/slo/sdtreelb.obj
-ccache i686-pld-linux-g++ -fmessage-length=0 -c -O1   -I.  -I../../../unxlngi4.pro/inc/dlg -I/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/offuh -I../inc -I../../../inc/pch -I../../../inc -I../../../unx/inc -I../../../unxlngi4.pro/inc -I. -I/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/stl -I/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/external -I/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc -I/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solenv/unxlngi4/inc -I/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solenv/inc -I/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/res -I/usr/stlport -I/usr/include/stlport -I/usr/include/stlport -I/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solenv/inc/Xp31 -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -I/usr/lib/jvm/java/include/native_threads/include -I/usr/X11R6/include     -I/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/offuh -I. -I../../../res -I. -pipe -mcpu=pentiumpro -include preinclude.h -fexceptions -fno-enforce-eh-specs -Wuninitialized -Wno-ctor-dtor-privacy   -fpic -DLINUX -DUNX -DVCL -DGCC -DC300 -DINTEL -DCVER=C300 -DNPTL -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=500 -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/include/c++/3.3.6 -DSUPD=680 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DEXCEPTIONS_ON -DGSTREAMER -DCUI -DSOLAR_JAVA -DOOE680=OOE680   -DSD_DLLIMPLEMENTATION -DSHAREDLIB -D_DLL_  -DMULTITHREAD  -o ../../../unxlngi4.pro/slo/sdtreelb.o /home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx: In member function `virtual sal_Int64 SdPageObjsTLB::SdPageObjsTransferable::getSomething(const com::sun::star::uno::Sequence<sal_Int8>&)':
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:151: warning: cast from pointer to integer of different size
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx: In static member function `static SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::getImplementation(const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)':
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:187: warning: cast to pointer from integer of different size
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx: In member function `void SdPageObjsTLB::Fill(const SdDrawDocument*, unsigned char, const String&)':
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:352: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:353: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:354: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:355: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:356: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:358: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:359: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:360: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:361: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:362: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:385: error: no matching function for call to `SdPageObjsTLB::InsertEntry(const String&, Image (&)(), Image (&)(), int, int, ULONG, void*)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:220: error: candidates are: virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:227: error:                 virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, const Image&, const Image&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:387: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:388: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:414: error: no matching function for call to `SdPageObjsTLB::InsertEntry(String&, Image (&)(), Image (&)(), SvLBoxEntry*&)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:220: error: candidates are: virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:227: error:                 virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, const Image&, const Image&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:416: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:417: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:423: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)())'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:424: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)())'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:425: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:426: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:447: error: no matching function for call to `SdPageObjsTLB::InsertEntry(const String&, Image (&)(), Image (&)(), int, int, ULONG, void*)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:220: error: candidates are: virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:227: error:                 virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, const Image&, const Image&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:449: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:450: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:476: error: no matching function for call to `SdPageObjsTLB::InsertEntry(String&, Image (&)(), Image (&)(), SvLBoxEntry*&)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:220: error: candidates are: virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:227: error:                 virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, const Image&, const Image&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:478: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:479: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:485: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)())'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:486: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)())'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:487: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:488: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx: In member function `void SdPageObjsTLB::Fill(const SdDrawDocument*, SfxMedium*, const String&)':
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:517: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:518: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:519: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:520: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:529: error: no matching function for call to `SdPageObjsTLB::InsertEntry(String&, Image (&)(), Image (&)(), NULL, int, ULONG, void*)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:220: error: candidates are: virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:227: error:                 virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, const Image&, const Image&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:531: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:532: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx: In member function `virtual void SdPageObjsTLB::RequestingChilds(SvLBoxEntry*)':
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:716: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:717: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:718: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:719: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:720: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:721: error: variable declaration is not allowed here
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:740: error: no matching function for call to `SdPageObjsTLB::InsertEntry(const String&, Image (&)(), Image (&)(), SvLBoxEntry*&, int, ULONG, void*)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:220: error: candidates are: virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:227: error:                 virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, const Image&, const Image&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:742: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:743: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:769: error: no matching function for call to `SdPageObjsTLB::InsertEntry(String&, Image (&)(), Image (&)(), SvLBoxEntry*&)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:220: error: candidates are: virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:227: error:                 virtual SvLBoxEntry* SvTreeListBox::InsertEntry(const String&, const Image&, const Image&, SvLBoxEntry*, unsigned char, long unsigned int, void*)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:771: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:772: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:778: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)())'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:779: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)())'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:780: error: no matching function for call to `SdPageObjsTLB::SetExpandedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:242: error: candidates are: void SvTreeListBox::SetExpandedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg/sdtreelb.cxx:781: error: no matching function for call to `SdPageObjsTLB::SetCollapsedEntryBmp(SvLBoxEntry*&, Image (&)(), BmpColorMode)'
-/home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/solver/680/unxlngi4.pro/inc/svtools/svtreebx.hxx:243: error: candidates are: void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry*, const Image&, BmpColorMode)
-dmake:  Error code 1, while making '../../../unxlngi4.pro/slo/sdtreelb.obj'
-'---* tg_merge.mk *---'
-dmake:  Error code 255, while making 'do_it_exceptions'
-'---* tg_merge.mk *---'
-
-ERROR: Error 65280 occurred while making /home/glen/rpm/pld/BUILD/ooo-build-2.1.8/build/ooe680-m6/sd/source/ui/dlg
-
---- ooo-build-2.1.8/patches/src680/apply~      2007-03-16 16:57:27.707889812 +0200
-+++ ooo-build-2.1.8/patches/src680/apply       2007-03-17 18:48:36.371546382 +0200
-@@ -983,9 +983,6 @@
- # default to large icons in the toolbar
- gui-toolbox-large-icons.diff, jholesov
- 
--# fix impress navigator wrt. alpha
--gui-sd-nav-icons.diff, i#73257, michael
--
- [ Branding ]
- SectionOwner => jholesov
- SectionIssue => i#66426

diff --git a/openoffice.org-STL-lib64.diff b/openoffice.org-STL-lib64.diff
deleted file mode 100644 (file)
index 85d2d09..0000000
--- a/openoffice.org-STL-lib64.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- config_office/configure.in~        2005-07-28 00:12:10.000000000 +0300
-+++ config_office/configure.in 2005-07-28 00:12:50.000000000 +0300
-@@ -1751,10 +1751,14 @@
-                                  fi
-                          fi
-                  else
--                         if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-+                         if test -f "$STLPORT4/lib64/libstlport_gcc.so"; then
-                                  AC_MSG_RESULT([checked])
-                          else
--                                 AC_MSG_ERROR([STLport4 libraries not found])
-+               if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-+                  AC_MSG_RESULT([checked])
-+               else
-+                  AC_MSG_ERROR([STLport4 libraries not found])
-+               fi
-                          fi
-                  fi
-          fi
-
-
-# this one is ugly, it will break if you have STLPORT installed for both (32/64) archs
-# but i didn't want to make this patch arch specific either. perhaps test for
-# glob would be cleaner solution. glen 2005-07-28
---- stlport/makefile.mk~       2005-07-28 01:22:23.000000000 +0300
-+++ stlport/makefile.mk        2005-07-28 01:22:24.000000000 +0300
-@@ -207,7 +207,7 @@
- all :
-        @echo "         An already available installation of STLport has been chosen in the configure process."
-        @echo "         Therefore the version provided here does not need to be built in addition."
--       +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
-+       +$(COPY) $(STLPORT4)$/lib*$/*stlport*$(DLLPOST) $(DLLDEST)
- .ENDIF
- 
- .INCLUDE :    set_ext.mk

diff --git a/openoffice.org-apply.patch b/openoffice.org-apply.patch
deleted file mode 100644 (file)
index e2b9c42..0000000
--- a/openoffice.org-apply.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ooo-build-2.2.0/patches/src680/apply       2007-03-27 02:54:40.198763000 +0300
-+++ ooo-build-r9097/patches/src680/apply       2007-03-27 16:17:52.011699303 +0200
-@@ -62,7 +62,8 @@
- Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, SystemJavaBits
- Ark64: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, 64bit, SystemJavaBits
- # www.pld-linux.org
--PLDBase: LinuxCommon, NotDebian, PLDOnly, NovellOnly, NovellOnlyUnix, FilePickers, GCJExperimental, SystemJavaBits, SystemJavaBitsWorkaround, BerkeleyDB43, STLport5
-+PLDBase: LinuxCommon, NotDebian, PLDOnly, SystemJavaBits, BerkeleyDB43, STLport5, \
-+      CalcSolver
- PLD: PLDBase
- PLD64: PLDBase, 64bit, PLD64bitfixes
- # Mandriva Linux
-@@ -1746,6 +1747,12 @@
- # we will move to gcc-4.x, so it does not make sense to push it upstream
- buildfix-boost-gcc33.diff
- 
-+[ PLDOnly ]
-+build-wizard-bitmap-scp.diff
-+scp2-user-config-ooo-2.0.diff
-+pushfont-psstream.diff
-+xmlhelp-use-libxslt-from-system.diff
-+
- [ UnUsedButNotYetRemovedFromSVN ]
- # diffs kept for reference as there might soon be a need to resurrect
- # part of the code

diff --git a/openoffice.org-curl.diff b/openoffice.org-curl.diff
deleted file mode 100644 (file)
index a0c7f4a..0000000
--- a/openoffice.org-curl.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ucb/source/ucp/ftp/makefile.mk.org 2007-09-28 18:42:46.882942137 +0200
-+++ ucb/source/ucp/ftp/makefile.mk     2007-09-28 18:42:57.171497260 +0200
-@@ -48,10 +48,6 @@
- 
- .INCLUDE: settings.mk
- 
--.IF "$(SYSTEM_CURL)" == "YES"
--CFLAGS+=-DCURL_NO_OLDIES
--.ENDIF
--
- # --- General -----------------------------------------------------
- 
- # first target ( shared library )

diff --git a/openoffice.org-gcc-Wextra.patch b/openoffice.org-gcc-Wextra.patch
deleted file mode 100644 (file)
index 06a37a7..0000000
--- a/openoffice.org-gcc-Wextra.patch
+++ /dev/null
@@ -1,187 +0,0 @@
---- solenv/inc/unxbsdi.mk      2007-12-12 13:18:23.000000000 +0000
-+++ solenv/inc-new/unxbsdi.mk  2008-03-10 09:16:59.398817758 +0000
-@@ -100,7 +100,7 @@
- CFLAGSWARNCC=
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/unxbsdi2.mk     2007-12-12 13:18:36.000000000 +0000
-+++ solenv/inc-new/unxbsdi2.mk 2008-03-10 09:16:59.402151012 +0000
-@@ -110,7 +110,7 @@
- CFLAGSWARNCC=
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/unxbsds.mk      2007-12-12 13:18:50.000000000 +0000
-+++ solenv/inc-new/unxbsds.mk  2008-03-10 09:16:59.402151012 +0000
-@@ -101,7 +101,7 @@
- CFLAGSWARNCC=
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/unxfbsd.mk      2007-12-12 13:19:03.000000000 +0000
-+++ solenv/inc-new/unxfbsd.mk  2008-03-10 09:16:59.402151012 +0000
-@@ -123,7 +123,7 @@
- CFLAGSOUTOBJ=-o
- 
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWARNCC=-Wall -Wendif-labels
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-     -Wno-non-virtual-dtor
- CFLAGSWALLCC=$(CFLAGSWARNCC)
---- solenv/inc/unxlnga.mk      2008-03-10 07:36:42.039925934 +0000
-+++ solenv/inc-new/unxlnga.mk  2008-03-10 09:16:59.412150776 +0000
-@@ -131,7 +131,7 @@
- CFLAGSOUTOBJ=-o
- 
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWARNCC=-Wall -Wendif-labels
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-     -Wno-non-virtual-dtor
- CFLAGSWALLCC=$(CFLAGSWARNCC)
---- solenv/inc/unxlngi4.mk     2008-03-10 07:36:49.826409660 +0000
-+++ solenv/inc-new/unxlngi4.mk 2008-03-10 09:16:59.415484030 +0000
-@@ -122,7 +122,7 @@
- .ENDIF
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/unxlngi6.mk     2008-03-10 07:36:50.066404021 +0000
-+++ solenv/inc-new/unxlngi6.mk 2008-03-10 09:16:59.412150776 +0000
-@@ -128,7 +128,7 @@
- CFLAGSOUTOBJ=-o
- 
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWARNCC=-Wall -Wendif-labels
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-     -Wno-non-virtual-dtor
- CFLAGSWALLCC=$(CFLAGSWARNCC)
---- solenv/inc/unxlngmips.mk   2007-11-02 15:20:37.000000000 +0000
-+++ solenv/inc-new/unxlngmips.mk       2008-03-10 09:16:59.405484267 +0000
-@@ -128,7 +128,7 @@
- CFLAGSOUTOBJ=-o
- 
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWARNCC=-Wall -Wendif-labels
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-     -Wno-non-virtual-dtor
- CFLAGSWALLCC=$(CFLAGSWARNCC)
---- solenv/inc/unxlngp.mk      2007-03-09 09:09:38.000000000 +0000
-+++ solenv/inc-new/unxlngp.mk  2008-03-10 09:16:59.405484267 +0000
-@@ -83,7 +83,7 @@
- CFLAGSWARNCC=
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/unxlngppc.mk    2008-03-10 07:36:48.483107887 +0000
-+++ solenv/inc-new/unxlngppc.mk        2008-03-10 09:16:59.405484267 +0000
-@@ -127,7 +127,7 @@
- CFLAGSWARNCC=
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/unxlngppc4.mk   2007-12-12 13:20:25.000000000 +0000
-+++ solenv/inc-new/unxlngppc4.mk       2008-03-10 09:16:59.405484267 +0000
-@@ -118,7 +118,7 @@
- CFLAGSWARNCC=
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/unxlngs.mk      2008-03-10 07:36:48.486441142 +0000
-+++ solenv/inc-new/unxlngs.mk  2008-03-10 09:16:59.408817521 +0000
-@@ -126,7 +126,7 @@
- .ENDIF
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/unxlngx6.mk     2008-03-10 07:36:50.066404021 +0000
-+++ solenv/inc-new/unxlngx6.mk 2008-03-10 09:16:59.415484030 +0000
-@@ -131,7 +131,7 @@
- CFLAGSOUTOBJ=-o
- 
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWARNCC=-Wall -Wendif-labels
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-     -Wno-non-virtual-dtor
- CFLAGSWALLCC=$(CFLAGSWARNCC)
---- solenv/inc/unxlnxi.mk      2007-03-09 09:10:59.000000000 +0000
-+++ solenv/inc-new/unxlnxi.mk  2008-03-10 09:16:59.408817521 +0000
-@@ -81,7 +81,7 @@
- CFLAGSWARNCC=
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/unxmacx.mk      2008-03-10 07:36:39.959974801 +0000
-+++ solenv/inc-new/unxmacx.mk  2008-03-10 09:16:59.412150776 +0000
-@@ -143,7 +143,7 @@
- CFLAGSNOOPT=-O0
- 
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--# -Wextra doesn not work for gcc-3.3
-+# doesn not work for gcc-3.3
- CFLAGSWARNCC=-Wall -Wendif-labels
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-     -Wno-non-virtual-dtor
---- solenv/inc/unxscoi.mk      2007-03-09 09:11:23.000000000 +0000
-+++ solenv/inc-new/unxscoi.mk  2008-03-10 09:16:59.408817521 +0000
-@@ -68,7 +68,7 @@
- CFLAGSWARNCC=
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCC=-Wall -Wendif-labels
- CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
- CFLAGSWERRCC=-Werror
- 
---- solenv/inc/wntgcci6.mk     2007-10-15 12:42:14.000000000 +0000
-+++ solenv/inc-new/wntgcci6.mk 2008-03-10 09:16:59.408817521 +0000
-@@ -78,7 +78,7 @@
- CDEFS+=-DWIN32 -DWINVER=0x400 -D_WIN32_IE=0x400 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED
- 
- # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWARNCC=-Wall -Wendif-labels
- CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-     -Wno-non-virtual-dtor -Wno-uninitialized
- CFLAGSWALLCC=$(CFLAGSWARNCC)

diff --git a/openoffice.org-hunspell.diff b/openoffice.org-hunspell.diff
deleted file mode 100644 (file)
index a3be6d0..0000000
--- a/openoffice.org-hunspell.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- config_office/configure.in~        2007-10-02 15:51:45.295762844 +0200
-+++ config_office/configure.in 2007-10-02 15:55:50.484834254 +0200
-@@ -4443,8 +4443,8 @@
-     AC_CHECK_HEADER(hunspell/hunspell.hxx, [ HUNSPELL_CFLAGS=-I/usr/include/hunspell ],
-         [AC_MSG_ERROR(hunspell headers not found.)], [])
-        ], [])
--    AC_CHECK_LIB(hunspell, main, [],
--           [ AC_MSG_ERROR(hunspell library not found.) ], [])
-+    AC_CHECK_LIB(hunspell-1.2, main, [],
-+           [ AC_MSG_ERROR(hunspell-1.2 library not found.) ], [])
- else
-     AC_MSG_RESULT([internal])
-     SYSTEM_HUNSPELL=NO
---- lingucomponent/source/spellcheck/spell/makefile.mk~        2007-02-01 20:08:29.000000000 +0100
-+++ lingucomponent/source/spellcheck/spell/makefile.mk 2007-10-02 21:43:10.511251807 +0200
-@@ -47,7 +47,7 @@
- 
- .IF "$(HUNSPELLLIB)"==""
- .IF "$(GUI)"=="UNX"
--HUNSPELLLIB=-lhunspell
-+HUNSPELLLIB=-lhunspell-1.2
- .ENDIF # unx
- .IF "$(GUI)"=="WNT"
- HUNSPELLLIB=hunspell.lib

diff --git a/openoffice.org-java16.patch b/openoffice.org-java16.patch
deleted file mode 100644 (file)
index ebab2bf..0000000
--- a/openoffice.org-java16.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ooo-build-ooe680-m6/patches/src680/build-java-target.diff.orig     2007-01-03 17:45:00.457170750 +0100
-+++ ooo-build-ooe680-m6/patches/src680/build-java-target.diff  2007-01-03 17:46:25.814505250 +0100
-@@ -18,7 +18,7 @@
-  AC_ARG_ENABLE(gcjaot,
-  [  --enable-gcjaot        Build with[[out]] using Ahead of Time java compilation support. 
-                            If you have gcj installed then --enable-gcjaot will enable gcj ahead of time
--@@ -2308,6 +2319,43 @@
-+@@ -2308,6 +2319,44 @@
-     JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
-  fi
-  
-@@ -51,6 +51,7 @@
- +         "$_java_target_ver" = "1.3" -o \
- +         "$_java_target_ver" = "1.4" -o \
- +         "$_java_target_ver" = "1.5" -o \
-++         "$_java_target_ver" = "1.6" -o \
- +         "$_java_target_ver" = "5" ; then
- +     AC_MSG_ERROR([$_java_target_ver is not supported java bytecode version!])
- +    fi

diff --git a/openoffice.org-neon.diff b/openoffice.org-neon.diff
deleted file mode 100644 (file)
index 9083c57..0000000
--- a/openoffice.org-neon.diff
+++ /dev/null
@@ -1,62 +0,0 @@
---- ucb/source/ucp/webdav/NeonSession.cxx      18 Jul 2007 07:55:41 -0000      1.49
-+++ ucb/source/ucp/webdav/NeonSession.cxx      23 Aug 2007 09:48:56 -0000
-@@ -364,32 +364,6 @@
- }
- 
- // -------------------------------------------------------------------
--extern "C" void NeonSession_ProgressNotify( void *,
--                                            off_t,
--                                            off_t )
--{
--    // progress: bytes read so far
--    // total:    total bytes to read, -1 -> total count not known
--}
--
--// -------------------------------------------------------------------
--extern "C" void NeonSession_StatusNotify( void *,
--                                          ne_conn_status,
--                                          const char * )
--{
--#if 0
--    typedef enum {
--        ne_conn_namelookup, /* lookup up hostname (info = hostname) */
--        ne_conn_connecting, /* connecting to host (info = hostname) */
--        ne_conn_connected, /* connected to host (info = hostname) */
--        ne_conn_secure /* connection now secure (info = crypto level) */
--    } ne_conn_status;
--#endif
--
--    // info: hostname
--}
--
--// -------------------------------------------------------------------
- extern "C" void NeonSession_PreSendRequest( ne_request * req,
-                                             void * userdata,
-                                             ne_buffer * headers )
-@@ -578,13 +552,6 @@
-                                 NeonUri::makeConnectionEndPointString(
-                                     m_aHostName, m_nPort ) );
- 
--        // Set a progress callback for the session.
--        ne_set_progress( m_pHttpSession, NeonSession_ProgressNotify, this );
--
--        // Set a status notification callback for the session, to report
--        // connection status.
--        ne_set_status( m_pHttpSession, NeonSession_StatusNotify, this );
--
-         // Add hooks (i.e. for adding additional headers to the request)
- 
- #if 0
-diff -ru config_office/configure.in config_office/configure.in
---- config_office/configure.in 2007-08-23 11:49:35.000000000 +0100
-+++ config_office/configure.in 2007-08-23 11:50:28.000000000 +0100
-@@ -4019,8 +4019,7 @@
- if test -n "$with_system_neon" -o -n "$with_system_libs" && \
-       test "$with_system_neon" != "no"; then
-         AC_MSG_RESULT([external])
--        PKG_CHECK_MODULES(NEON, neon >= 0.24.0)
--        PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.24.x to 0.26.x for system-neon]))
-+        PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
-         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
-         NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
-         SYSTEM_NEON=YES

diff --git a/openoffice.org-nolfs_hack.patch b/openoffice.org-nolfs_hack.patch
deleted file mode 100644 (file)
index 2bba9ba..0000000
--- a/openoffice.org-nolfs_hack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ooo-build-ood680-m4/patches/src680/apply.orig      2006-10-14 18:58:18.847040750 +0000
-+++ ooo-build-ood680-m4/patches/src680/apply   2006-10-14 18:58:36.612151000 +0000
-@@ -760,9 +760,6 @@
- # Use short TMP and TEMP if possible in Win32 build
- win32-use-short-tmp.diff, i#68888, tml
- 
--# LFS support
--lfs.diff, i#26865, rengelha
--
- # fix build with system libnss installed apart from mozilla
- # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
- libxmlsec-system-nss.diff, i#69368, pmladek

diff --git a/openoffice.org-stl-amd64.patch b/openoffice.org-stl-amd64.patch
deleted file mode 100644 (file)
index 2aaf96b..0000000
--- a/openoffice.org-stl-amd64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- config_office/configure.in~        2007-03-28 00:03:45.805243465 +0300
-+++ config_office/configure.in 2007-03-28 00:21:10.154123488 +0300
-@@ -2235,9 +2235,9 @@
-                                  fi
-                          fi
-                  else
--                         if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-+                         if test -f "$STLPORT4/lib64/libstlport_gcc.so"; then
-                                  AC_MSG_RESULT([checked])
--                         elif test -f "$STLPORT4/lib/libstlport.so"; then
-+                         elif test -f "$STLPORT4/lib64/libstlport.so"; then
-                                  AC_MSG_RESULT([checked])
-                                  STLPORT_VER=500
-                          else

diff --git a/openoffice.org-stl5_fix.patch b/openoffice.org-stl5_fix.patch
deleted file mode 100644 (file)
index 0df7849..0000000
--- a/openoffice.org-stl5_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ooo-build-src680-m176/patches/src680/system-stlport5.diff.orig     2006-08-16 11:03:36.000000000 +0000
-+++ ooo-build-src680-m176/patches/src680/system-stlport5.diff  2006-08-16 11:04:16.000000000 +0000
-@@ -381,3 +381,25 @@
-  
-      for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
-      {
-+--- scp2/source/ooo/file_library_ooo.scp.orig 2006-08-15 21:29:35.000000000 +0000
-++++ scp2/source/ooo/file_library_ooo.scp      2006-08-15 21:30:45.000000000 +0000
-+@@ -2045,7 +2045,7 @@
-+   #ifdef IRIX
-+     Name = STRING(CONCAT3(libstlport_,gcc,.so.4.5));
-+   #else
-+-    Name = STRING(CONCAT3(libstlport_,gcc,UNXSUFFIX));
-++    Name = STRING(CONCAT2(libstlport,UNXSUFFIX));
-+   #endif
-+   #else
-+   #ifdef SOLARIS
-+--- scp2/source/ure/ure.scp.orig      2006-08-15 21:31:54.000000000 +0000
-++++ scp2/source/ure/ure.scp   2006-08-15 21:32:19.000000000 +0000
-+@@ -592,7 +592,7 @@
-+     TXT_FILE_BODY;
-+     Dir = SCP2_URE_DL_DIR;
-+ #if defined _gcc3
-+-    Name = SCP2_URE_DL_NORMAL(stlport_gcc);
-++    Name = SCP2_URE_DL_NORMAL(stlport);
-+ #elif defined SOLARIS
-+     Name = SCP2_URE_DL_NORMAL(stlport_sunpro);
-+ #elif defined WNT