From 8161483597de0ad5083760dfb3c8840b9b221515 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 8 Jan 2010 00:14:36 +0000 Subject: Fix the segfaults in seed on 64-bit platforms. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13383 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/seed/files/patch-modules_gettext_seed-gettext.c | 16 +++++++++++++--- .../patch-modules_multiprocessing_seed-multiprocessing.c | 12 ++++++++++++ devel/seed/files/patch-modules_os_seed-os.c | 16 +++++++++++++--- devel/seed/files/patch-modules_readline_seed-readline.c | 12 ++++++++++++ devel/seed/files/patch-modules_seed-libxml.c | 12 ++++++++++++ 5 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 devel/seed/files/patch-modules_multiprocessing_seed-multiprocessing.c create mode 100644 devel/seed/files/patch-modules_readline_seed-readline.c create mode 100644 devel/seed/files/patch-modules_seed-libxml.c (limited to 'devel/seed/files') diff --git a/devel/seed/files/patch-modules_gettext_seed-gettext.c b/devel/seed/files/patch-modules_gettext_seed-gettext.c index 999f1d97a..868c45855 100644 --- a/devel/seed/files/patch-modules_gettext_seed-gettext.c +++ b/devel/seed/files/patch-modules_gettext_seed-gettext.c @@ -1,6 +1,16 @@ ---- modules/gettext/seed-gettext.c.orig 2009-07-26 19:23:31.000000000 -0400 -+++ modules/gettext/seed-gettext.c 2009-07-26 19:25:12.000000000 -0400 -@@ -293,12 +293,24 @@ seed_module_init(SeedEngine *local_eng) +--- modules/gettext/seed-gettext.c.orig 2009-12-31 05:42:51.000000000 -0500 ++++ modules/gettext/seed-gettext.c 2010-01-07 19:07:10.000000000 -0500 +@@ -287,7 +287,8 @@ seed_static_function gettext_funcs[] = { + {"dngettext", seed_gettext_dngettext, 0}, + {"dcngettext", seed_gettext_dcngettext, 0}, + {"setlocale", seed_gettext_setlocale, 0}, +- {"gettext", seed_gettext_gettext, 0} ++ {"gettext", seed_gettext_gettext, 0}, ++ {NULL, NULL, 0} + }; + + SeedObject +@@ -312,12 +313,24 @@ seed_module_init(SeedEngine *local_eng) DEFINE_ENUM_MEMBER(ns_ref, LC_MONETARY); DEFINE_ENUM_MEMBER(ns_ref, LC_MESSAGES); DEFINE_ENUM_MEMBER(ns_ref, LC_ALL); diff --git a/devel/seed/files/patch-modules_multiprocessing_seed-multiprocessing.c b/devel/seed/files/patch-modules_multiprocessing_seed-multiprocessing.c new file mode 100644 index 000000000..73fbfec57 --- /dev/null +++ b/devel/seed/files/patch-modules_multiprocessing_seed-multiprocessing.c @@ -0,0 +1,12 @@ +--- modules/multiprocessing/seed-multiprocessing.c.orig 2010-01-07 19:08:08.000000000 -0500 ++++ modules/multiprocessing/seed-multiprocessing.c 2010-01-07 19:08:20.000000000 -0500 +@@ -183,7 +183,8 @@ SeedValue seed_pipe_add_watch(SeedContex + seed_static_function pipe_funcs[] = { + {"read", seed_pipe_read, 0}, + {"write", seed_pipe_write, 0}, +- {"add_watch", seed_pipe_add_watch, 0} ++ {"add_watch", seed_pipe_add_watch, 0}, ++ {NULL, NULL, 0} + }; + + SeedObject diff --git a/devel/seed/files/patch-modules_os_seed-os.c b/devel/seed/files/patch-modules_os_seed-os.c index f87eb4cec..aa50dfb08 100644 --- a/devel/seed/files/patch-modules_os_seed-os.c +++ b/devel/seed/files/patch-modules_os_seed-os.c @@ -1,5 +1,5 @@ ---- modules/os/seed-os.c.orig 2009-12-31 11:44:49.000000000 +0100 -+++ modules/os/seed-os.c 2010-01-02 02:07:19.000000000 +0100 +--- modules/os/seed-os.c.orig 2009-12-31 05:44:49.000000000 -0500 ++++ modules/os/seed-os.c 2010-01-07 19:01:05.000000000 -0500 @@ -29,8 +29,15 @@ #include @@ -83,7 +83,17 @@ } SeedValue -@@ -1112,7 +1143,9 @@ seed_module_init(SeedEngine * eng) +@@ -1065,7 +1096,8 @@ seed_static_function os_funcs[] = { + {"ttyname", seed_os_ttyname, 0}, + {"tcgetpgrp", seed_os_tcgetpgrp, 0}, + {"tcsetpgrp", seed_os_tcsetpgrp, 0}, +- {"access", seed_os_access, 0} ++ {"access", seed_os_access, 0}, ++ {NULL, NULL, 0} + }; + + #define OS_DEFINE_ENUM(name, value) \ +@@ -1112,7 +1144,9 @@ seed_module_init(SeedEngine * eng) #if defined (O_DIRECT) OS_DEFINE_QUICK_ENUM (O_DIRECT); #endif diff --git a/devel/seed/files/patch-modules_readline_seed-readline.c b/devel/seed/files/patch-modules_readline_seed-readline.c new file mode 100644 index 000000000..f5ca69271 --- /dev/null +++ b/devel/seed/files/patch-modules_readline_seed-readline.c @@ -0,0 +1,12 @@ +--- modules/readline/seed-readline.c.orig 2010-01-07 19:06:34.000000000 -0500 ++++ modules/readline/seed-readline.c 2010-01-07 19:01:19.000000000 -0500 +@@ -177,7 +177,8 @@ seed_static_function readline_funcs[] = + {"bind", seed_readline_bind, 0}, + {"done", seed_rl_done, 0}, + {"buffer", seed_rl_buffer, 0}, +- {"insert", seed_rl_insert, 0} ++ {"insert", seed_rl_insert, 0}, ++ {NULL, NULL, 0} + }; + + SeedObject diff --git a/devel/seed/files/patch-modules_seed-libxml.c b/devel/seed/files/patch-modules_seed-libxml.c new file mode 100644 index 000000000..ae15d272d --- /dev/null +++ b/devel/seed/files/patch-modules_seed-libxml.c @@ -0,0 +1,12 @@ +--- modules/libxml/seed-libxml.c.orig 2010-01-07 19:10:50.000000000 -0500 ++++ modules/libxml/seed-libxml.c 2010-01-07 19:11:18.000000000 -0500 +@@ -449,7 +449,8 @@ seed_xml_xpathobj_get_value (SeedContext + + + seed_static_function doc_funcs[] = { +- {"xpathNewContext", seed_xml_construct_xpath_context, 0} ++ {"xpathNewContext", seed_xml_construct_xpath_context, 0}, ++ {NULL, NULL, 0} + }; + + seed_static_value doc_values[] = { -- cgit v1.2.3