[Libreoffice-commits] .: patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Wed Mar 30 08:14:45 PDT 2011


 patches/dev300/apply                                  |    5 ----
 patches/dev300/mysqlcppconn-static-mysql-binding.diff |   20 ------------------
 2 files changed, 25 deletions(-)

New commits:
commit 1d65f9b917e85cc49fe6e31f0fb5a403cc4cfa42
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:13:47 2011 +0200

    bin obsolete mysqlcppconn-static-mysql-binding.diff
    
    the plain sources were updated to sue the static binding when
    the system mysql is configured

diff --git a/patches/dev300/apply b/patches/dev300/apply
index aee24cf..06039b2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -409,11 +409,6 @@ mdv-exceptcxx-include-string.diff, cabral
 # FIXME: do we want another config dir for the Novell buidls?
 scp2-user-config-suse.diff, pmladek
 
-# link against the versioned libmysqlcppconn
-# we do not want to require the devel package
-# FIXME: this should be set automatically when you use the system mysqlcppconn
-mysqlcppconn-static-mysql-binding.diff, pmladek
-
 [ DisableGCJ ]
 
 # ignore gcj; OOo newer worked well with it
diff --git a/patches/dev300/mysqlcppconn-static-mysql-binding.diff b/patches/dev300/mysqlcppconn-static-mysql-binding.diff
deleted file mode 100644
index 09fad82..0000000
--- a/patches/dev300/mysqlcppconn-static-mysql-binding.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- mysqlcppconn/mysql-connector-cpp.patch |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git mysqlcppconn/mysql-connector-cpp.patch mysqlcppconn/mysql-connector-cpp.patch
-index b710504..8e37bcd 100644
---- mysqlcppconn/mysql-connector-cpp.patch
-+++ mysqlcppconn/mysql-connector-cpp.patch
-@@ -355,7 +355,7 @@
- @@ -1 +1,2 @@
- -dummy
- +#define HAVE_DLFCN_H 1
--+//#define MYSQLCLIENT_STATIC_BINDING 1
-++#define MYSQLCLIENT_STATIC_BINDING 1
- --- 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 @@
--- 
-1.7.0.1
-


More information about the Libreoffice-commits mailing list