diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2010-12-15 18:14:34 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2010-12-15 18:14:34 +0000 |
| commit | ada35b93919ae9dd981b7d2240a619a200e9b5c9 (patch) | |
| tree | d6152ffc5767f21449bf2b2c51efa7a7ee85b1a9 /packages | |
| parent | 62c9315f8728882e8ad033e77ead3b124a148d0c (diff) | |
includedin Pd-extended.git with commit f67e68df6c3046b1dfc453cb826eeec1343e76e1
svn path=/trunk/; revision=14648
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/patches/default_and_embedded_plist-0.41.4.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/packages/patches/default_and_embedded_plist-0.41.4.patch b/packages/patches/default_and_embedded_plist-0.41.4.patch deleted file mode 100644 index c5c7119c..00000000 --- a/packages/patches/default_and_embedded_plist-0.41.4.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: s_file.c -=================================================================== ---- s_file.c (revision 9789) -+++ s_file.c (working copy) -@@ -235,17 +235,35 @@ - { - char cmdbuf[256]; - int nread = 0, nleft = size; -- char embedded_prefs[MAXPDSTRING]; -- char user_prefs[MAXPDSTRING]; -- char *homedir = getenv("HOME"); -+ char default_prefs[MAXPDSTRING]; // default prefs embedded in the package -+ char embedded_prefs[MAXPDSTRING]; // overrides others for standalone app -+ char embedded_prefs_file[MAXPDSTRING]; -+ char user_prefs_file[MAXPDSTRING]; -+ char *homedir = getenv("HOME"); - struct stat statbuf; -- /* the 'defaults' command expects the filename without .plist at the end */ -- snprintf(embedded_prefs, MAXPDSTRING, "%s/../org.puredata.pd", sys_libdir->s_name); -- snprintf(user_prefs, MAXPDSTRING, "%s/Library/Preferences/org.puredata.pd.plist", homedir); -- if (stat(user_prefs, &statbuf) == 0) -- snprintf(cmdbuf, 256, "defaults read org.puredata.pd %s 2> /dev/null\n", key); -- else -- snprintf(cmdbuf, 256, "defaults read %s %s 2> /dev/null\n", embedded_prefs, key); -+ /* the 'defaults' command expects the filename without .plist at the end */ -+ snprintf(default_prefs, MAXPDSTRING, "%s/../org.puredata.pd.default", -+ sys_libdir->s_name); -+ snprintf(embedded_prefs, MAXPDSTRING, "%s/../org.puredata.pd", -+ sys_libdir->s_name); -+ snprintf(embedded_prefs_file, MAXPDSTRING, "%s.plist", embedded_prefs); -+ snprintf(user_prefs_file, MAXPDSTRING, -+ "%s/Library/Preferences/org.puredata.pd.plist", homedir); -+ if (stat(embedded_prefs_file, &statbuf) == 0) -+ { -+ snprintf(cmdbuf, 256, -+ "defaults read %s %s 2> /dev/null\n", embedded_prefs, key); -+ } -+ else if (stat(user_prefs_file, &statbuf) == 0) -+ { -+ snprintf(cmdbuf, 256, -+ "defaults read org.puredata.pd %s 2> /dev/null\n", key); -+ } -+ else -+ { -+ snprintf(cmdbuf, 256, -+ "defaults read %s %s 2> /dev/null\n", default_prefs, key); -+ } - FILE *fp = popen(cmdbuf, "r"); - while (nread < size) - { |