sb118: merged in re/DEV300_next towards DEV300_m76

7 files changed, 123 insertions, 69 deletions

diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk
index fb7183669fa3..ccfc9587462c 100644
--- a/external/mingwheaders/makefile.mk
+++ b/external/mingwheaders/makefile.mk
@@ -59,7 +59,6 @@ FILES_TO_COPY_FROM_MINGW= \
 FILES_TO_COPY_FROM_W32API= \
     amvideo.h \
     basetyps.h \
-    oaidl.h \
     objidl.h \
     specstrings.h \
     uxtheme.h \
@@ -102,6 +101,7 @@ FILES_TO_COPY_FROM_PSDK= \
     msiquery.h \
     multimon.h \
     ntquery.h \
+    oaidl.h \
     ocidl.h \
     oleauto.h \
     olectl.h \
@@ -110,6 +110,7 @@ FILES_TO_COPY_FROM_PSDK= \
     propidl.h \
     propkeydef.h \
     propsys.h \
+    propvarutil.h \
     shlobj.h \
     shobjidl.h \
     shtypes.h \
diff --git a/external/mingwheaders/mingw_headers.patch b/external/mingwheaders/mingw_headers.patch
index c348777f5db9..22995bf19773 100644
--- a/external/mingwheaders/mingw_headers.patch
+++ b/external/mingwheaders/mingw_headers.patch
@@ -207,59 +207,6 @@
  # define BEGIN_INTERFACE
  # define END_INTERFACE
  
---- include/oaidl.h.orig	2008-12-06 11:32:03.000000000 +0900
-+++ include/oaidl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -65,8 +65,11 @@
- 
- typedef _COM_interface ITypeLib *LPTYPELIB;
- typedef _COM_interface ITypeLib2 *LPTYPELIB2;
-+typedef _COM_interface ICreateTypeInfo ICreateTypeInfo;
- typedef _COM_interface ICreateTypeInfo *LPCREATETYPEINFO;
- typedef _COM_interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
-+typedef _COM_interface ICreateTypeLib ICreateTypeLib;
-+typedef _COM_interface ICreateTypeLib2 ICreateTypeLib2;
- typedef _COM_interface ICreateTypeLib *LPCREATETYPELIB;
- typedef _COM_interface ICreateTypeLib2 *LPCREATETYPELIB2;
- typedef _COM_interface ITypeComp *LPTYPECOMP;
-@@ -78,6 +81,8 @@
- typedef _COM_interface ICreateErrorInfo *LPCREATEERRORINFO;
- typedef _COM_interface ISupportErrorInfo *LPSUPPORTERRORINFO;
- typedef _COM_interface IRecordInfo *LPRECORDINFO;
-+typedef _COM_interface IErrorLog *LPERRORLOG;
-+typedef _COM_interface IPropertyBag *LPPROPERTYBAG;
- 
- extern const IID IID_ITypeLib;
- extern const IID IID_ITypeLib2;
-@@ -772,6 +777,29 @@
- };
- #undef INTERFACE
- 
-+EXTERN_C const IID IID_IErrorLog;
-+#define INTERFACE IErrorLog
-+DECLARE_INTERFACE_(IErrorLog,IUnknown)
-+{
-+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+	STDMETHOD_(ULONG,Release)(THIS) PURE;
-+	STDMETHOD(AddError)(THIS_ LPCOLESTR,LPEXCEPINFO) PURE;
-+};
-+#undef INTERFACE
-+
-+EXTERN_C const IID IID_IPropertyBag;
-+#define INTERFACE IPropertyBag
-+DECLARE_INTERFACE_(IPropertyBag,IUnknown)
-+{
-+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+	STDMETHOD_(ULONG,Release)(THIS) PURE;
-+	STDMETHOD(Read)(THIS_ LPCOLESTR,LPVARIANT,LPERRORLOG) PURE;
-+	STDMETHOD(Write)(THIS_ LPCOLESTR,LPVARIANT) PURE;
-+};
-+#undef INTERFACE
-+
- #ifdef __cplusplus
- }
- #endif
 --- include/objidl.h.orig	2008-12-06 11:32:04.000000000 +0900
 +++ include/objidl.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
@@ -1238,6 +1185,24 @@
  #endif // __NTQUERY_H__
  
  
+--- include/oaidl.h.orig	2008-12-06 11:32:03.000000000 +0900
++++ include/oaidl.h	2010-02-27 13:28:29.448250000 +0900
+@@ -1,3 +1,6 @@
++#if __GNUC__ >=3
++#pragma GCC system_header
++#endif
+ 
+ 
+ /* this ALWAYS GENERATED file contains the definitions for the interfaces */
+@@ -442,7 +445,7 @@
+                 FLOAT fltVal;
+                 DOUBLE dblVal;
+                 VARIANT_BOOL boolVal;
+-                _VARIANT_BOOL bool;
++//                _VARIANT_BOOL bool;
+                 SCODE scode;
+                 CY cyVal;
+                 DATE date;
 --- include/ocidl.h.orig	2008-01-18 22:17:32.000000000 +0900
 +++ include/ocidl.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
@@ -1404,8 +1369,15 @@
  
  
 --- include/propidl.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/propidl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -76,6 +76,14 @@
++++ include/propidl.h	2010-02-27 14:11:52.213875000 +0900
+@@ -1,3 +1,6 @@
++#if __GNUC__ >=3
++#pragma GCC system_header
++#endif
+ 
+ 
+ /* this ALWAYS GENERATED file contains the definitions for the interfaces */
+@@ -76,6 +79,14 @@
  #include "objidl.h"
  #include "oaidl.h"
  
@@ -1420,7 +1392,7 @@
  #ifdef __cplusplus
  extern "C"{
  #endif 
-@@ -143,6 +151,7 @@
+@@ -143,6 +154,7 @@
      CHAR *pElems;
      } 	CAC;
  
@@ -1428,15 +1400,25 @@
  typedef struct tagCAUB
      {
      ULONG cElems;
-@@ -268,6 +277,7 @@
+@@ -268,7 +280,9 @@
      ULONG cElems;
      CLSID *pElems;
      } 	CACLSID;
 +#endif
  
++#if 0
  #ifdef MIDL_PASS
  // This is the PROPVARIANT padding layout for marshaling.
-@@ -509,6 +519,7 @@
+ typedef BYTE PROPVAR_PAD1;
+@@ -385,6 +399,7 @@
+ #endif
+ 
+ #endif /* _MSC_EXTENSIONS */
++#endif
+ 
+ #ifdef MIDL_PASS
+ // This is the LPPROPVARIANT definition for marshaling.
+@@ -509,6 +524,7 @@
  
  #define	PRSPEC_PROPID	( 1 )
  
@@ -1444,7 +1426,7 @@
  typedef struct tagPROPSPEC
      {
      ULONG ulKind;
-@@ -526,12 +537,14 @@
+@@ -526,12 +542,14 @@
      PROPID propid;
      VARTYPE vt;
      } 	STATPROPSTG;
@@ -1459,7 +1441,7 @@
  typedef struct tagSTATPROPSETSTG
      {
      FMTID fmtid;
-@@ -542,12 +555,14 @@
+@@ -542,12 +560,14 @@
      FILETIME atime;
      DWORD dwOSVersion;
      } 	STATPROPSETSTG;
@@ -1474,7 +1456,15 @@
  #ifndef __IPropertyStorage_INTERFACE_DEFINED__
  #define __IPropertyStorage_INTERFACE_DEFINED__
  
-@@ -1136,6 +1151,7 @@
+@@ -1119,7 +1139,6 @@
+ #endif 	/* C style interface */
+ 
+ 
+-
+ /* [call_as] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_RemoteNext_Proxy( 
+     IEnumSTATPROPSETSTG * This,
+     /* [in] */ ULONG celt,
+@@ -1136,6 +1155,7 @@
  
  
  #endif 	/* __IEnumSTATPROPSETSTG_INTERFACE_DEFINED__ */
@@ -1482,7 +1472,7 @@
  
  
  /* interface __MIDL_itf_propidl_0000_0004 */
-@@ -1268,6 +1284,10 @@
+@@ -1268,6 +1287,10 @@
  }
  #endif
  
@@ -1534,6 +1524,23 @@
  #endif
  
  
+--- include/propvarutil.h.orig	2008-01-18 22:17:34.000000000 +0900
++++ include/propvarutil.h	2010-02-26 19:34:40.863625000 +0900
+@@ -14,6 +14,14 @@
+ #include <shtypes.h>
+ #include <shlwapi.h>
+ 
++#define __in
++#define __out
++#ifdef __cplusplus
++#define __inline inline
++#else
++#define __inline static __inline__
++#endif
++
+ #ifndef PSSTDAPI
+ #if defined(_PROPSYS_)
+ #define PSSTDAPI          STDAPI
 --- include/shlobj.h.orig	2008-01-18 22:17:36.000000000 +0900
 +++ include/shlobj.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
diff --git a/mysqlcppconn/mysql-connector-cpp.patch b/mysqlcppconn/mysql-connector-cpp.patch
index b71050435165..736ec8ff3930 100644
--- a/mysqlcppconn/mysql-connector-cpp.patch
+++ b/mysqlcppconn/mysql-connector-cpp.patch
@@ -196,6 +196,8 @@
  {
  	MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  	MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
+@@ -87,7 +87,7 @@
+ 	virtual SQLException* copy() { return new MethodNotImplementedException(*this); }
  };
  
 -struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
@@ -203,6 +205,8 @@
  {
  	InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  	InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
+@@ -96,7 +96,7 @@
+ 	virtual SQLException* copy() { return new InvalidArgumentException(*this); }
  };
  
 -struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index af0f34ab9431..fc9e93baaa6d 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -55,8 +55,7 @@ OOO_PATCH_FILES= \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.ooo_build \
     $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.win32 \
-
+    $(TARFILE_NAME).patch.win32
 
 PATCH_FILES=$(OOO_PATCH_FILES)
 
diff --git a/redland/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.patch.ooo_build
index eb4d24bb9c45..827147995e6f 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.ooo_build
+++ b/redland/rasqal/rasqal-0.9.16.patch.ooo_build
@@ -32,3 +32,25 @@
  fi
  if test "$echo_libtool_libs" = "yes"; then
    echo @libdir@/@RASQAL_LIBTOOLLIBS@
+--- misc/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:21.000000000 +0000
++++ misc/build/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:56.000000000 +0000
+@@ -22,7 +22,7 @@
+ 
+ noinst_SCRIPTS = rasqal-src-config
+ 
+-SUBDIRS=src utils tests docs data win32
++SUBDIRS=src tests docs data win32
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = rasqal.pc
+--- misc/rasqal-0.9.16/Makefile.in	2010-02-12 08:43:19.000000000 +0000
++++ misc/build/rasqal-0.9.16/Makefile.in	2010-02-12 08:44:03.000000000 +0000
+@@ -242,7 +242,7 @@
+ with_raptor = @with_raptor@
+ with_redland = @with_redland@
+ noinst_SCRIPTS = rasqal-src-config
+-SUBDIRS = src utils tests docs data win32
++SUBDIRS = src tests docs data win32
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = rasqal.pc
+ EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 2808686420ce..c89724087dc9 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -54,14 +54,13 @@ OOO_PATCH_FILES= \
     $(TARFILE_NAME).patch.legal \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.win32 \
-
+    $(TARFILE_NAME).patch.ooo_build \
+    $(TARFILE_NAME).patch.win32
 
 PATCH_FILES=$(OOO_PATCH_FILES) \
     $(TARFILE_NAME).patch.free_null \
     $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \
-    $(TARFILE_NAME).patch.storage_hashes_list_duplicates \
-
+    $(TARFILE_NAME).patch.storage_hashes_list_duplicates
 
 .IF "$(OS)"=="OS2"
 BUILD_ACTION=dmake
diff --git a/redland/redland/redland-1.0.8.patch.ooo_build b/redland/redland/redland-1.0.8.patch.ooo_build
new file mode 100644
index 000000000000..805a88d49ea2
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.ooo_build
@@ -0,0 +1,22 @@
+--- misc/redland-1.0.8/Makefile.am	2010-02-12 08:47:40.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.am	2010-02-12 08:47:51.000000000 +0000
+@@ -48,7 +48,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data
+ 
+ EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+--- misc/redland-1.0.8/Makefile.in	2010-02-12 08:47:39.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.in	2010-02-12 08:47:55.000000000 +0000
+@@ -283,7 +283,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data
+ EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+ README      NEWS      LICENSE.txt  TODO \