[ooo-build-commit] .: patches/cairo patches/dev300

[René Engelhard]

 patches/cairo/default-cairo-disable.diff          |    5 ++---
 patches/dev300/debian-opt.diff                    |   11 -----------
 patches/dev300/jdbc-driver-classpaths-debian.diff |    8 ++++----
 patches/dev300/system-lpsolve-rpath.diff          |    2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)

New commits:
commit 475b79a706ee572366d64035ab8ff07dd813ec2f
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 21 00:23:49 2010 +0200

    port some Debian(Base)Only patches to m77
    
    * patches/cairo/default-cairo-disable.diff:
    * patches/dev300/debian-opt.diff:
    * patches/dev300/jdbc-driver-classpaths-debian.diff:
    * patches/dev300/system-lpsolve-rpath.diff:

diff --git a/patches/cairo/default-cairo-disable.diff b/patches/cairo/default-cairo-disable.diff
index 1733151..e5116e9 100644
--- a/patches/cairo/default-cairo-disable.diff
+++ b/patches/cairo/default-cairo-disable.diff
@@ -5,9 +5,9 @@ retrieving revision 1.42
 diff -u -p -u -r1.42 VCL.xcu
 --- officecfg/registry/data/org/openoffice/VCL.xcu	21 Jul 2005 14:22:30 -0000	1.42
 +++ officecfg/registry/data/org/openoffice/VCL.xcu	1 Sep 2005 10:29:42 -0000
-@@ -62,6 +62,11 @@
+@@ -28,6 +28,11 @@
  <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
- <oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <node oor:name="Settings">
 +    <node oor:name="Canvas" oor:op="replace">
 +      <prop oor:name="PreferredServices" oor:type="xs:string" oor:op="replace">
@@ -17,4 +17,3 @@ diff -u -p -u -r1.42 VCL.xcu
      <node oor:name="Accessibility" oor:op="replace">
        <prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace">
          <value>false</value>
-
diff --git a/patches/dev300/debian-opt.diff b/patches/dev300/debian-opt.diff
index 71f18a4..4075123 100644
--- a/patches/dev300/debian-opt.diff
+++ b/patches/dev300/debian-opt.diff
@@ -35,14 +35,3 @@ Index: unxlngi.mk
  PICSWITCH:=-fPIC
  .INCLUDE : unxlng.mk
  CDEFS+=-DPOWERPC -DPPC
---- solenv/inc/unxlngppc4.mk~	2009-09-27 10:32:34.000000000 +0000
-+++ solenv/inc/unxlngppc4.mk	2009-09-27 11:11:22.000000000 +0000
-@@ -102,7 +102,7 @@
- CFLAGSDBGUTIL=
- 
- # Compiler flags for enabling optimizations
--CFLAGSOPT=-Os -fno-strict-aliasing
-+CFLAGSOPT=-O2 -fno-strict-aliasing
- 
- # Compiler flags for disabling optimizations
- # don't change - required to work around optimization bugs
diff --git a/patches/dev300/jdbc-driver-classpaths-debian.diff b/patches/dev300/jdbc-driver-classpaths-debian.diff
index 6983b06..38120ce 100644
--- a/patches/dev300/jdbc-driver-classpaths-debian.diff
+++ b/patches/dev300/jdbc-driver-classpaths-debian.diff
@@ -2,12 +2,12 @@ Index: DataAccess.xcu
 ===================================================================
 --- officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	(Revision 271485)
 +++ officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	(Arbeitskopie)
-@@ -155,6 +155,25 @@
+@@ -152,6 +152,25 @@
        </node>
      </node>
    </node>
 +  <node oor:name="JDBC">
-+    <node oor:name="DriverClassPaths"> 
++    <node oor:name="DriverClassPaths">
 +       <node oor:name="com.mysql.jdbc.Driver" oor:op="replace">
 +         <prop oor:name="Path">
 +           <value>file:///usr/share/java/mysql.jar</value>
@@ -26,5 +26,5 @@ Index: DataAccess.xcu
 +    </node>
 +  </node>
    <node oor:name="RegisteredNames">
-     <node oor:name="Bibliography" oor:op="replace">
- 		<prop oor:name="Location" oor:type="xs:string">
+     <node oor:name="EvolutionLocal" oor:op="replace">
+         <prop oor:name="Location" oor:type="xs:string">
diff --git a/patches/dev300/system-lpsolve-rpath.diff b/patches/dev300/system-lpsolve-rpath.diff
index 56d80dd..ff06211 100644
--- a/patches/dev300/system-lpsolve-rpath.diff
+++ b/patches/dev300/system-lpsolve-rpath.diff
@@ -13,7 +13,7 @@
 +.ENDIF
  SOFFICELIB=-lsofficeapp
  UNOPKGAPPLIB=-lunopkgapp
- 
+ CONFIGMGRLIB=-lconfigmgr 
 --- configure.in-old	2008-04-29 12:59:49.000000000 +0200
 +++ configure.in	2008-04-29 13:00:07.000000000 +0200
 @ -5401,7 +5401,7 @@