[Libreoffice-commits] .: mysqlcppconn/makefile.mk mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-static.patch mysqlcppconn/mysql-connector-c++-1.1.0.patch mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch mysqlcppconn/mysql-connector-cpp.patch mysqlcppconn/patches ooo.lst.in
Lionel Elie Mamane
lmamane at kemper.freedesktop.org
Sun Nov 13 14:56:50 PST 2011
mysqlcppconn/makefile.mk | 6
mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch | 6
mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-static.patch | 6
mysqlcppconn/mysql-connector-c++-1.1.0.patch | 237 ++++++
mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch | 6
mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch | 6
mysqlcppconn/mysql-connector-cpp.patch | 379 ----------
mysqlcppconn/patches/default_to_protocol_tcp.patch | 6
ooo.lst.in | 2
9 files changed, 256 insertions(+), 398 deletions(-)
New commits:
commit 770cb8ae4d0472d8eb9b32046f5820181fb1de93
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Sun Nov 13 10:31:22 2011 +0100
Update mysqlcppcon to version 1.1.0
Drop patch to avoid use of boost::variant
diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
index e047ea0..d7fa8a6 100644
--- a/mysqlcppconn/makefile.mk
+++ b/mysqlcppconn/makefile.mk
@@ -30,7 +30,7 @@ PRJ=.
PRJNAME=mysqlcppconn
TARGET=so_mysqlcppconn
-EXT_PROJECT_NAME=mysql-connector-cpp
+EXT_PROJECT_NAME=mysql-connector-c++-1.1.0
# --- Settings -----------------------------------------------------
@@ -39,7 +39,7 @@ EXT_PROJECT_NAME=mysql-connector-cpp
# --- Files --------------------------------------------------------
TARFILE_NAME=$(EXT_PROJECT_NAME)
-TARFILE_MD5=831126a1ee5af269923cfab6050769fe
+TARFILE_MD5=0981bda6548a8c8233ffce2b6e4b2a23
ADDITIONAL_FILES=\
driver$/makefile.mk \
driver$/nativeapi$/makefile.mk \
@@ -61,7 +61,7 @@ MYSQL_BINDING=dynamic
PATCH_FILES=\
$(TARFILE_NAME).patch \
- mysql-connector-cpp-mysql-binding-$(MYSQL_BINDING).patch \
+ $(TARFILE_NAME)-mysql-binding-$(MYSQL_BINDING).patch \
patches/default_to_protocol_tcp.patch
BUILD_DIR=driver
diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch b/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
new file mode 100644
index 0000000..f013b5e
--- /dev/null
+++ b/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
@@ -0,0 +1,6 @@
+--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/binding_config.h 2009-08-14 10:17:23.640625000 +0200
++++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/binding_config.h 2009-08-14 10:13:50.359375000 +0200
+@@ -1 +1,2 @@
+-dummy
++#define HAVE_DLFCN_H 1
++//#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-static.patch b/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-static.patch
new file mode 100644
index 0000000..3501024
--- /dev/null
+++ b/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-static.patch
@@ -0,0 +1,6 @@
+--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/binding_config.h 2009-08-14 10:17:23.640625000 +0200
++++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/binding_config.h 2009-08-14 10:13:50.359375000 +0200
+@@ -1 +1,2 @@
+-dummy
++#define HAVE_DLFCN_H 1
++#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
new file mode 100644
index 0000000..9d9a8ad
--- /dev/null
+++ b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
@@ -0,0 +1,237 @@
+--- misc/mysql-connector-c++-1.1.0/cppconn/build_config.h 2010-09-10 11:47:47.000000000 +0200
++++ misc/build/mysql-connector-c++-1.1.0/cppconn/build_config.h 2011-11-12 00:45:19.000000000 +0100
+@@ -25,25 +25,23 @@
+ #ifndef _SQL_BUILD_CONFIG_H_
+ #define _SQL_BUILD_CONFIG_H_
+
+-#ifndef CPPCONN_PUBLIC_FUNC
++#ifndef _SAL_TYPES_H_
++#include <sal/types.h>
++#endif
+
+-#if defined(_WIN32)
+ // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only
+ #ifdef mysqlcppconn_EXPORTS
+- #define CPPCONN_PUBLIC_FUNC __declspec(dllexport)
++ #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_EXPORT
+ #else
+ // this is for static build
+ #ifdef CPPCONN_LIB_BUILD
+ #define CPPCONN_PUBLIC_FUNC
+ #else
+ // this is for clients using dynamic lib
+- #define CPPCONN_PUBLIC_FUNC __declspec(dllimport)
++ #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_IMPORT
+ #endif
+ #endif
+-#else
+- #define CPPCONN_PUBLIC_FUNC
+-#endif
+
+-#endif //#ifndef CPPCONN_PUBLIC_FUNC
++ #define CPPCONN_PUBLIC_EXCEPTION SAL_EXCEPTION_DLLPUBLIC_EXPORT
+
+ #endif //#ifndef _SQL_BUILD_CONFIG_H_
+--- misc/mysql-connector-c++-1.1.0/cppconn/config.h 2009-08-14 10:17:38.234375000 +0200
++++ misc/build/mysql-connector-c++-1.1.0/cppconn/config.h 2009-08-14 09:56:37.000000000 +0200
+@@ -1 +1,34 @@
+-dummy
++#include <sal/types.h>
++
++#define HAVE_FUNCTION_STRTOL 1
++#define HAVE_FUNCTION_STRTOUL 1
++#define HAVE_FUNCTION_STRTOL 1
++#define HAVE_FUNCTION_STRTOULL 1
++
++#if defined(MACOSX) || defined(SOLARIS) || defined(LINUX)
++ #define HAVE_STDINT_H
++ #define HAVE_INTTYPES_H
++#endif
++
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H)
++
++// if we do not have the standard C99 integer types, then define them based on the respective SAL types
++#if !defined(_SYS_TYPES_H)
++typedef sal_Int8 int8_t;
++typedef sal_Int16 int16_t;
++typedef sal_Int32 int32_t;
++#endif // !defined(_SYS_TYPES_H)
++typedef sal_uInt8 uint8_t;
++typedef sal_uInt16 uint16_t;
++typedef sal_uInt32 uint32_t;
++typedef sal_Int64 int64_t;
++typedef sal_uInt64 uint64_t;
++#endif // !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H)
+--- misc/mysql-connector-c++-1.1.0/cppconn/exception.h 2009-08-20 17:51:23.000000000 +0200
++++ misc/build/mysql-connector-c++-1.1.0/cppconn/exception.h 2009-09-11 09:41:41.076379817 +0200
+@@ -37,7 +37,7 @@
+ #pragma warning(push)
+ #pragma warning(disable: 4275)
+ #endif
+-class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
++class CPPCONN_PUBLIC_EXCEPTION SQLException : public std::runtime_error
+ {
+ #ifdef _WIN32
+ #pragma warning(pop)
+@@ -83,26 +83,26 @@
+ MEMORY_ALLOC_OPERATORS(SQLException)
+ };
+
+-struct CPPCONN_PUBLIC_FUNC MethodNotImplementedException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION MethodNotImplementedException : public SQLException
+ {
+ MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
+ };
+
+-struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION InvalidArgumentException : public SQLException
+ {
+ InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
+ };
+
+-struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION InvalidInstanceException : public SQLException
+ {
+ InvalidInstanceException(const InvalidInstanceException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ InvalidInstanceException(const std::string& reason) : SQLException(reason, "", 0) {}
+ };
+
+
+-struct CPPCONN_PUBLIC_FUNC NonScrollableException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION NonScrollableException : public SQLException
+ {
+ NonScrollableException(const NonScrollableException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
+--- misc/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:34.087202551 +0200
++++ misc/build/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:25.902286382 +0200
+@@ -1 +1,64 @@
+-dummy
++PRJ=..$/..$/..$/..$/..
++
++.INCLUDE : $(PRJ)$/cppconn_config.pmk
++
++PRJINC=..
++TARGET=$(PRJNAME)
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++
++.INCLUDE : $(PRJ)$/mysql_config.pmk
++
++# --- Files --------------------------------------------------------
++
++.IF "$(GUI)-$(OS)-$(RTL_ARCH)" == "UNX-LINUX-x86"
++ SHL1NOCHECK=TRUE
++.ENDIF
++SHL1TARGET=$(TARGET)
++
++LIB1TARGET=$(SLB)$/$(PRJNAME).lib
++LIB1OBJFILES+= \
++ $(SLO)$/mysql_art_resultset.obj \
++ $(SLO)$/mysql_art_rset_metadata.obj \
++ $(SLO)$/mysql_connection.obj \
++ $(SLO)$/mysql_debug.obj \
++ $(SLO)$/mysql_driver.obj \
++ $(SLO)$/mysql_metadata.obj \
++ $(SLO)$/mysql_parameter_metadata.obj \
++ $(SLO)$/mysql_prepared_statement.obj \
++ $(SLO)$/mysql_ps_resultset.obj \
++ $(SLO)$/mysql_ps_resultset_metadata.obj \
++ $(SLO)$/mysql_resultbind.obj \
++ $(SLO)$/mysql_resultset.obj \
++ $(SLO)$/mysql_resultset_metadata.obj \
++ $(SLO)$/mysql_statement.obj \
++ $(SLO)$/mysql_util.obj \
++ $(SLO)$/mysql_warning.obj \
++
++SHL1STDLIBS=\
++ $(MYSQL_LIB)
++
++SHL1RPATH=OXT
++SHL1IMPLIB= i$(TARGET)
++SHL1LIBS= $(LIB1TARGET) $(SLB)$/$(CPPCONN_NATIVEAPI).lib
++SHL1DEF= $(MISC)$/$(SHL1TARGET).def
++DEF1NAME= $(SHL1TARGET)
++DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \
++ $(LIB1TARGET)
++DEFLIB1NAME=$(TARGET)
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE : target.mk
++
++# --- filter file ------------------------------
++
++.IF "$(depend)"==""
++$(MISC)$/$(SHL1TARGET).flt: makefile.mk
++ @echo CLEAR_THE_FILE > $@
++ @echo _TI >>$@
++ @echo _real >>$@
++ @echo __CT >>$@
++.ENDIF # "$(depend)"==""
+--- misc/mysql-connector-c++-1.1.0/driver/mysql_debug.h 2009-08-13 17:13:46.000000000 +0200
++++ misc/build/mysql-connector-c++-1.1.0/driver/mysql_debug.h 2009-08-14 09:56:37.015625000 +0200
+@@ -25,16 +25,6 @@
+
+
+
+-#if defined(WE_HAVE_VARARGS_MACRO_SUPPORT) && (CPPCONN_TRACE_ENABLED || defined(SAL_DLLPRIVATE))
+- #define CPP_ENTER(msg) const boost::shared_ptr< MySQL_DebugLogger > __l = this->logger;(void)__l;\
+- MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, this->logger)
+- #define CPP_ENTER_WL(l, msg) const boost::shared_ptr< MySQL_DebugLogger > __l = (l);(void)__l;\
+- MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, (l))
+- #define CPP_INFO(msg) {if (__l) __l->log("INF", msg); }
+- #define CPP_INFO_FMT(...) {if (__l) __l->log_va("INF", __VA_ARGS__); }
+- #define CPP_ERR(msg) {if (__l) __l->log("ERR", msg); }
+- #define CPP_ERR_FMT(...) {if (__l) __l->log_va("ERR", __VA_ARGS__); }
+-#else
+ #define CPP_ENTER(msg)
+ #define CPP_ENTER_WL(l, msg)
+ #define CPP_INFO(msg)
+@@ -42,7 +32,6 @@
+ #define CPP_ENTER_WL(l, msg)
+ static inline void CPP_INFO_FMT(...) {}
+ static inline void CPP_ERR_FMT(...) {}
+-#endif
+
+ #include <stack>
+ #include "mysql_util.h"
+--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/makefile.mk 2009-08-17 21:32:53.694119382 +0200
++++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/makefile.mk 2009-08-17 21:32:50.534346360 +0200
+@@ -1 +1,24 @@
+-dummy
++PRJ=..$/..$/..$/..$/..$/..
++PRJINC=..$/..
++
++.INCLUDE : $(PRJ)$/cppconn_config.pmk
++
++TARGET=$(CPPCONN_NATIVEAPI)
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++
++.INCLUDE : $(PRJ)$/mysql_config.pmk
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1OBJFILES+= \
++ $(SLO)$/mysql_client_api.obj \
++ $(SLO)$/library_loader.obj \
++ $(SLO)$/mysql_native_driver_wrapper.obj \
++ $(SLO)$/mysql_native_connection_wrapper.obj \
++ $(SLO)$/mysql_native_resultset_wrapper.obj \
++ $(SLO)$/mysql_native_statement_wrapper.obj \
++
++# --- Targets ------------------------------------------------------
++.INCLUDE : target.mk
diff --git a/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch b/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch
deleted file mode 100644
index 7007c3d..0000000
--- a/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:17:23.640625000 +0200
-+++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:13:50.359375000 +0200
-@@ -1 +1,2 @@
--dummy
-+#define HAVE_DLFCN_H 1
-+//#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch b/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch
deleted file mode 100644
index b7edeb9..0000000
--- a/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:17:23.640625000 +0200
-+++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h 2009-08-14 10:13:50.359375000 +0200
-@@ -1 +1,2 @@
--dummy
-+#define HAVE_DLFCN_H 1
-+#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/mysql-connector-cpp.patch b/mysqlcppconn/mysql-connector-cpp.patch
deleted file mode 100644
index 0575653..0000000
--- a/mysqlcppconn/mysql-connector-cpp.patch
+++ /dev/null
@@ -1,379 +0,0 @@
---- misc/mysql-connector-cpp/cppconn/build_config.h 2009-08-13 17:13:46.000000000 +0200
-+++ misc/build/mysql-connector-cpp/cppconn/build_config.h 2009-09-11 09:41:41.150391316 +0200
-@@ -1,36 +1,34 @@
--/*
-- Copyright 2007 - 2008 MySQL AB, 2008 - 2009 Sun Microsystems, Inc. All rights reserved.
--
-- The MySQL Connector/C++ is licensed under the terms of the GPL
-- <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
-- MySQL Connectors. There are special exceptions to the terms and
-- conditions of the GPL as it is applied to this software, see the
-- FLOSS License Exception
-- <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
--*/
--
--#ifndef _SQL_BUILD_CONFIG_H_
--#define _SQL_BUILD_CONFIG_H_
--
--#ifndef CPPCONN_PUBLIC_FUNC
--
--#if defined(_WIN32)
-- // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only
-- #ifdef mysqlcppconn_EXPORTS
-- #define CPPCONN_PUBLIC_FUNC __declspec(dllexport)
-- #else
-- // this is for static build
-- #ifdef CPPCONN_LIB_BUILD
-- #define CPPCONN_PUBLIC_FUNC
-- #else
-- // this is for clients using dynamic lib
-- #define CPPCONN_PUBLIC_FUNC __declspec(dllimport)
-- #endif
-- #endif
--#else
-- #define CPPCONN_PUBLIC_FUNC
--#endif
--
--#endif //#ifndef CPPCONN_PUBLIC_FUNC
--
--#endif //#ifndef _SQL_BUILD_CONFIG_H_
-+/*
-+ Copyright 2007 - 2008 MySQL AB, 2008 - 2009 Sun Microsystems, Inc. All rights reserved.
-+
-+ The MySQL Connector/C++ is licensed under the terms of the GPL
-+ <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
-+ MySQL Connectors. There are special exceptions to the terms and
-+ conditions of the GPL as it is applied to this software, see the
-+ FLOSS License Exception
-+ <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
-+*/
-+
-+#ifndef _SQL_BUILD_CONFIG_H_
-+#define _SQL_BUILD_CONFIG_H_
-+
-+#ifndef _SAL_TYPES_H_
-+#include <sal/types.h>
-+#endif
-+
-+ // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only
-+ #ifdef mysqlcppconn_EXPORTS
-+ #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_EXPORT
-+ #else
-+ // this is for static build
-+ #ifdef CPPCONN_LIB_BUILD
-+ #define CPPCONN_PUBLIC_FUNC
-+ #else
-+ // this is for clients using dynamic lib
-+ #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_IMPORT
-+ #endif
-+ #endif
-+
-+ #define CPPCONN_PUBLIC_EXCEPTION SAL_EXCEPTION_DLLPUBLIC_EXPORT
-+
-+#endif //#ifndef _SQL_BUILD_CONFIG_H_
---- misc/mysql-connector-cpp/cppconn/config.h 2009-08-14 10:17:38.234375000 +0200
-+++ misc/build/mysql-connector-cpp/cppconn/config.h 2009-08-14 09:56:37.000000000 +0200
-@@ -1 +1,34 @@
--dummy
-+#include <sal/types.h>
-+
-+#define HAVE_FUNCTION_STRTOL 1
-+#define HAVE_FUNCTION_STRTOUL 1
-+#define HAVE_FUNCTION_STRTOL 1
-+#define HAVE_FUNCTION_STRTOULL 1
-+
-+#if defined(MACOSX) || defined(SOLARIS) || defined(LINUX)
-+ #define HAVE_STDINT_H
-+ #define HAVE_INTTYPES_H
-+#endif
-+
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-+
-+#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H)
-+
-+// if we do not have the standard C99 integer types, then define them based on the respective SAL types
-+#if !defined(_SYS_TYPES_H)
-+typedef sal_Int8 int8_t;
-+typedef sal_Int16 int16_t;
-+typedef sal_Int32 int32_t;
-+#endif // !defined(_SYS_TYPES_H)
-+typedef sal_uInt8 uint8_t;
-+typedef sal_uInt16 uint16_t;
-+typedef sal_uInt32 uint32_t;
-+typedef sal_Int64 int64_t;
-+typedef sal_uInt64 uint64_t;
-+#endif // !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H)
---- misc/mysql-connector-cpp/cppconn/connection.h 2009-08-13 17:13:46.000000000 +0200
-+++ misc/build/mysql-connector-cpp/cppconn/connection.h 2009-08-14 09:56:37.000000000 +0200
-@@ -13,7 +13,6 @@
- #define _SQL_CONNECTION_H_
-
- #include <map>
--#include <boost/variant.hpp>
-
- #include "build_config.h"
- #include "warning.h"
-@@ -22,8 +21,54 @@
- namespace sql
- {
-
--
--typedef boost::variant<int, double, bool, sql::SQLString > ConnectPropertyVal;
-+// hack around the non-existent ::boost::variant in OOo 3.1 build env
-+struct ConnectPropertyVal
-+{
-+ sql::SQLString valString;
-+ int valInt;
-+ bool valBool;
-+
-+ ConnectPropertyVal()
-+ {
-+ reset();
-+ }
-+ ConnectPropertyVal( const sql::SQLString& _val )
-+ {
-+ *this = _val;
-+ }
-+ ConnectPropertyVal( const int _val )
-+ {
-+ *this = _val;
-+ }
-+ ConnectPropertyVal( const bool _val )
-+ {
-+ *this = _val;
-+ }
-+ ConnectPropertyVal& operator=( const sql::SQLString& _val )
-+ {
-+ reset();
-+ valString = _val;
-+ return *this;
-+ }
-+ ConnectPropertyVal& operator=( const int _val )
-+ {
-+ reset();
-+ valInt = _val;
-+ return *this;
-+ }
-+ ConnectPropertyVal& operator=( const bool _val )
-+ {
-+ reset();
-+ valBool = _val;
-+ return *this;
-+ }
-+ void reset()
-+ {
-+ valString = std::string();
-+ valInt = 0;
-+ valBool = false;
-+ }
-+};
-
- typedef std::map< sql::SQLString, ConnectPropertyVal > ConnectOptionsMap;
-
---- misc/mysql-connector-cpp/cppconn/exception.h 2009-08-20 17:51:23.000000000 +0200
-+++ misc/build/mysql-connector-cpp/cppconn/exception.h 2009-09-11 09:41:41.076379817 +0200
-@@ -37,7 +37,7 @@
- #pragma warning(push)
- #pragma warning(disable: 4275)
- #endif
--class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
-+class CPPCONN_PUBLIC_EXCEPTION SQLException : public std::runtime_error
- {
- #ifdef _WIN32
- #pragma warning(pop)
-@@ -83,26 +83,26 @@
- MEMORY_ALLOC_OPERATORS(SQLException)
- };
-
--struct CPPCONN_PUBLIC_FUNC MethodNotImplementedException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION MethodNotImplementedException : public SQLException
- {
- MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
- };
-
--struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION InvalidArgumentException : public SQLException
- {
- InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
- };
-
--struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION InvalidInstanceException : public SQLException
- {
- InvalidInstanceException(const InvalidInstanceException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- InvalidInstanceException(const std::string& reason) : SQLException(reason, "", 0) {}
- };
-
-
--struct CPPCONN_PUBLIC_FUNC NonScrollableException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION NonScrollableException : public SQLException
- {
- NonScrollableException(const NonScrollableException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
---- misc/mysql-connector-cpp/driver/makefile.mk 2009-09-11 09:42:34.087202551 +0200
-+++ misc/build/mysql-connector-cpp/driver/makefile.mk 2009-09-11 09:42:25.902286382 +0200
-@@ -1 +1,64 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+.INCLUDE : $(PRJ)$/cppconn_config.pmk
-+
-+PRJINC=..
-+TARGET=$(PRJNAME)
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+.INCLUDE : $(PRJ)$/mysql_config.pmk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(GUI)-$(OS)-$(RTL_ARCH)" == "UNX-LINUX-x86"
-+ SHL1NOCHECK=TRUE
-+.ENDIF
-+SHL1TARGET=$(TARGET)
-+
-+LIB1TARGET=$(SLB)$/$(PRJNAME).lib
-+LIB1OBJFILES+= \
-+ $(SLO)$/mysql_art_resultset.obj \
-+ $(SLO)$/mysql_art_rset_metadata.obj \
-+ $(SLO)$/mysql_connection.obj \
-+ $(SLO)$/mysql_debug.obj \
-+ $(SLO)$/mysql_driver.obj \
-+ $(SLO)$/mysql_metadata.obj \
-+ $(SLO)$/mysql_parameter_metadata.obj \
-+ $(SLO)$/mysql_prepared_statement.obj \
-+ $(SLO)$/mysql_ps_resultset.obj \
-+ $(SLO)$/mysql_ps_resultset_metadata.obj \
-+ $(SLO)$/mysql_resultbind.obj \
-+ $(SLO)$/mysql_resultset.obj \
-+ $(SLO)$/mysql_resultset_metadata.obj \
-+ $(SLO)$/mysql_statement.obj \
-+ $(SLO)$/mysql_util.obj \
-+ $(SLO)$/mysql_warning.obj \
-+
-+SHL1STDLIBS=\
-+ $(MYSQL_LIB)
-+
-+SHL1RPATH=OXT
-+SHL1IMPLIB= i$(TARGET)
-+SHL1LIBS= $(LIB1TARGET) $(SLB)$/$(CPPCONN_NATIVEAPI).lib
-+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-+DEF1NAME= $(SHL1TARGET)
-+DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \
-+ $(LIB1TARGET)
-+DEFLIB1NAME=$(TARGET)
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : target.mk
-+
-+# --- filter file ------------------------------
-+
-+.IF "$(depend)"==""
-+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-+ @echo CLEAR_THE_FILE > $@
-+ @echo _TI >>$@
-+ @echo _real >>$@
-+ @echo __CT >>$@
-+.ENDIF # "$(depend)"==""
---- misc/mysql-connector-cpp/driver/mysql_connection.cpp 2009-08-13 17:13:46.000000000 +0200
-+++ misc/build/mysql-connector-cpp/driver/mysql_connection.cpp 2009-08-14 09:56:37.015625000 +0200
-@@ -50,6 +50,34 @@
- #include "mysql_debug.h"
-
-
-+// part II of the hack to make C/C++ compile in an OOo env which doesn't have boost::variant installed
-+namespace boost
-+{
-+ template < class TYPE >
-+ const TYPE* get( const sql::ConnectPropertyVal* val )
-+ {
-+ return val;
-+ }
-+
-+ template < >
-+ const sql::SQLString* get< sql::SQLString >( const sql::ConnectPropertyVal* val )
-+ {
-+ return &val->valString;
-+ }
-+
-+ template < >
-+ const int* get< int >( const sql::ConnectPropertyVal* val )
-+ {
-+ return &val->valInt;
-+ }
-+
-+ template < >
-+ const bool* get< bool >( const sql::ConnectPropertyVal* val )
-+ {
-+ return &val->valBool;
-+ }
-+}
-+
- namespace sql
- {
- namespace mysql
---- misc/mysql-connector-cpp/driver/mysql_debug.h 2009-08-13 17:13:46.000000000 +0200
-+++ misc/build/mysql-connector-cpp/driver/mysql_debug.h 2009-08-14 09:56:37.015625000 +0200
-@@ -25,16 +25,6 @@
-
-
-
--#if defined(WE_HAVE_VARARGS_MACRO_SUPPORT) && (CPPCONN_TRACE_ENABLED || defined(SAL_DLLPRIVATE))
-- #define CPP_ENTER(msg) const boost::shared_ptr< MySQL_DebugLogger > __l = this->logger;(void)__l;\
-- MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, this->logger)
-- #define CPP_ENTER_WL(l, msg) const boost::shared_ptr< MySQL_DebugLogger > __l = (l);(void)__l;\
-- MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, (l))
-- #define CPP_INFO(msg) {if (__l) __l->log("INF", msg); }
-- #define CPP_INFO_FMT(...) {if (__l) __l->log_va("INF", __VA_ARGS__); }
-- #define CPP_ERR(msg) {if (__l) __l->log("ERR", msg); }
-- #define CPP_ERR_FMT(...) {if (__l) __l->log_va("ERR", __VA_ARGS__); }
--#else
- #define CPP_ENTER(msg)
- #define CPP_ENTER_WL(l, msg)
- #define CPP_INFO(msg)
-@@ -42,7 +32,6 @@
- #define CPP_ENTER_WL(l, msg)
- static inline void CPP_INFO_FMT(...) {}
- static inline void CPP_ERR_FMT(...) {}
--#endif
-
- #include <stack>
- #include "mysql_util.h"
---- misc/mysql-connector-cpp/driver/nativeapi/makefile.mk 2009-08-17 21:32:53.694119382 +0200
-+++ misc/build/mysql-connector-cpp/driver/nativeapi/makefile.mk 2009-08-17 21:32:50.534346360 +0200
-@@ -1 +1,23 @@
--dummy
-+PRJ=..$/..$/..$/..$/..$/..
-+PRJINC=..$/..
-+
-+.INCLUDE : $(PRJ)$/cppconn_config.pmk
-+
-+TARGET=$(CPPCONN_NATIVEAPI)
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+.INCLUDE : $(PRJ)$/mysql_config.pmk
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1OBJFILES+= \
-+ $(SLO)$/mysql_client_api.obj \
-+ $(SLO)$/library_loader.obj \
-+ $(SLO)$/mysql_native_connection_wrapper.obj \
-+ $(SLO)$/mysql_native_resultset_wrapper.obj \
-+ $(SLO)$/mysql_native_statement_wrapper.obj \
-+
-+# --- Targets ------------------------------------------------------
-+.INCLUDE : target.mk
diff --git a/mysqlcppconn/patches/default_to_protocol_tcp.patch b/mysqlcppconn/patches/default_to_protocol_tcp.patch
index 3df78f4..320d699 100644
--- a/mysqlcppconn/patches/default_to_protocol_tcp.patch
+++ b/mysqlcppconn/patches/default_to_protocol_tcp.patch
@@ -1,7 +1,7 @@
---- misc/mysql-connector-cpp/driver/mysql_connection.cpp 2009-12-16 13:24:24.088933245 +0100
-+++ misc/build/mysql-connector-cpp/driver/mysql_connection.cpp 2009-12-16 13:24:15.666841004 +0100
+--- misc/mysql-connector-c++-1.1.0/driver/mysql_connection.cpp 2009-12-16 13:24:24.088933245 +0100
++++ misc/build/mysql-connector-c++-1.1.0/driver/mysql_connection.cpp 2009-12-16 13:24:15.666841004 +0100
@@ -437,6 +437,9 @@
- throw sql::InvalidArgumentException(e.what());
+ }
}
+ int default_protocol_tcp = MYSQL_PROTOCOL_TCP;
diff --git a/ooo.lst.in b/ooo.lst.in
index 83e1ca5..740327d 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -51,7 +51,7 @@ fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
-831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
+0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
More information about the Libreoffice-commits
mailing list