diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-11-13 10:31:22 +0100 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-11-13 23:55:26 +0100 |
commit | 770cb8ae4d0472d8eb9b32046f5820181fb1de93 (patch) | |
tree | 20800882296c692d0edaed342c96f1a103c02b0f | |
parent | spelling (diff) | |
download | core-770cb8ae4d0472d8eb9b32046f5820181fb1de93.tar.gz core-770cb8ae4d0472d8eb9b32046f5820181fb1de93.zip |
Update mysqlcppcon to version 1.1.0
Drop patch to avoid use of boost::variant
-rw-r--r-- | mysqlcppconn/makefile.mk | 6 | ||||
-rw-r--r-- | mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch | 6 | ||||
-rw-r--r-- | mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-static.patch | 6 | ||||
-rw-r--r-- | mysqlcppconn/mysql-connector-c++-1.1.0.patch (renamed from mysqlcppconn/mysql-connector-cpp.patch) | 216 | ||||
-rw-r--r-- | mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch | 6 | ||||
-rw-r--r-- | mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch | 6 | ||||
-rw-r--r-- | mysqlcppconn/patches/default_to_protocol_tcp.patch | 6 | ||||
-rw-r--r-- | ooo.lst.in | 2 |
8 files changed, 56 insertions, 198 deletions
diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk index e047ea06ffc4..d7fa8a6f380f 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 000000000000..f013b5ef5c74 --- /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 000000000000..35010246fa1c --- /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-cpp.patch b/mysqlcppconn/mysql-connector-c++-1.1.0.patch index 0575653cedeb..9d9a8ad7c60e 100644 --- a/mysqlcppconn/mysql-connector-cpp.patch +++ b/mysqlcppconn/mysql-connector-c++-1.1.0.patch @@ -1,78 +1,39 @@ ---- 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_ -- +--- 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 + // 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 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) -- #endif -- #endif ++ #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_IMPORT + #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 + + #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> @@ -109,75 +70,8 @@ +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 +--- 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) @@ -218,8 +112,8 @@ { 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 +--- 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=..$/..$/..$/..$/.. @@ -286,45 +180,8 @@ + @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 +--- 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 @@ @@ -350,9 +207,9 @@ #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 @@ +--- 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=..$/.. @@ -371,6 +228,7 @@ +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 \ 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 7007c3d16602..000000000000 --- 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 b7edeb94d522..000000000000 --- 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/patches/default_to_protocol_tcp.patch b/mysqlcppconn/patches/default_to_protocol_tcp.patch index 3df78f40f5b7..320d699ed697 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 83e1ca5cb387..740327dd4b37 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 |