[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Chris Cheney]

 patches/dev300/ubuntu-no-stack-protector.diff |   16 +++++++++-------
 patches/dev300/ubuntu-palette.diff            |   16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

New commits:
commit c38220b15012cbc7928d02d9b92485ee7075d07c
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Fri Jun 4 22:38:03 2010 -0500

    Update Ubuntu specific patches for OOo 3.2.1
    
    * patches/dev300/ubuntu-no-stack-protector.diff:
    * patches/dev300/ubuntu-palette.diff: Update Ubuntu specific patches for
      OOo 3.2.1

diff --git a/patches/dev300/ubuntu-no-stack-protector.diff b/patches/dev300/ubuntu-no-stack-protector.diff
index 17dbd3e..2ea349c 100644
--- a/patches/dev300/ubuntu-no-stack-protector.diff
+++ b/patches/dev300/ubuntu-no-stack-protector.diff
@@ -1,12 +1,14 @@
---- solenv/inc/settings.mk~	2006-09-04 11:34:27.400718000 +0200
-+++ solenv/inc/settings.mk	2006-09-04 11:44:10.780718000 +0200
-@@ -1310,6 +1310,9 @@
+=== modified file 'solenv/inc/settings.mk'
+--- solenv/inc/settings.mk	2010-06-05 03:12:38 +0000
++++ solenv/inc/settings.mk	2010-06-05 03:21:48 +0000
+@@ -1325,6 +1325,9 @@
  INCPRE+=-I$(UNOUCROUT)
- UNOUCRRDB*=$(SOLARBINDIR)$/types.rdb
+ UNOUCRRDB*=$(SOLARBINDIR)/types.rdb
  
 +CFLAGS+= -fno-stack-protector
 +CXXFLAGS+= -fno-stack-protector
 +
- # --- Compiler -----------------------------------------------------
- .INCLUDE : rules.mk
- 
+ # location of trustedinfo.manifest for Windows Vista
+ .IF "$(COM)"=="MSC"
+ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)/inc
+
diff --git a/patches/dev300/ubuntu-palette.diff b/patches/dev300/ubuntu-palette.diff
index a1e3bec..4249f24 100644
--- a/patches/dev300/ubuntu-palette.diff
+++ b/patches/dev300/ubuntu-palette.diff
@@ -1,19 +1,21 @@
---- extras/source/palettes/standard.soc.old	2007-07-03 08:32:23.000000000 -0500
-+++ extras/source/palettes/standard.soc	2007-08-06 23:30:41.000000000 -0500
-@@ -92,6 +92,9 @@
-  <draw:color draw:name="Sun 2" draw:color="#666699"/>
-  <draw:color draw:name="Sun 3" draw:color="#9999cc"/>
-  <draw:color draw:name="Sun 4" draw:color="#ccccff"/>
+=== modified file 'extras/source/palettes/standard.soc'
+--- extras/source/palettes/standard.soc	2010-06-05 03:12:38 +0000
++++ extras/source/palettes/standard.soc	2010-06-05 03:19:58 +0000
+@@ -88,6 +88,9 @@
+  <draw:color draw:name="Dark violet" draw:color="#660066"/>
+  <draw:color draw:name="Salmon" draw:color="#ff8080"/>
+  <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
 + <draw:color draw:name="Ubuntu orange" draw:color="#ff6309"/>
 + <draw:color draw:name="Ubuntu yellow" draw:color="#ffb515"/>
 + <draw:color draw:name="Ubuntu red" draw:color="#c90016"/>
   <draw:color draw:name="Chart 1" draw:color="#004586"/>
   <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
   <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
-@@ -104,4 +107,4 @@
+@@ -100,4 +103,4 @@
   <draw:color draw:name="Chart 10" draw:color="#ff950e"/>
   <draw:color draw:name="Chart 11" draw:color="#c5000b"/>
   <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
 -</office:color-table>
 \ No newline at end of file
 +</office:color-table>
+