[SCM] Amarok packaging branch, master, updated. debian/2.5.0-1-11-g4680f74

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=5af14b3

The following commit has been merged in the master branch:
commit 5af14b354feff3ac4368b80f49ce4f0b2cd28906
Author: Modestas Vainius <modax at debian.org>
Date:   Sun May 20 14:28:39 2012 +0300

    Force MySQLe to use our custom defaults file.
    
    This makes MySQLe independent from system MySQL configuration. (Closes:
    #672207, #673403)
    Patch debian_mysqle_force_defaults_file.diff
---
 debian/changelog                                   |    3 ++
 .../patches/debian_mysqle_force_defaults_file.diff |   29 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c0e164..1b1ba0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ amarok (2.5.0-2~pre1) UNRELEASED; urgency=low
     5.5.23.
   * Add libssl-dev and libaio-dev [linux-any] to Build-Depends because they are
     needed for libmysqld-pic 5.5.23.
+  * Force MySQLe to use our custom defaults file. This makes MySQLe independent
+    from system MySQL configuration. (Closes: #672207, #673403)
+    Patch debian_mysqle_force_defaults_file.diff
 
  -- Modestas Vainius <modax at debian.org>  Sat, 19 May 2012 22:16:23 +0300
 
diff --git a/debian/patches/debian_mysqle_force_defaults_file.diff b/debian/patches/debian_mysqle_force_defaults_file.diff
new file mode 100644
index 0000000..9ca0620
--- /dev/null
+++ b/debian/patches/debian_mysqle_force_defaults_file.diff
@@ -0,0 +1,29 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Force MySQLe to use our custom defaults file
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673403
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672207
+Origin: vendor
+Last-Update: 2012-05-20
+
+Defaults-file is forced via mysql_library_init() command line option
+--defaults-file. If this option is not present, mysql_library_init() will also
+look for defaults file in the system paths likely making it dependent on the
+system-wide MySQL configuration. This causes such side effects like MySQLe
+looking for /etc/mysql/conf.d/ or reading system errmsg.sys.
+
+--- a/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
++++ b/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
+@@ -92,8 +92,11 @@ MySqlEmbeddedStorage::MySqlEmbeddedStora
+ 
+     setenv( "MYSQL_HOME", storagePath.toAscii().data(), 1 );
+     setenv( "DEFAULT_HOME_ENV", storagePath.toAscii().data(), 1 );
+-    char *args[] = { (char*) "amarok" };
+-    if( mysql_library_init( 1 , args, 0 ) != 0 )
++    char *args[] = {
++        (char*) "amarok",
++        QString(QLatin1String("--defaults-file=")+defaultsFile).toAscii().data()
++    };
++    if( mysql_library_init( 2 , args, 0 ) != 0 )
+     {
+         error() << "MySQL library initialization failed.";
+         reportError( "init" );
diff --git a/debian/patches/series b/debian/patches/series
index 045926e..e56486e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 upstream_fix_lyrics_autorefresh_in_some_cases.patch
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
+debian_mysqle_force_defaults_file.diff
 debian_find_mysql_fix.diff
 debian_fix_doc_nl_build.diff

-- 
Amarok packaging