[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-2-12-gaa6c87b
The following commit has been merged in the master branch:
commit 9c9a557d634fbc734c18244f780f06e4b917ac95
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 15 00:14:36 2012 +0200
dynamically determine libmysqlclient_r.so.XX in internal mysqlcppconn
diff --git a/changelog b/changelog
index 2366ebd..ac4afd9 100644
--- a/changelog
+++ b/changelog
@@ -8,9 +8,9 @@ libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
* debian/rules:
- (temporarily) stop building -gcj even on kfreebsd-* to be able to get into
testing (otherwise gcc-defaults is blocking...)
- * debian/rules, debian/mysqlcppconn-mysqlclient-SONAME.diff: update
- internal mysqlcppconn for MySQL 5.5 (.so-16 -> .so.18);
- build-depend on >= 5.5~ if using internal version
+ * debian/mysqlcppconn-mysqlclient-SONAME.diff: move ...
+ * debian/mysqlcppconn-libmysqlclient-SONAME.diff: ... and dynamically determine
+ libmysqlclient_r.so.XX in internal mysqlcppconn
[ Andreas Beckmann ]
* debian/shell-lib-extension.sh: set HOME to $INSTDIR also for
diff --git a/patches/mysqlcppconn-libmysqlclient-SONAME.diff b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
new file mode 100644
index 0000000..1b457c7
--- /dev/null
+++ b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
@@ -0,0 +1,38 @@
+diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
+index 9d9a8ad..b8cccf7 100644
+--- a/mysqlcppconn/mysql-connector-c++-1.1.0.patch
++++ b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
+@@ -114,7 +114,7 @@
+ 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 @@
++@@ -1 +1,66 @@
+ -dummy
+ +PRJ=..$/..$/..$/..$/..
+ +
+@@ -167,6 +167,8 @@
+ + $(LIB1TARGET)
+ +DEFLIB1NAME=$(TARGET)
+ +
+++CFLAGS += -DLIBMYSQLCLIENT_SONAME=\"$(shell readlink -f `mysql_config --variable=pkglibdir`/libmysqlclient_r.so | sed -e "s,`mysql_config --variable=pkglibdir`/\(libmysqlclient.so.[0-9][0-9]\).*,\\1,")\"
+++
+ +# --- Targets ------------------------------------------------------
+ +
+ +.INCLUDE : target.mk
+@@ -235,3 +235,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-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 16:42:14.000000000 +0200
+++++ misc/build/mysql-connector-c++-1.1.0/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_SONAME;
++ #endif
++
++ template<typename FunctionType>
diff --git a/patches/mysqlcppconn-mysqlclient-SONAME.diff b/patches/mysqlcppconn-mysqlclient-SONAME.diff
deleted file mode 100644
index 7923001..0000000
--- a/patches/mysqlcppconn-mysqlclient-SONAME.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
-index 9d9a8ad..b8cccf7 100644
---- a/mysqlcppconn/mysql-connector-c++-1.1.0.patch
-+++ b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
-@@ -235,3 +235,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-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 16:42:14.000000000 +0200
-++++ misc/build/mysql-connector-c++-1.1.0/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.18";
-+ #endif
-+
-+ template<typename FunctionType>
diff --git a/patches/series b/patches/series
index 8e7c80c..473592a 100644
--- a/patches/series
+++ b/patches/series
@@ -15,7 +15,7 @@ sensible-lomua.diff
sensible-browser.diff
reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
-mysqlcppconn-mysqlclient-SONAME.diff
+mysqlcppconn-libmysqlclient-SONAME.diff
make-pyuno-work-with-system-wide-module-install.diff
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
--
LibreOffice packaging repository
Reply to: