SOURCES: openoffice.org-PLD.patch - reverted (previous commit bran...

[adamg]

Author: adamg                        Date: Sat Sep 29 18:44:11 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverted (previous commit branched as DEVEL)

---- Files affected:
SOURCES:
   openoffice.org-PLD.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/openoffice.org-PLD.patch
diff -u SOURCES/openoffice.org-PLD.patch:1.6 SOURCES/openoffice.org-PLD.patch:1.7
--- SOURCES/openoffice.org-PLD.patch:1.6	Sat Sep 29 20:42:53 2007
+++ SOURCES/openoffice.org-PLD.patch	Sat Sep 29 20:44:05 2007
@@ -1,6 +1,21 @@
+TODO:
+CalcSolver
+diff -bur ooo-build-2.0.2.7.orig/patches/src680/apply ooo-build-2.0.2.7/patches/src680/apply
 --- ooo-build-2.0.2.7.orig/patches/src680/apply	2006-04-21 15:21:46.640348000 +0200
 +++ ooo-build-2.0.2.7/patches/src680/apply	2006-04-21 16:10:55.324630250 +0200
-@@ -864,16 +864,6 @@
+@@ -52,9 +52,9 @@
+ Ark: LinuxCommon, NotDebian, ArkOnly, GCJExperimental, BerkeleyDB43, SystemJavaBits
+ 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, BerkeleyDB43, STLport5
+ PLD: PLDBase
+-PLD64: PLDBase, 64bit
++PLD64: PLDBase, 64bit, PLD64bitfixes
+ # Mandriva Linux
+ MandrivaBase: MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown
+ Mandriva: MandrivaBase
+@@ -815,15 +815,6 @@
  # Db 4.3/4.4 needs -lpthread
  system-db-4.3-use-lpthread.diff, i#58474, rengelha
  
@@ -13,7 +28,6 @@
 -# fix for macro browser crash
 -sfx2-badscript.diff, i#67976
 -
--
  [ BuildBits ]
- # add automatical detection of serializer.jar into the configure
- # add it to classpath on one more place
+ # buildfix for some JDKs, i#68790
+ readlicense_oo-xml-apis.diff, cws-cmcfixes27
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/openoffice.org-PLD.patch?r1=1.6&r2=1.7&f=u