[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[René Engelhard]

 patches/dev300/apply                                |    3 +++
 patches/dev300/mysqlcppconn-mysqlclient-SONAME.diff |   18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

New commits:
commit 6929a9d4285be22b2e6d682bab6d0c5bca2e8fa5
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Dec 12 12:58:31 2009 +0100

    open libmysqlclient_r.so.16 instead of libmysqlclient_r.so
    
    * patches/dev300/mysqlcppconn-mysqlclient-SONAME.diff:
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3db3dbd..4b7e75f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3519,6 +3519,9 @@ cws-mysqlnative-20090916.diff
 # Needs a libmysqlcppconn-stlport.so etc built with STLport
 #debian-mysqlc-build-against-stlport-hack.diff
 
+# fix mysqlc to use the SONAME instead of the .so symlink...
+mysqlcppconn-mysqlclient-SONAME.diff
+
 [ EMFPlus ]
 emf+-driver-string.diff, n#519715, rodo
 
diff --git a/patches/dev300/mysqlcppconn-mysqlclient-SONAME.diff b/patches/dev300/mysqlcppconn-mysqlclient-SONAME.diff
new file mode 100644
index 0000000..24be4a8
--- /dev/null
+++ b/patches/dev300/mysqlcppconn-mysqlclient-SONAME.diff
@@ -0,0 +1,18 @@
+--- mysqlcppconn/mysql-connector-cpp.patch-old	2009-12-12 12:50:45.000000000 +0100
++++ mysqlcppconn/mysql-connector-cpp.patch	2009-12-12 12:51:55.000000000 +0100
+@@ -383,3 +383,15 @@
+ +
+ +# --- Targets ------------------------------------------------------
+ +.INCLUDE :  target.mk
++diff -urNad mysql-connector-c++-1.0.6~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp
++--- misc/mysql-connector-cpp/driver/nativeapi/libmysql_dynamic_proxy.cpp	2009-08-20 16:42:14.000000000 +0200
+++++ misc/build/mysql-connector-cpp/driver/nativeapi/libmysql_dynamic_proxy.cpp	2009-08-20 20:25:31.000000000 +0200
++@@ -26,7 +26,7 @@
++ #elif defined(__APPLE__)
++ static const char * const baseName = "libmysqlclient_r.dylib";
++ #else
++-static const char * const baseName = "libmysqlclient_r.so";
+++static const char * const baseName = "libmysqlclient_r.so.16";
++ #endif
++ 
++ template<typename FunctionType>