From 3dfa610732f187468c0cb315a66ef22d93124303 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 20 Aug 2010 03:43:55 +0000 Subject: accepted in git commit f33337633053e15152d6afc3975bc4b58e5ecc34 svn path=/trunk/; revision=13862 --- ...rd-code_default_user-install_paths-0.42.4.patch | 51 ---------------------- 1 file changed, 51 deletions(-) delete mode 100644 packages/patches/hard-code_default_user-install_paths-0.42.4.patch (limited to 'packages/patches/hard-code_default_user-install_paths-0.42.4.patch') diff --git a/packages/patches/hard-code_default_user-install_paths-0.42.4.patch b/packages/patches/hard-code_default_user-install_paths-0.42.4.patch deleted file mode 100644 index c9abc046..00000000 --- a/packages/patches/hard-code_default_user-install_paths-0.42.4.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- branches/pd-extended/0.41/pd/src/s_path.c 2009/04/09 01:04:16 10990 -+++ branches/pd-extended/0.41/pd/src/s_path.c 2009/04/09 01:29:24 10991 -@@ -229,8 +229,29 @@ - - void sys_setextrapath(const char *p) - { -+ char pathbuf[FILENAME_MAX]; - namelist_free(pd_extrapath); -- pd_extrapath = namelist_append(0, p, 0); -+ /* add standard place for users to install stuff first */ -+#ifdef __gnu_linux__ -+ sys_expandpath("~/pd-externals", pathbuf); -+ pd_extrapath = namelist_append(0, pathbuf, 0); -+ pd_extrapath = namelist_append(pd_extrapath, "/usr/local/lib/pd-externals", 0); -+#endif -+ -+#ifdef __APPLE__ -+ sys_expandpath("~/Library/Pd", pathbuf); -+ pd_extrapath = namelist_append(0, pathbuf, 0); -+ pd_extrapath = namelist_append(pd_extrapath, "/Library/Pd", 0); -+#endif -+ -+#ifdef _WIN32 -+ sys_expandpath("%ProgramFiles%/Common Files/Pd", pathbuf); -+ pd_extrapath = namelist_append(0, pathbuf, 0); -+ sys_expandpath("%UserProfile%/Application Data/Pd", pathbuf); -+ pd_extrapath = namelist_append(pd_extrapath, pathbuf, 0); -+#endif -+ /* add built-in "extra" path last so its checked last */ -+ pd_extrapath = namelist_append(pd_extrapath, p, 0); - } - - #ifdef MSW -@@ -357,11 +378,12 @@ - dirresult, nameresult, size, bin)) >= 0) - return (fd); - -- /* next look in "extra" */ -- if (sys_usestdpath && -- (fd = sys_trytoopenone(pd_extrapath->nl_string, name, ext, -- dirresult, nameresult, size, bin)) >= 0) -- return (fd); -+ /* next look in built-in paths like "extra" */ -+ if (sys_usestdpath) -+ for (nl = pd_extrapath; nl; nl = nl->nl_next) -+ if ((fd = sys_trytoopenone(nl->nl_string, name, ext, -+ dirresult, nameresult, size, bin)) >= 0) -+ return (fd); - - *dirresult = 0; - *nameresult = dirresult; -- cgit v1.2.1