diff options
author | Christian Zoffoli <xmerlin@gentoo.org> | 2006-10-14 15:48:56 +0000 |
---|---|---|
committer | Christian Zoffoli <xmerlin@gentoo.org> | 2006-10-14 15:48:56 +0000 |
commit | b158dd7fa19699a2e16b1bb2d24c366d9c2470f9 (patch) | |
tree | 988d4cb49d94555c5e954749f5b2850b01c4a526 /dev-libs/newt/files | |
parent | Stabilizing on amd64 as part of new Java system, bug #147254. (diff) | |
download | gentoo-2-b158dd7fa19699a2e16b1bb2d24c366d9c2470f9.tar.gz gentoo-2-b158dd7fa19699a2e16b1bb2d24c366d9c2470f9.tar.bz2 gentoo-2-b158dd7fa19699a2e16b1bb2d24c366d9c2470f9.zip |
Merged some mdk patches.
(Portage version: 2.1-r1)
Diffstat (limited to 'dev-libs/newt/files')
5 files changed, 122 insertions, 0 deletions
diff --git a/dev-libs/newt/files/digest-newt-0.51.6 b/dev-libs/newt/files/digest-newt-0.51.6 index 898bb73bd7b9..9a5463fb111f 100644 --- a/dev-libs/newt/files/digest-newt-0.51.6 +++ b/dev-libs/newt/files/digest-newt-0.51.6 @@ -1 +1,3 @@ MD5 76ebfb749d3bbe9a0d55915faef4ac5e newt-0.51.6.tar.gz 155739 +RMD160 88832ca74fa06ef30739c33e5c75b232b2b149e2 newt-0.51.6.tar.gz 155739 +SHA256 b80f265cd204e03fe9f793ab5750269eec71caf9253d2df04792425d22a49375 newt-0.51.6.tar.gz 155739 diff --git a/dev-libs/newt/files/digest-newt-0.51.6-r1 b/dev-libs/newt/files/digest-newt-0.51.6-r1 index 898bb73bd7b9..9a5463fb111f 100644 --- a/dev-libs/newt/files/digest-newt-0.51.6-r1 +++ b/dev-libs/newt/files/digest-newt-0.51.6-r1 @@ -1 +1,3 @@ MD5 76ebfb749d3bbe9a0d55915faef4ac5e newt-0.51.6.tar.gz 155739 +RMD160 88832ca74fa06ef30739c33e5c75b232b2b149e2 newt-0.51.6.tar.gz 155739 +SHA256 b80f265cd204e03fe9f793ab5750269eec71caf9253d2df04792425d22a49375 newt-0.51.6.tar.gz 155739 diff --git a/dev-libs/newt/files/digest-newt-0.51.6-r2 b/dev-libs/newt/files/digest-newt-0.51.6-r2 new file mode 100644 index 000000000000..9a5463fb111f --- /dev/null +++ b/dev-libs/newt/files/digest-newt-0.51.6-r2 @@ -0,0 +1,3 @@ +MD5 76ebfb749d3bbe9a0d55915faef4ac5e newt-0.51.6.tar.gz 155739 +RMD160 88832ca74fa06ef30739c33e5c75b232b2b149e2 newt-0.51.6.tar.gz 155739 +SHA256 b80f265cd204e03fe9f793ab5750269eec71caf9253d2df04792425d22a49375 newt-0.51.6.tar.gz 155739 diff --git a/dev-libs/newt/files/newt-0.51.6-assorted-fixes.patch b/dev-libs/newt/files/newt-0.51.6-assorted-fixes.patch new file mode 100644 index 000000000000..8f1cd2d4711f --- /dev/null +++ b/dev-libs/newt/files/newt-0.51.6-assorted-fixes.patch @@ -0,0 +1,93 @@ +2005-12-12 Gwenole Beauchesne <gbeauchesne@mandriva.com> + + * checkboxtree.c (newtCheckboxTreeAddItem): Remove va_start() + duplicates. + + * grid.c (newtGridHCloseStacked): Use va_end() when we have + processed the varargs. + (newtGridVCloseStacked): Likewise. + (newtGridVStacked): Likewise. + (newtGridHStacked): Likewise. + + * form.c (formOps): Make it local to the DSO. + * grid.c (formOps): Fix declaration. + +--- newt-0.51.6/grid.c.assorted-fixes 2002-08-15 16:13:40.000000000 -0400 ++++ newt-0.51.6/grid.c 2005-12-12 09:18:23.000000000 -0500 +@@ -26,8 +26,8 @@ struct grid_s { + struct gridField ** fields; + }; + +-/* this is a bit of a hack */ +-extern struct componentOps formOps[]; ++/* make it local to the dso */ ++extern struct componentOps formOps __attribute__ ((visibility ("hidden"))); + + newtGrid newtCreateGrid(int cols, int rows) { + newtGrid grid; +@@ -108,7 +108,7 @@ static void shuffleGrid(newtGrid grid, i + shuffleGrid(field->u.grid, left, top, 0); + j = field->u.grid->width; + } else if (field->type == NEWT_GRID_COMPONENT) { +- if (field->u.co->ops == formOps) ++ if (field->u.co->ops == &formOps) + newtFormSetSize(field->u.co); + j = field->u.co->width; + } else +@@ -319,7 +319,7 @@ newtGrid newtGridHCloseStacked(enum newt + + grid = stackem(0, type1, what1, args, 1); + +- va_start(args, what1); ++ va_end(args); + + return grid; + } +@@ -332,7 +332,7 @@ newtGrid newtGridVCloseStacked(enum newt + + grid = stackem(1, type1, what1, args, 1); + +- va_start(args, what1); ++ va_end(args); + + return grid; + } +@@ -345,7 +345,7 @@ newtGrid newtGridVStacked(enum newtGridE + + grid = stackem(1, type1, what1, args, 0); + +- va_start(args, what1); ++ va_end(args); + + return grid; + } +@@ -358,7 +358,7 @@ newtGrid newtGridHStacked(enum newtGridE + + grid = stackem(0, type1, what1, args, 0); + +- va_start(args, what1); ++ va_end(args); + + return grid; + } +--- newt-0.51.6/checkboxtree.c.assorted-fixes 2003-01-03 15:54:45.000000000 -0500 ++++ newt-0.51.6/checkboxtree.c 2005-12-12 09:15:56.000000000 -0500 +@@ -115,7 +115,6 @@ int newtCheckboxTreeAddItem(newtComponen + va_start(argList, index); + numIndexes = 0; + i = index; +- va_start(argList, index); + while (i != NEWT_ARG_LAST) { + indexes[numIndexes++] = i; + i = va_arg(argList, int); +--- newt-0.51.6/form.c.assorted-fixes 2005-12-12 09:13:21.000000000 -0500 ++++ newt-0.51.6/form.c 2005-12-12 09:19:26.000000000 -0500 +@@ -415,7 +415,7 @@ static void formPlace(newtComponent co, + static newtCallback helpCallback; + + /* this isn't static as grid.c tests against it to find forms */ +-struct componentOps formOps = { ++struct componentOps formOps __attribute__ ((visibility ("hidden"))) = { + newtDrawForm, + formEvent, + newtFormDestroy, diff --git a/dev-libs/newt/files/newt-0.51.6-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch b/dev-libs/newt/files/newt-0.51.6-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch new file mode 100644 index 000000000000..da65cb65d86c --- /dev/null +++ b/dev-libs/newt/files/newt-0.51.6-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch @@ -0,0 +1,22 @@ +--- newt-0.51.6/textbox.c.pix 2003-01-03 21:54:45.000000000 +0100 ++++ newt-0.51.6/textbox.c 2005-04-26 16:33:18.336138737 +0200 +@@ -96,7 +96,7 @@ + co->height = height; + co->top = top; + co->left = left; +- co->takesFocus = 0; ++ co->takesFocus = flags & NEWT_FLAG_SCROLL; + co->width = width; + + tb->doWrap = flags & NEWT_FLAG_WRAP; +--- newt-0.51.6/listbox.c.pix 2003-08-19 22:12:22.000000000 +0200 ++++ newt-0.51.6/listbox.c 2005-04-26 16:34:20.817788173 +0200 +@@ -542,7 +542,7 @@ + + er.result = ER_IGNORED; + +- if(ev.when == EV_EARLY || ev.when == EV_LATE) { ++ if(ev.when == EV_LATE) { + return er; + } + |