Update to latest upstream, new userconfig.patch.

3 files changed, 13 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddd0aa2dfe77..06cc2782a5a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jan  7 09:55:16 UTC 2017
+# Fri Jan 20 08:03:45 UTC 2017
 pkgbase = purr-data-git
 	pkgdesc = Jonathan Wilkes' nw.js variant of Pd-L2Ork (git version)
-	pkgver = 20170106.r3227.7ad55854
+	pkgver = 20170120.r3267.faab60c4
 	pkgrel = 1
 	url = https://git.purrdata.net/jwilkes/purr-data
 	install = purr-data.install
@@ -71,7 +71,7 @@ pkgbase = purr-data-git
 	source = userconfig.patch
 	md5sums = SKIP
 	md5sums = 39c53063dc18681f29b12c08d9c453aa
-	md5sums = 0707c240816e87b0f605058c2ab8e153
+	md5sums = 056770a94f3c13799c09d3ece273154f
 	source_i686 = http://dl.nwjs.io/v0.18.5/nwjs-sdk-v0.18.5-linux-ia32.tar.gz
 	md5sums_i686 = 1d5e9e25c36b7c3221e317baa7d94b64
 	source_x86_64 = http://dl.nwjs.io/v0.18.5/nwjs-sdk-v0.18.5-linux-x64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 5045423214e8..a33041ad9c9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@
 # /usr/lib/purr-data, so that 3rd party externals know where to find these.
 
 pkgname=purr-data-git
-pkgver=20170106.r3227.7ad55854
+pkgver=20170120.r3267.faab60c4
 pkgrel=1
 pkgdesc="Jonathan Wilkes' nw.js variant of Pd-L2Ork (git version)"
 url="https://git.purrdata.net/jwilkes/purr-data"
@@ -49,7 +49,7 @@ source=("$pkgname::git+https://git.purrdata.net/jwilkes/purr-data.git"
 	"userconfig.patch")
 md5sums=('SKIP'
          '39c53063dc18681f29b12c08d9c453aa'
-         '0707c240816e87b0f605058c2ab8e153')
+         '056770a94f3c13799c09d3ece273154f')
 # nw.js sdk binaries
 nwjsname=nwjs-sdk
 nwjsver=0.18.5
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)
-     {