Update to latest upstream, new userconfig.patch.

1 files changed, 8 insertions, 26 deletions

diff --git a/userconfig.patch b/userconfig.patch
index b5ec5ff5ea6c..0e41714e92fc 100644
--- a/userconfig.patch
+++ b/userconfig.patch
@@ -1,31 +1,13 @@
 diff --git a/pd/src/s_file.c b/pd/src/s_file.c
-index 1c18096f..576e4c36 100644
+index 32f54c31..304524d5 100644
 --- a/pd/src/s_file.c
 +++ b/pd/src/s_file.c
-@@ -62,7 +62,7 @@ static void sys_initloadpreferences( void)
-              sys_libdir->s_name);
+@@ -46,7 +46,7 @@ void sys_doflags( void);
  
-     if (homedir)
--        snprintf(user_prefs_file, FILENAME_MAX, "%s/.pd-l2ork/user.settings", homedir);
-+        snprintf(user_prefs_file, FILENAME_MAX, "%s/.purr-data/user.settings", homedir);
-     if (stat(user_prefs_file, &statbuf) == 0) 
-         strncpy(filenamebuf, user_prefs_file, FILENAME_MAX);
-     else if (stat(default_prefs_file, &statbuf) == 0)
-@@ -143,7 +143,7 @@ static void sys_initsavepreferences( void)
+ #ifdef UNIX
+ 
+-#define USER_CONFIG_DIR ".pd-l2ork"
++#define USER_CONFIG_DIR ".purr-data"
+ 
+ static char *sys_prefbuf;
  
-     if (!homedir)
-         return;
--    snprintf(filenamebuf, FILENAME_MAX, "%s/.pd-l2ork", homedir);
-+    snprintf(filenamebuf, FILENAME_MAX, "%s/.purr-data", homedir);
-     filenamebuf[FILENAME_MAX-1] = 0;
-     if (stat(filenamebuf, &statbuf) || !S_ISDIR(statbuf.st_mode)) {
-       // user config dir doesn't exist yet, try to create it
-@@ -152,7 +152,7 @@ static void sys_initsavepreferences( void)
- 	return;
-       }
-     }
--    snprintf(filenamebuf, FILENAME_MAX, "%s/.pd-l2ork/user.settings", homedir);
-+    snprintf(filenamebuf, FILENAME_MAX, "%s/.purr-data/user.settings", homedir);
-     filenamebuf[FILENAME_MAX-1] = 0;
-     if ((sys_prefsavefp = fopen(filenamebuf, "w")) == NULL)
-     {