[SCM] yoshimi packaging branch, master, updated. debian/0.058-1-8-g60c90ff

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4a07a4cdb99af34883ac37f5e62c508e651264c1
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jul 12 18:06:35 2010 +0200

    Update 02-userconfig_path.patch.

diff --git a/debian/patches/02-userconfig_path.patch b/debian/patches/02-userconfig_path.patch
index 1f068ae..b1ec48f 100644
--- a/debian/patches/02-userconfig_path.patch
+++ b/debian/patches/02-userconfig_path.patch
@@ -2,14 +2,25 @@ Author: Alessio Treglia <alessio at debian.org>
 Description: Store user settings under ${HOME}/.config as
  Freedesktop.org's per-spec.
  http://www.freedesktop.org/wiki/Software/xdg-user-dirs
-Forwarded: no
+Forwarded: cal at graggrag.com
 ---
- src/Misc/Config.cpp |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ src/Misc/Config.cpp |   25 ++++++++++++++++++++-----
+ src/Misc/Config.h   |    1 +
+ 2 files changed, 21 insertions(+), 5 deletions(-)
 
 --- yoshimi.orig/src/Misc/Config.cpp
 +++ yoshimi/src/Misc/Config.cpp
-@@ -67,16 +67,16 @@ static struct argp_option cmd_options[]
+@@ -29,6 +29,9 @@
+ #include <xmmintrin.h>
+ #endif
+ 
++#include <errno.h>
++#include <sys/stat.h>
++
+ using namespace std;
+ 
+ #include "GuiThreadUI.h"
+@@ -67,16 +70,16 @@ static struct argp_option cmd_options[]
      {"autostart-jack",  'k',  NULL,         0,  "auto start jack server" },
      {"auto-connect",    'K',  NULL,         0,  "auto connect jack audio" },
      {"state",           'S',  "<file>",   0x1,
@@ -29,7 +40,33 @@ Forwarded: no
      Samplerate(48000),
      Buffersize(128),
      Oscilsize(1024),
-@@ -304,7 +304,7 @@ bool Config::loadConfigData(XMLwrapper *
+@@ -112,6 +115,7 @@ Config::Config() :
+         Log("Setting SIGQUIT handler failed");
+     AntiDenormals(true);       
+ 
++    checkConfigDir();
+     clearBankrootDirlist();
+     clearPresetsDirlist();
+     loadConfig();
+@@ -233,6 +237,17 @@ void Config::clearPresetsDirlist(void)
+         presetsDirlist[i].clear();
+ }
+ 
++bool Config::checkConfigDir(void)
++{
++    string str_conf_dir = string(getenv("HOME")) + string("/.config/yoshimi");
++    if(mkdir((char *) str_conf_dir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0 && errno != EEXIST)
++    {
++        Log("Unable to create " + str_conf_dir);
++        return false;
++    }
++    return true;
++}
++
+ bool Config::loadConfig(void)
+ {
+     XMLwrapper *xml = new XMLwrapper();
+@@ -304,7 +319,7 @@ bool Config::loadConfigData(XMLwrapper *
              "/usr/local/share/yoshimi/banks",
              "/usr/share/zynaddsubfx/banks",
              "/usr/local/share/zynaddsubfx/banks",
@@ -38,7 +75,7 @@ Forwarded: no
              "../banks",
              "banks"
          };
-@@ -337,7 +337,7 @@ bool Config::loadConfigData(XMLwrapper *
+@@ -337,7 +352,7 @@ bool Config::loadConfigData(XMLwrapper *
              "/usr/local/share/yoshimi/presets",
              "/usr/share/zynaddsubfx/presets",
              "/usr/local/share/zynaddsubfx/presets",
@@ -47,3 +84,13 @@ Forwarded: no
              "../presets",
              "presets"
          };
+--- yoshimi.orig/src/Misc/Config.h
++++ yoshimi/src/Misc/Config.h
+@@ -107,6 +107,7 @@ class Config
+         list<string> LogList;
+ 
+     private:
++        bool checkConfigDir(void);
+         bool loadConfig(void);
+         bool loadConfigData(XMLwrapper *xml);
+         bool loadRuntimeData(XMLwrapper *xml);

-- 
yoshimi packaging