- pretrans is a proper place for replacing dirs/symlinks

[packages/libreoffice.git] / openoffice.org-PLD.patch

diff --git a/openoffice.org-PLD.patch b/openoffice.org-PLD.patch
index 85f29b59c9ddf1cc6c115479178beb0200d1e4fd..3025b76daa83ab02d681698d6fde7c4a1acf3ac5 100644 (file)
--- a/openoffice.org-PLD.patch
+++ b/openoffice.org-PLD.patch
@@ -8,27 +8,26 @@ diff -bur ooo-build-2.0.2.7.orig/patches/src680/apply ooo-build-2.0.2.7/patches/
  Ark64: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, 64bit, SystemJavaBits
  # www.pld-linux.org
 -PLDBase: LinuxCommon, NotDebian, PLDOnly
-+PLDBase: LinuxCommon, NotDebian, PLDOnly, NovellOnly, NovellOnlyUnix, FilePickers, GCJExperimental, SystemJavaBits, SystemJavaBitsWorkaround
++PLDBase: LinuxCommon, NotDebian, PLDOnly, NovellOnly, NovellOnlyUnix, FilePickers, GCJExperimental, SystemJavaBits, SystemJavaBitsWorkaround, BerkeleyDB43, STLport5
  PLD: PLDBase
 -PLD64: PLDBase, 64bit
 +PLD64: PLDBase, 64bit, PLD64bitfixes
  # Mandriva Linux
  MandrivaBase: MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown
  Mandriva: MandrivaBase
-@@ -806,11 +806,14 @@
- filter-always-xsltproc.diff, i#56619, martink
+@@ -815,15 +815,6 @@
+ # Db 4.3/4.4 needs -lpthread
+ system-db-4.3-use-lpthread.diff, i#58474, rengelha
  
- 
-+# PLD fixes
- [PLDOnly]
- SectionOwner => arekm
 -
--pld-splash.diff, pmladek
-+sfx2.badscript.diff
- 
-+[PLD64bitfixes]
-+STL-lib64.diff
-+64bit-inline.diff
- 
+-[PLDOnly]
+-SectionOwner => arekm
+-
+-# fix build of sal project
+-solenv-unxlngi4-link.diff, i#66982
+-# fix for macro browser crash
+-sfx2-badscript.diff, i#67976
+-
  [ BuildBits ]
- 
+ # buildfix for some JDKs, i#68790
+ readlicense_oo-xml-apis.diff, cws-cmcfixes27