diff options
author | richard <richard@pkgsrc.org> | 2014-05-03 07:30:19 +0000 |
---|---|---|
committer | richard <richard@pkgsrc.org> | 2014-05-03 07:30:19 +0000 |
commit | 97952a07c2a689da930414ad385c9c00b8de32aa (patch) | |
tree | b780f95b4dce78604347862afacebaeb6fabbcf3 /editors | |
parent | e08dd1ca0e0485dc729e01bef27d52c3ac91b773 (diff) | |
download | pkgsrc-97952a07c2a689da930414ad385c9c00b8de32aa.tar.gz |
'list_remove', being defined as well on SunOS under <sys/list.h>, causes
a 'conflicting types' error when building with perl, python and/or ruby.
Affects the following files: eval.c, if_lua.c and if_py_both.c
Diffstat (limited to 'editors')
-rw-r--r-- | editors/vim-share/Makefile | 4 | ||||
-rw-r--r-- | editors/vim-share/distinfo | 6 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-eval.c | 40 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-if__lua.c | 13 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-if__py__both.h | 13 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-proto_eval.pro | 17 |
6 files changed, 90 insertions, 3 deletions
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile index d79bc0200aa..6653f54812e 100644 --- a/editors/vim-share/Makefile +++ b/editors/vim-share/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2014/02/20 10:15:57 jperkin Exp $ +# $NetBSD: Makefile,v 1.33 2014/05/03 07:30:19 richard Exp $ PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL} - +PKGREVISION= 1 COMMENT= Data files for the vim editor (vi clone) .include "Makefile.common" diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo index cb09045c7d6..ac1e2b22460 100644 --- a/editors/vim-share/distinfo +++ b/editors/vim-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.142 2014/01/11 23:24:03 morr Exp $ +$NetBSD: distinfo,v 1.143 2014/05/03 07:30:19 richard Exp $ SHA1 (vim-7.4.141.tar.bz2) = 23f7844950671f08768f2bc6bc1b97908cd01dfc RMD160 (vim-7.4.141.tar.bz2) = 7c67da719b2093d08c702b1706fc4cb72097bf13 @@ -6,5 +6,9 @@ Size (vim-7.4.141.tar.bz2) = 9404354 bytes SHA1 (patch-Makefile) = 741f2b59d843094dbc1677aef9df93cf97c8d5a1 SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8 SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56 +SHA1 (patch-eval.c) = df2c63e4ba725c1397c672c76655c8add08fdfa3 SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39 +SHA1 (patch-if__lua.c) = 47e666b6316a8f11725f72c2767a4cb7c15068b2 +SHA1 (patch-if__py__both.h) = 657c43c8e51b01694c063f14a52a9a5efecf2751 SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd +SHA1 (patch-proto_eval.pro) = 752a3e12864ecf0eb4d8465ade8baa44fdaaf0ff diff --git a/editors/vim-share/patches/patch-eval.c b/editors/vim-share/patches/patch-eval.c new file mode 100644 index 00000000000..43ca9317b58 --- /dev/null +++ b/editors/vim-share/patches/patch-eval.c @@ -0,0 +1,40 @@ +$NetBSD: patch-eval.c,v 1.1 2014/05/03 07:30:19 richard Exp $ + +--- src/eval.c.orig 2014-01-11 21:59:11.000000000 +0000 ++++ src/eval.c +@@ -5981,7 +5981,7 @@ listitem_remove(l, item) + list_T *l; + listitem_T *item; + { +- list_remove(l, item, item); ++ vimlist_remove(l, item, item); + listitem_free(item); + } + +@@ -6553,7 +6553,7 @@ list_copy(orig, deep, copyID) + * Does not free the listitem or the value! + */ + void +-list_remove(l, item, item2) ++vimlist_remove(l, item, item2) + list_T *l; + listitem_T *item; + listitem_T *item2; +@@ -15344,7 +15344,7 @@ f_remove(argvars, rettv) + if (argvars[2].v_type == VAR_UNKNOWN) + { + /* Remove one item, return its value. */ +- list_remove(l, item, item); ++ vimlist_remove(l, item, item); + *rettv = item->li_tv; + vim_free(item); + } +@@ -15370,7 +15370,7 @@ f_remove(argvars, rettv) + EMSG(_(e_invrange)); + else + { +- list_remove(l, item, item2); ++ vimlist_remove(l, item, item2); + if (rettv_list_alloc(rettv) == OK) + { + l = rettv->vval.v_list; diff --git a/editors/vim-share/patches/patch-if__lua.c b/editors/vim-share/patches/patch-if__lua.c new file mode 100644 index 00000000000..ab02b8778e2 --- /dev/null +++ b/editors/vim-share/patches/patch-if__lua.c @@ -0,0 +1,13 @@ +$NetBSD: patch-if__lua.c,v 1.1 2014/05/03 07:30:19 richard Exp $ + +--- src/if_lua.c.orig 2013-04-22 08:09:33.000000000 +0000 ++++ src/if_lua.c +@@ -734,7 +734,7 @@ luaV_list_newindex (lua_State *L) + if (li == NULL) return 0; + if (lua_isnil(L, 3)) /* remove? */ + { +- list_remove(l, li, li); ++ vimlist_remove(l, li, li); + clear_tv(&li->li_tv); + vim_free(li); + } diff --git a/editors/vim-share/patches/patch-if__py__both.h b/editors/vim-share/patches/patch-if__py__both.h new file mode 100644 index 00000000000..adac695f690 --- /dev/null +++ b/editors/vim-share/patches/patch-if__py__both.h @@ -0,0 +1,13 @@ +$NetBSD: patch-if__py__both.h,v 1.1 2014/05/03 07:30:19 richard Exp $ + +--- src/if_py_both.h.orig 2014-01-11 21:59:11.000000000 +0000 ++++ src/if_py_both.h +@@ -2392,7 +2392,7 @@ ListAssItem(ListObject *self, Py_ssize_t + if (obj == NULL) + { + li = list_find(l, (long) index); +- list_remove(l, li, li); ++ vimlist_remove(l, li, li); + clear_tv(&li->li_tv); + vim_free(li); + return 0; diff --git a/editors/vim-share/patches/patch-proto_eval.pro b/editors/vim-share/patches/patch-proto_eval.pro new file mode 100644 index 00000000000..4dee702711e --- /dev/null +++ b/editors/vim-share/patches/patch-proto_eval.pro @@ -0,0 +1,17 @@ +$NetBSD: patch-proto_eval.pro,v 1.1 2014/05/03 07:30:19 richard Exp $ + +'list_remove', being defined as well on SunOS under <sys/list.h>, causes +a 'conflicting types' error when building with perl, python and/or ruby. +Affects the following files: eval.c, if_lua.c and if_py_both.c + +--- src/proto/eval.pro.orig 2013-07-06 19:39:48.000000000 +0000 ++++ src/proto/eval.pro +@@ -59,7 +59,7 @@ int list_append_tv __ARGS((list_T *l, ty + int list_append_dict __ARGS((list_T *list, dict_T *dict)); + int list_append_string __ARGS((list_T *l, char_u *str, int len)); + int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item)); +-void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2)); ++void vimlist_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2)); + int garbage_collect __ARGS((void)); + void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID)); + void set_ref_in_list __ARGS((list_T *l, int copyID)); |