ause110: update to DEV300_m74

5 files changed, 24 insertions, 23 deletions

diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index 4faa30ab19e2..57aae6a9c0fd 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -1,18 +1,15 @@
 --- misc/glibc-2.1.3/posix/config.h	Mon Mar 31 09:43:50 2008
 +++ misc/build/glibc-2.1.3/posix/config.h	Mon Mar 31 09:43:26 2008
-@@ -1 +1,45 @@
+@@ -1 +1,42 @@
 -dummy
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 + * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
++ * Copyright 2000, 2010 Oracle and/or its affiliates.
 + *
 + * OpenOffice.org - a multi-platform office productivity suite
 + *
-+ * $RCSfile: glibc-2.1.3.patch,v $
-+ * $Revision: 1.5 $
-+ *
 + * This file is part of OpenOffice.org.
 + *
 + * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,20 +76,16 @@
  extern int getopt ();
 --- misc/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:50 2008
 +++ misc/build/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:38 2008
-@@ -1 +1,67 @@
+@@ -1 +1,63 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 +# 
-+# Copyright 2008 by Sun Microsystems, Inc.
++# Copyright 2000, 2010 Oracle and/or its affiliates.
 +#
 +# OpenOffice.org - a multi-platform office productivity suite
 +#
-+# $RCSfile: glibc-2.1.3.patch,v $
-+#
-+# $Revision: 1.5 $
-+#
 +# This file is part of OpenOffice.org.
 +#
 +# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index cb589cdeb84c..cf4516515a67 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk
index 2834a54faa52..fb7183669fa3 100644
--- a/external/mingwheaders/makefile.mk
+++ b/external/mingwheaders/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.10.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/external/mingwheaders/mingw_headers.patch b/external/mingwheaders/mingw_headers.patch
index 5e4207d48243..c348777f5db9 100644
--- a/external/mingwheaders/mingw_headers.patch
+++ b/external/mingwheaders/mingw_headers.patch
@@ -381,7 +381,7 @@
  
  #endif /*_SPECSTRINGS_H */
 --- include/uxtheme.h.orig	2008-12-06 11:32:11.000000000 +0900
-+++ include/uxtheme.h	2009-08-21 09:21:56.000000000 +0900
++++ include/uxtheme.h	2010-01-22 14:50:56.327000000 +0900
 @@ -10,7 +10,7 @@
  extern "C" {
  #endif
@@ -391,6 +391,22 @@
  #define DTBG_CLIPRECT 0x00000001
  #define DTBG_DRAWSOLID 0x00000002
  #define DTBG_OMITBORDER 0x00000004
+@@ -35,6 +35,7 @@
+ #define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM)
+ #define HTTB_SIZINGTEMPLATE 0x0100
+ #define HTTB_SYSTEMSIZINGMARGINS 0x0200
++#if 0
+ #define TMT_DISPLAYNAME 0x0259
+ #define TMT_TOOLTIP 0x025A
+ #define TMT_COMPANY 0x025B
+@@ -186,6 +187,7 @@
+ #define BT_IMAGEFILE  0x0000
+ #define BT_BORDERFILL 0x0001
+ #define BT_NONE       0x0002
++#endif
+ 
+ typedef enum PROPERTYORIGIN {
+ 	PO_STATE = 0,
 --- include/winbase.h.orig	2008-12-06 11:32:11.000000000 +0900
 +++ include/winbase.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1354,8 +1354,8 @@
diff --git a/external/prj/build.lst b/external/prj/build.lst
index 20e0d4127964..8bcc6c10c07e 100644
--- a/external/prj/build.lst
+++ b/external/prj/build.lst
@@ -1,4 +1,4 @@
-el      external :       SO:external_so soltools NULL
+el      external :       soltools NULL
 el	external					usr1 - all el_mkout NULL
 el	external\glibc		nmake	-	all	el_glibc NULL
 el	external\gcc3_specific	nmake	-	all	el_gcc3 NULL