diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2006-05-28 20:23:16 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2006-05-28 20:23:16 +0000 |
| commit | 853e9efdda4d317226f85b3042843a24bcebb2d0 (patch) | |
| tree | 9885377f10641fdbee2d24c3a35b2bde020ad234 /x11-toolkits/xview | |
| parent | x11/gnomesession -> x11/gnome-session (diff) | |
Fix two bad patches.
Submitted by: Pedro F. Giffuni <giffunip (at) asme.org>
Notes
Notes:
svn path=/head/; revision=163770
Diffstat (limited to 'x11-toolkits/xview')
4 files changed, 15 insertions, 36 deletions
diff --git a/x11-toolkits/xview/files/patch+lib+libxview+panel+p_mlinetxt.c b/x11-toolkits/xview/files/patch+lib+libxview+panel+p_mlinetxt.c deleted file mode 100644 index 59243ee8c8b7..000000000000 --- a/x11-toolkits/xview/files/patch+lib+libxview+panel+p_mlinetxt.c +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/libxview/panel/p_mlinetxt.c.orig Sat Mar 25 23:52:08 2006 -+++ lib/libxview/panel/p_mlinetxt.c Sun Mar 26 00:22:01 2006 -@@ -14,6 +14,7 @@ - * Multi-line Text Field Panel Item - */ - #include <string.h> -+#include <stdarg.h> - #include <xview_private/panel_impl.h> - #include <xview_private/draw_impl.h> - #include <xview/defaults.h> -@@ -449,7 +450,7 @@ - return (Xv_opaque) dp->rows_displayed; - - case PANEL_ITEM_NTH_WINDOW: -- switch (*(int *) valist) { -+ switch (va_arg(valist, int)) { - case 0: - return dp->view; - case 1: diff --git a/x11-toolkits/xview/files/patch+lib+libxview+panel+panel.c b/x11-toolkits/xview/files/patch+lib+libxview+panel+panel.c deleted file mode 100644 index 9271c4804c39..000000000000 --- a/x11-toolkits/xview/files/patch+lib+libxview+panel+panel.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libxview/panel/panel.c.orig Sat Mar 25 23:52:08 2006 -+++ lib/libxview/panel/panel.c Sun Mar 26 00:19:28 2006 -@@ -27,6 +27,7 @@ - Pkg_private int panel_destroy(); - - static int panel_layout(); -+static int panel_unregister_view(Panel_info *panel, Xv_Window view); - - Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4]; - diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_mlinetxt.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_mlinetxt.c index cde42fcd148c..59243ee8c8b7 100644 --- a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_mlinetxt.c +++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_mlinetxt.c @@ -1,6 +1,14 @@ ---- lib/libxview/panel/p_mlinetxt.c.orig Tue Jun 29 14:17:05 1993 -+++ lib/libxview/panel/p_mlinetxt.c Sun Jan 10 01:52:00 1999 -@@ -449,7 +449,7 @@ +--- lib/libxview/panel/p_mlinetxt.c.orig Sat Mar 25 23:52:08 2006 ++++ lib/libxview/panel/p_mlinetxt.c Sun Mar 26 00:22:01 2006 +@@ -14,6 +14,7 @@ + * Multi-line Text Field Panel Item + */ + #include <string.h> ++#include <stdarg.h> + #include <xview_private/panel_impl.h> + #include <xview_private/draw_impl.h> + #include <xview/defaults.h> +@@ -449,7 +450,7 @@ return (Xv_opaque) dp->rows_displayed; case PANEL_ITEM_NTH_WINDOW: diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+panel.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+panel.c index 001850433580..9271c4804c39 100644 --- a/x11-toolkits/xview/files/patch-lib+libxview+panel+panel.c +++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+panel.c @@ -1,10 +1,10 @@ ---- ./lib/libxview/panel/panel.c.orig Tue Jun 29 07:16:57 1993 -+++ ./lib/libxview/panel/panel.c Sat Apr 1 18:25:27 2000 -@@ -27,6 +27,7 @@ Pkg_private int panel_view_init(); +--- lib/libxview/panel/panel.c.orig Sat Mar 25 23:52:08 2006 ++++ lib/libxview/panel/panel.c Sun Mar 26 00:19:28 2006 +@@ -27,6 +27,7 @@ Pkg_private int panel_destroy(); static int panel_layout(); -+static int panel_unregister_view(); ++static int panel_unregister_view(Panel_info *panel, Xv_Window view); Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4]; |