- fix configure.in

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

diff --git a/openoffice.org-apply.patch b/openoffice.org-apply.patch
index 3dc45578d6d84db49d4ad03009d1dfcafd47373f..e2b9c42f4acd38c29f8051085dd14bb0d58a4d0a 100644 (file)
--- a/openoffice.org-apply.patch
+++ b/openoffice.org-apply.patch
@@ -1,5 +1,5 @@
---- ooo-build-2.2.0/patches/src680/apply~      2007-03-27 02:54:55.779113930 +0300
-+++ ooo-build-2.2.0/patches/src680/apply       2007-03-27 02:54:40.198763000 +0300
+--- 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
@@ -10,3 +10,16 @@
  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