ooo-build r14733 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Dec  4 00:02:23 2008
New Revision: 14733
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14733&view=rev

Log:
2008-12-03  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/speed-hash-style.diff: added it back.  It's still used
	in [ NotDebian ] section.

	* patches/dev300/sc-overwrite-char-font-attrs.diff: overwrite the bold 
	font attribute too. (i#96853)


Added:
   trunk/patches/dev300/speed-hash-style.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sc-overwrite-char-font-attrs.diff

Modified: trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
==============================================================================
--- trunk/patches/dev300/sc-overwrite-char-font-attrs.diff	(original)
+++ trunk/patches/dev300/sc-overwrite-char-font-attrs.diff	Thu Dec  4 00:02:23 2008
@@ -317,7 +317,7 @@
  
  // STATIC DATA -----------------------------------------------------------
  
-@@ -189,6 +190,27 @@ void ScEditCell::Save( SvStream& rStream ) const
+@@ -189,6 +190,28 @@ void ScEditCell::Save( SvStream& rStream ) const
          pData->Store( rStream );
  }
  
@@ -329,6 +329,7 @@
 +    } AttrTypeMap[] = {
 +        { ATTR_FONT,        EE_CHAR_FONTINFO },
 +        { ATTR_FONT_HEIGHT, EE_CHAR_FONTHEIGHT },
++        { ATTR_FONT_WEIGHT, EE_CHAR_WEIGHT },
 +        { ATTR_FONT_COLOR,  EE_CHAR_COLOR }
 +    };
 +    USHORT nMapCount = sizeof(AttrTypeMap) / sizeof(AttrTypeMap[0]);

Added: trunk/patches/dev300/speed-hash-style.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/speed-hash-style.diff	Thu Dec  4 00:02:23 2008
@@ -0,0 +1,70 @@
+--- config_office/configure.in.old	2006-11-30 21:09:12.000000000 +0100
++++ config_office/configure.in	2007-01-08 16:36:33.000000000 +0100
+@@ -1340,9 +1340,9 @@
+ fi
+ 
+ if test "$GCC" = "yes"; then
+-   AC_MSG_CHECKING( for --hash-style=both linker support )
++   AC_MSG_CHECKING( for --hash-style=gnu linker support )
+    hash_style_ldflags_save=$LDFLAGS
+-   LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
++   LDFLAGS="$LDFLAGS -Wl,--hash-style=gnu"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([
+    #include <stdio.h>
+    ],[
+
+--- stlport/makefile.mk-old     2007-07-31 15:54:11.000000000 +0200
++++ stlport/makefile.mk 2007-07-31 15:54:19.000000000 +0200
+@@ -155,7 +155,7 @@
+        BUILD_FLAGS+= -j$(MAXPROCESS)
+ .ENDIF
+ .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+-CXX+= -Wl,--hash-style=both
++CXX+= -Wl,--hash-style=gnu
+ .ENDIF
+
+ .IF "$(COM)"=="C52"
+--- solenv/inc/unxlngi6.mk-old     2007-07-31 15:57:41.000000000 +0200
++++ solenv/inc/unxlngi6.mk 2007-07-31 15:57:47.000000000 +0200
+@@ -199,7 +199,7 @@
+ STDSHLCUIMT+=-ltcmalloc
+ .ENDIF
+ .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+-LINKFLAGS += -Wl,--hash-style=both
++LINKFLAGS += -Wl,--hash-style=gnu
+ .ELSE
+ LINKFLAGS += -Wl,-zdynsort
+ .ENDIF
+--- solenv/inc/unxlngppc.mk-old    2007-07-31 15:57:47.000000000 +0200
++++ solenv/inc/unxlngppc.mk        2007-07-31 15:57:52.000000000 +0200
+@@ -78,7 +78,7 @@
+ CFLAGSENABLESYMBOLS=-g
+ .ENDIF
+ .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+-LINKFLAGS += -Wl,--hash-style=both
++LINKFLAGS += -Wl,--hash-style=gnu
+ .ELSE
+ LINKFLAGS += -Wl,-zdynsort
+ .ENDIF
+--- solenv/inc/unxlngs.mk-old      2007-07-31 15:57:52.000000000 +0200
++++ solenv/inc/unxlngs.mk  2007-07-31 15:57:59.000000000 +0200
+@@ -80,7 +80,7 @@
+ CFLAGSENABLESYMBOLS=-g
+ .ENDIF
+ .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+-LINKFLAGS += -Wl,--hash-style=both
++LINKFLAGS += -Wl,--hash-style=gnu
+ .ELSE
+ LINKFLAGS += -Wl,-zdynsort
+ .ENDIF
+--- solenv/inc/unxlngx6.mk-old     2007-07-31 15:57:59.000000000 +0200
++++ solenv/inc/unxlngx6.mk 2007-07-31 15:58:06.000000000 +0200
+@@ -84,7 +84,7 @@
+
+ .ENDIF
+ .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+-LINKFLAGS += -Wl,--hash-style=both
++LINKFLAGS += -Wl,--hash-style=gnu
+ .ELSE
+ LINKFLAGS += -Wl,-zdynsort
+ .ENDIF