aboutsummaryrefslogtreecommitdiff
path: root/packages/patches
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-01-11 00:45:53 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-01-11 00:45:53 +0000
commitd2a310edcdb05c9d1afbbcbff060e9692069d267 (patch)
treef6f5d3e355f64c124e457e12b4f6676a78520884 /packages/patches
parent274f61fd37250e84a1b0eb81e214754fcef1cd05 (diff)
found some more patches that have been included in trunk
svn path=/trunk/; revision=10509
Diffstat (limited to 'packages/patches')
-rw-r--r--packages/patches/embed_pdsettings-0.41-0test04.patch32
-rw-r--r--packages/patches/embed_plist-0.41-0test04.patch23
-rw-r--r--packages/patches/expose_sys_register_loader-0.41.0-test03.patch35
-rw-r--r--packages/patches/fix_crash_on_sending_obj-g_text-0.39.2.patch33
-rw-r--r--packages/patches/remove_redundant_sys_externlist-0.39.2.patch15
5 files changed, 0 insertions, 138 deletions
diff --git a/packages/patches/embed_pdsettings-0.41-0test04.patch b/packages/patches/embed_pdsettings-0.41-0test04.patch
deleted file mode 100644
index e4d06a54..00000000
--- a/packages/patches/embed_pdsettings-0.41-0test04.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: s_file.c
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/s_file.c,v
-retrieving revision 1.8
-diff -u -w -r1.8 s_file.c
---- s_file.c 15 Oct 2005 23:14:28 -0000 1.8
-+++ s_file.c 25 Jul 2007 00:37:35 -0000
-@@ -42,10 +42,22 @@
- {
- char filenamebuf[MAXPDSTRING], *homedir = getenv("HOME");
- int fd, length;
-+ char user_prefs_file[MAXPDSTRING]; // user prefs file
-+ char default_prefs_file[MAXPDSTRING]; // default prefs embedded in the package
-+ struct stat statbuf;
-
-- if (!homedir)
-+
-+ snprintf(default_prefs_file, MAXPDSTRING, "%s/default.pdsettings",
-+ sys_libdir->s_name);
-+// fprintf(stderr,"default_prefs %s\n",default_prefs_file);
-+ if (homedir)
-+ snprintf(user_prefs_file, MAXPDSTRING, "%s/.pdsettings", homedir);
-+ if (stat(user_prefs_file, &statbuf) == 0)
-+ strncpy(filenamebuf, user_prefs_file, MAXPDSTRING);
-+ else if (stat(default_prefs_file, &statbuf) == 0)
-+ strncpy(filenamebuf, default_prefs_file, MAXPDSTRING);
-+ else
- return;
-- snprintf(filenamebuf, MAXPDSTRING, "%s/.pdsettings", homedir);
- filenamebuf[MAXPDSTRING-1] = 0;
- if ((fd = open(filenamebuf, 0)) < 0)
- {
diff --git a/packages/patches/embed_plist-0.41-0test04.patch b/packages/patches/embed_plist-0.41-0test04.patch
deleted file mode 100644
index db50e686..00000000
--- a/packages/patches/embed_plist-0.41-0test04.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: s_file.c
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/s_file.c,v
---- s_file.c 15 Oct 2005 23:14:28 -0000 1.8
-+++ s_file.c 31 May 2007 22:39:12 -0000 1.8.2.3
-@@ -215,7 +215,17 @@
- {
- char cmdbuf[256];
- int nread = 0, nleft = size;
-+ char embedded_prefs[MAXPDSTRING];
-+ char user_prefs[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);
- FILE *fp = popen(cmdbuf, "r");
- while (nread < size)
- {
diff --git a/packages/patches/expose_sys_register_loader-0.41.0-test03.patch b/packages/patches/expose_sys_register_loader-0.41.0-test03.patch
deleted file mode 100644
index 4bc134ab..00000000
--- a/packages/patches/expose_sys_register_loader-0.41.0-test03.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: s_loader.c
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v
-retrieving revision 1.13
-diff -u -w -r1.13 s_loader.c
---- s_loader.c 9 Oct 2006 04:36:12 -0000 1.13
-+++ s_loader.c 26 Nov 2006 04:46:57 -0000
-@@ -198,9 +198,6 @@
- return (1);
- }
-
--/* callback type definition */
--typedef int (*loader_t)(t_canvas *canvas, char *classname);
--
- /* linked list of loaders */
- typedef struct loader_queue {
- loader_t loader;
-Index: s_stuff.h
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v
-retrieving revision 1.10
-diff -u -w -r1.10 s_stuff.h
---- s_stuff.h 15 Aug 2006 04:54:15 -0000 1.10
-+++ s_stuff.h 26 Nov 2006 04:46:57 -0000
-@@ -52,6 +52,8 @@
-
- /* s_loader.c */
- int sys_load_lib(t_canvas *canvas, char *filename);
-+typedef int (*loader_t)(t_canvas *canvas, char *classname);
-+EXTERN void sys_register_loader(loader_t loader);
-
- /* s_audio.c */
-
-
-
diff --git a/packages/patches/fix_crash_on_sending_obj-g_text-0.39.2.patch b/packages/patches/fix_crash_on_sending_obj-g_text-0.39.2.patch
deleted file mode 100644
index 6952900a..00000000
--- a/packages/patches/fix_crash_on_sending_obj-g_text-0.39.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: g_text.c
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/g_text.c,v
-retrieving revision 1.13
-diff -u -r1.13 g_text.c
---- g_text.c 11 Aug 2006 20:09:07 -0000 1.13
-+++ g_text.c 30 Aug 2006 15:33:53 -0000
-@@ -145,8 +145,11 @@
- canvas_objtext(gl, atom_getintarg(0, argc, argv),
- atom_getintarg(1, argc, argv), 0, b);
- }
-- else
-- {
-+ else if(!glist_isvisible(gl)){
-+ /* JMZ: not a good idea to go into interactive mode in a closed canvas... */
-+ post("unable to create stub object in closed canvas!");
-+ return;
-+ } else {
- t_binbuf *b = binbuf_new();
- int xpix, ypix;
- pd_vmess(&gl->gl_pd, gensym("editmode"), "i", 1);
-@@ -413,6 +416,11 @@
- else
- {
- int xpix, ypix;
-+ /* JMZ: not a good idea to go into interactive mode in a closed canvas... */
-+ if(!glist_isvisible(gl)){
-+ post("unable to create stub message in closed canvas!");
-+ return;
-+ }
- pd_vmess(&gl->gl_pd, gensym("editmode"), "i", 1);
- glist_noselect(gl);
- glist_getnextxy(gl, &xpix, &ypix);
diff --git a/packages/patches/remove_redundant_sys_externlist-0.39.2.patch b/packages/patches/remove_redundant_sys_externlist-0.39.2.patch
deleted file mode 100644
index 31192757..00000000
--- a/packages/patches/remove_redundant_sys_externlist-0.39.2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: s_main.c
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
-retrieving revision 1.20.2.1
-diff -u -w -r1.20.2.1 s_main.c
---- s_main.c 19 Dec 2006 05:55:44 -0000 1.20.2.1
-+++ s_main.c 19 Dec 2006 06:01:58 -0000
-@@ -47,7 +47,6 @@
- char *sys_guicmd;
- t_symbol *sys_libdir;
- static t_symbol *sys_guidir;
--t_namelist *sys_externlist;
- static t_namelist *sys_openlist;
- static t_namelist *sys_messagelist;
- static int sys_version;