diff options
author | joerg <joerg@pkgsrc.org> | 2012-11-16 00:29:39 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2012-11-16 00:29:39 +0000 |
commit | d509a62b23b167bc6c904c4b8d5957f78ed0eb5f (patch) | |
tree | 46291104f8a814acddaea5f6cfe46e85c5011aca /x11/xview-lib | |
parent | 0e5be407e9318417b9f2a8dfb1d4fd4d51a7829a (diff) | |
download | pkgsrc-d509a62b23b167bc6c904c4b8d5957f78ed0eb5f.tar.gz |
Fix return with/without value errors.
Diffstat (limited to 'x11/xview-lib')
41 files changed, 990 insertions, 49 deletions
diff --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo index 342d41ef9ba..a72bb4a9397 100644 --- a/x11/xview-lib/distinfo +++ b/x11/xview-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2011/09/29 07:47:56 dholland Exp $ +$NetBSD: distinfo,v 1.18 2012/11/16 00:29:39 joerg Exp $ SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb @@ -13,7 +13,7 @@ SHA1 (patch-ag) = 24d23c77937bffc82a3586730bcd4d2abd20ed39 SHA1 (patch-ah) = b873b369ea8b6bf5672efb36b0633f1db78f06fa SHA1 (patch-ai) = bfa9b69f5597624ec1f00e05b5c96b653f6504ab SHA1 (patch-aj) = a26a6b141a4252bbe6e305a58768ba33a5ba4461 -SHA1 (patch-ak) = 02b699acf75de7a6abd82be85f88f320655d002b +SHA1 (patch-ak) = a3298d27c26a1070eb0c2b92c9ab97d769e1f4a8 SHA1 (patch-al) = 3242c906bdd3f6951b891e17b8f3d02893afbe5a SHA1 (patch-am) = f578d0e77d11a14e58d560011b84fccd3d9bd51e SHA1 (patch-an) = b4243008a3158d787ec7263291f3b59d43b18f36 @@ -31,7 +31,7 @@ SHA1 (patch-ay) = 865ccc51a69f45580cc78fa3d6e3eba1ec7d5ca6 SHA1 (patch-az) = 6e0ec6374b9ed6e4d4c087214951f8181a5ae8d3 SHA1 (patch-ba) = c3c2d73e7a5acc1402a5f564130f184233ec55e3 SHA1 (patch-bb) = a8d88a71235109fb9f2d483fd559defdb26b224d -SHA1 (patch-bc) = 2be7e8aa7684fa906d4180656d306cddf1157c5a +SHA1 (patch-bc) = 72980330add529383df6271387912e7e814cc6cc SHA1 (patch-bd) = af8e9ca4018962eb1f9f277370e70b4c93c283e0 SHA1 (patch-be) = 5085a7fe483c9f02b6ffecfd0d38bd30e674f6f3 SHA1 (patch-bf) = 0c35000e109495f58041108372f8572fa50b3793 @@ -48,7 +48,7 @@ SHA1 (patch-bp) = 553782beddb0f52f83508a7894304878c4145192 SHA1 (patch-bq) = 603b95d77dee57b20f4ba57d24cdb81973ef84f0 SHA1 (patch-br) = 072a5c66b3543458be53a9672c86cff25e3bf7eb SHA1 (patch-bs) = 6706c63de44fa20007f9c83522d2fa9d7dffa51a -SHA1 (patch-bt) = bcc095b51344bcdb3cd99b1f7723e83d2744603f +SHA1 (patch-bt) = 124d5c59596c4d552235f3089b4bdeae5bcec0c6 SHA1 (patch-bu) = 6e6cd5685636043b3f6f73ab1d923329022cef94 SHA1 (patch-bv) = 1fbc97a7c1675fbf24fda368d701fbecf04b56dd SHA1 (patch-bw) = 08571cd47bc161748534a2514d48a50b02678cf5 @@ -58,14 +58,14 @@ SHA1 (patch-bz) = c09031c03c2509069cb77f2f25e0eccaa876342a SHA1 (patch-ca) = 227849426a4eea793dd0e796c82ceb0cb2c71542 SHA1 (patch-cb) = 5666f1d43d166630957f02bd51d4a779413e95da SHA1 (patch-cc) = 419827081d5c667d02ec7edf6cc7aaec712370cd -SHA1 (patch-cd) = de8332dd76366c864131c582cd1d515944de8410 +SHA1 (patch-cd) = 9e93666c7388a7de7015f0e809325223c0523214 SHA1 (patch-ce) = c7afce4243e2f6322d4a5450d0c88d83b6b194f2 SHA1 (patch-cf) = 051ac2e4f9882b1a799de25e37ea8ae950028ef1 SHA1 (patch-cg) = 11b99148834d032a50e85ad8ed703516321d580a SHA1 (patch-ch) = 0cf7084abf39f4beed8236eb1bb32f57facec6d2 -SHA1 (patch-ci) = 92a2a54cd744c0a701cb75fb4c7a47db55dce7b0 +SHA1 (patch-ci) = 665e59cc11e47565968387e2ad91a6918965a7db SHA1 (patch-cj) = 5a0cbf2029492e68899cbe74ce32892ae497a343 -SHA1 (patch-ck) = 9cbf798d8e3d408d8b87091e098fc8e09dcbe8b0 +SHA1 (patch-ck) = f470d31bad573e1041fa55e004276738a0ca83ca SHA1 (patch-cl) = 129838e7ab4786794bfb88f43a5a13b1c47bf5a6 SHA1 (patch-cm) = c83fab28009da4a7db750dbf9ca28f1e737797a8 SHA1 (patch-cn) = c569c5ea7fdc13e90e320eaa99d935a8272cafe4 @@ -75,17 +75,17 @@ SHA1 (patch-cq) = 58b7904d1a4d98e77a9af609873c987ed4345b89 SHA1 (patch-cr) = 4077f858fcad7c4949455a4c38588a8435f802c7 SHA1 (patch-cs) = 93f4b4e7c623d83d5722cff996349b3a67a71d2b SHA1 (patch-ct) = 8ceafeae951776b3dca9fb95a430972f0d76989d -SHA1 (patch-cu) = 3ded0b489ffb8f4c5c2d15c5664a7bc8ff31910a +SHA1 (patch-cu) = 6f5a5cef1af7618d819ad5a0e35c5b003ac4ddcf SHA1 (patch-cv) = 2c35f611141747144b84e83636c32eaf428d0770 -SHA1 (patch-cw) = 2c6a13e30ede8d985de5d8fca09eea93ecc8f2ac +SHA1 (patch-cw) = fe33ed25d5c106610cce53b956c4c2ca2e5ba9f9 SHA1 (patch-cx) = c075412084b243f884a1039e90c55825b81d676c -SHA1 (patch-cy) = 8671d5d36c10d4d7a2985b0ec3eca4a1a8f2f193 -SHA1 (patch-cz) = 41c63cd05734844ae76122cf897180d82ee1752d -SHA1 (patch-da) = c70d55ef2350519a44ae0333fd6b2914f587e2fd +SHA1 (patch-cy) = 6eec35d5b9db6bfeeb60c16db242b1b3e18916ff +SHA1 (patch-cz) = 9120a99da1f6fd8cf18e4da4f012824b31644637 +SHA1 (patch-da) = 5bd56d13c9519aaf953bfe1dcfb1ddd4d77cd157 SHA1 (patch-db) = 42b80dd6e320205e6216f9b6a59bb510845e9c97 SHA1 (patch-dc) = bf3d2f68ee3d2c26d404c03185daa72606f63f13 SHA1 (patch-dd) = 1019ec87f50eef7eae0114cdd607cf78614ebb09 -SHA1 (patch-de) = 3341a678fef1298946bf94879d6f047ad0ca07d9 +SHA1 (patch-de) = f1f7351ec74a9f2cdea00a72a750f321a665cb76 SHA1 (patch-df) = 13d32d9ab53be3376b5c04badec91dbc65def34f SHA1 (patch-dg) = 3c4a28631ff074b374c8f78a6cbce7841071e025 SHA1 (patch-dh) = abe92b740c400d87bf804369846643e1ee0b1a95 @@ -99,7 +99,7 @@ SHA1 (patch-do) = e85f7868de4046b596f70233c052362165b816a3 SHA1 (patch-dp) = 18de16f7167b4fcfcd8cd812237b4ecdde1cde8c SHA1 (patch-dq) = c12fdd5e06bd4bc04e79bf031c7e5d1086052bb3 SHA1 (patch-dr) = 1b8db234d329c62200080d760655c7a2e18f38a1 -SHA1 (patch-ds) = f3ed69b2393e11aaf96e7877fcdff73841435cbb +SHA1 (patch-ds) = 284bda16c67d2476591cb7335907bc6047a36f9b SHA1 (patch-dt) = 9ed5f117c0ad131814ac58e966bf7d479f89397d SHA1 (patch-du) = c53fb2d1554cdfdedcdf285db0803a1a3555920d SHA1 (patch-dv) = a3ac43dcb4d24579c91c14b1970adb97972bd804 @@ -111,7 +111,7 @@ SHA1 (patch-ea) = 13765ccd1238f2da65afc91f843fda25f3cb2727 SHA1 (patch-eb) = 3e400e780e4e8ecd8c26af8148e160fb46ecec80 SHA1 (patch-ec) = 76f2a9d23643b4603fffc933c2fd0860fa4c3052 SHA1 (patch-ed) = 031acb534628073bbd1c1da55893980d2fb56bcc -SHA1 (patch-ee) = 73a60252621ce3d1cac697409b2242e497aedb8b +SHA1 (patch-ee) = 47e21579c9beed65fa034cfb6e21bbdabb037d7c SHA1 (patch-ef) = f3b2eac3242334e70c8e1101cdc2c9256090ad07 SHA1 (patch-eg) = 62fc662db21d592e663ca09f4a13cd2c9cd64db4 SHA1 (patch-eh) = 8352e465eb33b16c5cbd739c38149b57ccb46457 @@ -129,10 +129,32 @@ SHA1 (patch-fc) = 75761a11cb716ad62b00e16814d0e72f3d57ba34 SHA1 (patch-fd) = e372748f2356eef16b8166578f206b5494147647 SHA1 (patch-fe) = ec183923b68cf934e7edcadd1f1f85fd65669244 SHA1 (patch-ff) = b0ac27bb261fb06bf88b4d970c18466149809816 -SHA1 (patch-fg) = e9b2be19adeedc5f43b59f05dd8d25d249482263 +SHA1 (patch-fg) = 05c3b924b18df5a36596a242f54cd2b7fea4ec66 SHA1 (patch-fh) = 6a933d844818a57b448ef9fdd373d03a14ba961a -SHA1 (patch-fi) = 540358d6753f70bd72e5371cbff240427a4a19fb -SHA1 (patch-fj) = ef898c17bd36de97fdf1331d4f63b0738840cf20 -SHA1 (patch-fk) = 98c7ef077aad9f8eef298e0d398e25bc20b04ea6 +SHA1 (patch-fi) = 64d0d60dc3fbccb735c60183303bfb4e2f3e744a +SHA1 (patch-fj) = e97c787c1ae6bf32a4f97124852c454fab431378 +SHA1 (patch-fk) = 48df22f42bc1f642f4e1b6731ea2645495109bba SHA1 (patch-fl) = f1cd513c6b2a9dbe694ed221998d645a6815183f SHA1 (patch-fm) = d05fc6cd8453bf066ee135d66f2be5895e56b45e +SHA1 (patch-lib_libxview_frame_fm__display.c) = 1768cd632d6f506c3282ef09adb7f4bd16c6cf39 +SHA1 (patch-lib_libxview_notice_notice__ol.c) = 11f6f34ee3aec7730d5f92a8a3ec90ad97d7a1fa +SHA1 (patch-lib_libxview_notice_noticeimpl.h) = 5c1690d0765c9ed02dbd96e1828e62f037c94301 +SHA1 (patch-lib_libxview_notify_ntfy__ctbl.c) = ed65cf28c673f1e61698d24c09c091db6295a44a +SHA1 (patch-lib_libxview_panel_p__num__txt.c) = 96132dc92a39491aa5c2ff68e05b888fb54ed412 +SHA1 (patch-lib_libxview_panel_p__select.c) = c157439ba6a14fbcac9d466e628e28ccc51e6ac4 +SHA1 (patch-lib_libxview_panel_p__utl.c) = 23fbe4886f95331598eadffbe28aadd791af7c55 +SHA1 (patch-lib_libxview_panel_panel.h) = 477e1c65a247c5a60d9e2d524f2c1ee42f0eabbb +SHA1 (patch-lib_libxview_pw_pixwin.h) = f871ad80f21123c06ec741436c69ce86a6b460bc +SHA1 (patch-lib_libxview_pw_xv__text.c) = ac21c7098075eb8c2b83b8145356140de23c95c8 +SHA1 (patch-lib_libxview_rect_rect.c) = 83c251a19ba21ea0af89dd6d64d52f5d87ce2c1b +SHA1 (patch-lib_libxview_rect_rect.h) = a5ad0b7fecfabb65bb2b7da792adbd2dd0858cff +SHA1 (patch-lib_libxview_rect_rectlist.c) = b5d7d11daa9349b946c7b227dc0d6665168bfbff +SHA1 (patch-lib_libxview_rect_rectlist.h) = ca5698bba3c96267393f169c7ac20acebcf121e1 +SHA1 (patch-lib_libxview_server_svr__parse.c) = d1ec2e51445dbfe377ed9337d6391c15a2d7f7b4 +SHA1 (patch-lib_libxview_textsw_txt__18impl.h) = 28af202dc3402a02a15f78db1b62e1de67cdd8ec +SHA1 (patch-lib_libxview_textsw_txt__find.c) = 37e82f38b51c5c202bb71fadd2155eb752e90791 +SHA1 (patch-lib_libxview_textsw_txt__sel.c) = c2bd1479518a32a3b09fefb33ae08c571f47404d +SHA1 (patch-lib_libxview_ttysw_tty__menu.c) = 4c42ff022329bc4e640b2b0cb193ec85afc0ae1c +SHA1 (patch-lib_libxview_win_win__global.c) = f806ec4200f627d26f559d26caaed34961fedc79 +SHA1 (patch-lib_libxview_window_window__cms.c) = 255186370b317bbcb6efc5ef7ed23f570b114912 +SHA1 (patch-lib_libxview_window_windowutil.c) = 64a2c5fbf04af54d0689b15af40473b093072afa diff --git a/x11/xview-lib/patches/patch-ak b/x11/xview-lib/patches/patch-ak index f998faf29e6..975fd1202b2 100644 --- a/x11/xview-lib/patches/patch-ak +++ b/x11/xview-lib/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.3 2009/12/10 20:35:56 abs Exp $ +$NetBSD: patch-ak,v 1.4 2012/11/16 00:29:39 joerg Exp $ --- lib/libxview/font/font.c.orig 1993-06-29 05:15:01.000000000 +0000 +++ lib/libxview/font/font.c @@ -13,3 +13,21 @@ $NetBSD: patch-ak,v 1.3 2009/12/10 20:35:56 abs Exp $ /* * delimiters */ +@@ -144,7 +148,7 @@ static char *font_strip_name(); + static int font_delim_count(); + static XID font_try_misc_name(); + static Font_locale_info *find_font_locale_info(); +-static int font_setup_known_families(); ++static void font_setup_known_families(); + static int font_setup_known_styles(); + static void font_init_known_families(); + static void font_init_known_styles(); +@@ -3315,7 +3319,7 @@ Font_locale_info *linfo; + + } + +-static int ++static void + font_setup_known_families(linfo) + Font_locale_info *linfo; + { diff --git a/x11/xview-lib/patches/patch-bc b/x11/xview-lib/patches/patch-bc index 2f6fa3ee2e7..cde67342572 100644 --- a/x11/xview-lib/patches/patch-bc +++ b/x11/xview-lib/patches/patch-bc @@ -1,4 +1,4 @@ -$NetBSD: patch-bc,v 1.2 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-bc,v 1.3 2012/11/16 00:29:39 joerg Exp $ --- lib/libxview/frame/fm_impl.h.orig 1993-06-29 05:16:15.000000000 +0000 +++ lib/libxview/frame/fm_impl.h @@ -20,3 +20,12 @@ $NetBSD: patch-bc,v 1.2 2009/12/10 20:35:57 abs Exp $ #endif FILE #include <sys/time.h> #ifdef OW_I18N +@@ -248,7 +253,7 @@ Pkg_private void frame_display_footer(); + #ifdef OW_I18N + Pkg_private void frame_display_IMstatus(); + #endif +-Pkg_private int frame_set_color(); ++Pkg_private void frame_set_color(); + + /* fm_geom.c */ + Pkg_private int frame_height_from_lines(); diff --git a/x11/xview-lib/patches/patch-bt b/x11/xview-lib/patches/patch-bt index 2fa74f019a9..3aef3348e2c 100644 --- a/x11/xview-lib/patches/patch-bt +++ b/x11/xview-lib/patches/patch-bt @@ -1,4 +1,4 @@ -$NetBSD: patch-bt,v 1.2 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-bt,v 1.3 2012/11/16 00:29:39 joerg Exp $ --- lib/libxview/panel/item_set.c.orig 1993-06-29 05:16:50.000000000 +0000 +++ lib/libxview/panel/item_set.c @@ -11,3 +11,12 @@ $NetBSD: patch-bt,v 1.2 2009/12/10 20:35:57 abs Exp $ Pkg_private Xv_opaque item_set_avlist(item_public, avlist) Panel_item item_public; +@@ -726,7 +728,7 @@ fix_positions(ip) + } + + +-Pkg_private ++Pkg_private void + panel_fix_label_position(ip) + register Item_info *ip; + { diff --git a/x11/xview-lib/patches/patch-cd b/x11/xview-lib/patches/patch-cd index c8cf9c73635..3782428e191 100644 --- a/x11/xview-lib/patches/patch-cd +++ b/x11/xview-lib/patches/patch-cd @@ -1,4 +1,4 @@ -$NetBSD: patch-cd,v 1.2 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-cd,v 1.3 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/panel/panel_impl.h.orig 1993-06-29 05:16:50.000000000 +0000 +++ lib/libxview/panel/panel_impl.h @@ -20,3 +20,12 @@ $NetBSD: patch-cd,v 1.2 2009/12/10 20:35:57 abs Exp $ #endif FILE #include <sys/types.h> #include <X11/Xlib.h> +@@ -283,6 +288,8 @@ Pkg_private void panel_yield_kbd_focus( + Pkg_private void panel_autoscroll_start_itimer(); + Pkg_private void panel_autoscroll_stop_itimer(); + Pkg_private void panel_paint_border(); ++Pkg_private void panel_fix_label_position(Item_info *); ++Pkg_private void panel_free_choices(Panel_image *, int, int); + #ifdef OW_I18N + Xv_private void ml_panel_display_interm(); + Pkg_private void ml_panel_saved_caret(); diff --git a/x11/xview-lib/patches/patch-ci b/x11/xview-lib/patches/patch-ci index 1a79216d914..e2827aaaf8a 100644 --- a/x11/xview-lib/patches/patch-ci +++ b/x11/xview-lib/patches/patch-ci @@ -1,4 +1,4 @@ -$NetBSD: patch-ci,v 1.2 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-ci,v 1.3 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/ttysw/tty_impl.h.orig 1993-06-29 05:17:18.000000000 +0000 +++ lib/libxview/ttysw/tty_impl.h @@ -24,3 +24,20 @@ $NetBSD: patch-ci,v 1.2 2009/12/10 20:35:57 abs Exp $ #define tty_getdsuspc(t) ((int) ((t)->termios.c_cc[VDSUSP])) #define tty_geteofc(t) ((int) ((t)->termios.c_cc[VEOF])) #define tty_geteolc(t) ((int) ((t)->termios.c_cc[VEOL])) +@@ -393,6 +400,8 @@ Pkg_private void + tty_column_wchar_type(); + #endif + ++Pkg_private void ++ ttysw_pty_output(); + Pkg_private int + tty_folio_init(), + tty_getmode(), +@@ -415,7 +424,6 @@ Pkg_private int + ttysw_mapsetim(), + ttysw_output_it(), + ttysw_print_bold_options(), +- ttysw_pty_output(), + ttysw_pty_output_ok(), + ttysw_restoreparms(), + ttysw_saveparms(), diff --git a/x11/xview-lib/patches/patch-ck b/x11/xview-lib/patches/patch-ck index d7a0ba137b1..06c53da3546 100644 --- a/x11/xview-lib/patches/patch-ck +++ b/x11/xview-lib/patches/patch-ck @@ -1,4 +1,4 @@ -$NetBSD: patch-ck,v 1.3 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-ck,v 1.4 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/ttysw/tty_main.c.orig 1993-06-29 05:17:22.000000000 +0000 +++ lib/libxview/ttysw/tty_main.c @@ -14,6 +14,24 @@ $NetBSD: patch-ck,v 1.3 2009/12/10 20:35:57 abs Exp $ extern Textsw_index textsw_insert(); #ifdef OW_I18N extern Textsw_index textsw_insert_wcs(); +@@ -199,7 +204,7 @@ ttysw_pty_output_ok(ttysw) + */ + #ifdef OW_I18N + #define MB_BUF_MAX 8192 +-Pkg_private int ++Pkg_private void + ttysw_pty_output(ttysw, pty) + register Ttysw_folio ttysw; + int pty; +@@ -355,7 +360,7 @@ ttysw_print_debug_string(cp, len) + } + #endif /* DEBUG */ + +-Pkg_private int ++Pkg_private void + ttysw_pty_output(ttysw, pty) + register Ttysw_folio ttysw; + int pty; @@ -906,8 +911,12 @@ ttysw_pty_input(ttysw, pty) if (int_ucntl == (tiocsti & 0xff)) diff --git a/x11/xview-lib/patches/patch-cu b/x11/xview-lib/patches/patch-cu index 3d195193e1f..5039e7b17b0 100644 --- a/x11/xview-lib/patches/patch-cu +++ b/x11/xview-lib/patches/patch-cu @@ -1,4 +1,4 @@ -$NetBSD: patch-cu,v 1.2 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-cu,v 1.3 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/textsw/ev_op_bdry.c.orig 1993-06-29 05:17:30.000000000 +0000 +++ lib/libxview/textsw/ev_op_bdry.c @@ -12,3 +12,12 @@ $NetBSD: patch-cu,v 1.2 2009/12/10 20:35:57 abs Exp $ #define FORALL(index_var) \ for (index_var = 0; index_var < fingers->last_plus_one; index_var++) +@@ -227,7 +230,7 @@ ev_op_bdry_info(op_bdry, pos, next_i) + return (result); + } + +-ev_remove_op_bdry(op_bdry, pos, type, mask) ++void ev_remove_op_bdry(op_bdry, pos, type, mask) + Ev_finger_table *op_bdry; + register Es_index pos; + unsigned type; diff --git a/x11/xview-lib/patches/patch-cw b/x11/xview-lib/patches/patch-cw index da44ce6baff..404995751ad 100644 --- a/x11/xview-lib/patches/patch-cw +++ b/x11/xview-lib/patches/patch-cw @@ -1,4 +1,4 @@ -$NetBSD: patch-cw,v 1.4 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-cw,v 1.5 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/textsw/txt_again.c.orig 1993-06-29 05:17:32.000000000 +0000 +++ lib/libxview/textsw/txt_again.c @@ -133,3 +133,12 @@ $NetBSD: patch-cw,v 1.4 2009/12/10 20:35:57 abs Exp $ static int textsw_next_is_delimiter(again) +@@ -848,7 +944,7 @@ textsw_get_recorded_x(view) + int found_it_already = FALSE; + + if (!TXTSW_DO_AGAIN(folio)) +- return; ++ return -1; + again = &folio->again[0]; + if (TXTSW_STRING_IS_NULL(again)) { + return (result); diff --git a/x11/xview-lib/patches/patch-cy b/x11/xview-lib/patches/patch-cy index b9efb139e3b..585d6b808a9 100644 --- a/x11/xview-lib/patches/patch-cy +++ b/x11/xview-lib/patches/patch-cy @@ -1,4 +1,4 @@ -$NetBSD: patch-cy,v 1.4 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-cy,v 1.5 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/textsw/txt_file.c.orig 1993-06-29 05:17:48.000000000 +0000 +++ lib/libxview/textsw/txt_file.c @@ -174,7 +174,13 @@ $NetBSD: patch-cy,v 1.4 2009/12/10 20:35:57 abs Exp $ Es_status status; Textsw_view_handle view = VIEW_ABS_TO_REP(abstract); -@@ -969,7 +1022,11 @@ textsw_cd(textsw, locx, locy) +@@ -964,12 +1017,16 @@ textsw_get_from_fd(view, fd, print_error + return (result); + } + +-Pkg_private int ++Pkg_private void + textsw_cd(textsw, locx, locy) Textsw_folio textsw; int locx, locy; { @@ -214,7 +220,15 @@ $NetBSD: patch-cy,v 1.4 2009/12/10 20:35:57 abs Exp $ if ((fd = open(buf_mb, 0)) >= 0) { /* } for match */ textsw_implicit_commit(folio); #else -@@ -1034,9 +1103,15 @@ textsw_file_stuff(view, locx, locy) +@@ -1027,16 +1096,22 @@ textsw_get_from_file(view, filename, pri + } + + +-Pkg_private int ++Pkg_private void + textsw_file_stuff(view, locx, locy) + Textsw_view_handle view; + int locx, locy; { Textsw_folio folio = FOLIO_FOR_VIEW(view); int fd; diff --git a/x11/xview-lib/patches/patch-cz b/x11/xview-lib/patches/patch-cz index 7dee2a16f32..6eb49ffe789 100644 --- a/x11/xview-lib/patches/patch-cz +++ b/x11/xview-lib/patches/patch-cz @@ -1,17 +1,18 @@ -$NetBSD: patch-cz,v 1.4 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-cz,v 1.5 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/textsw/txt_input.c.orig 1993-06-29 05:17:42.000000000 +0000 +++ lib/libxview/textsw/txt_input.c -@@ -40,8 +40,6 @@ static char sccsid[] = "@(#)txt_inpu +@@ -40,8 +40,7 @@ static char sccsid[] = "@(#)txt_inpu #include <stdlib.h> #endif /* SVR4 */ -extern int errno; - ++Pkg_private void textsw_do_remote_drag_copy_move(Textsw_view_handle, Event *, short); Pkg_private Xv_Cursor move_cursor, dup_cursor; /* laf */ Pkg_private void termsw_menu_set(); Pkg_private Key_map_handle textsw_do_filter(); -@@ -57,6 +55,8 @@ static void textsw_do_undo(); +@@ -57,6 +56,8 @@ static void textsw_do_undo(); Pkg_private void textsw_implicit_commit_doit(); #endif @@ -20,7 +21,7 @@ $NetBSD: patch-cz,v 1.4 2009/12/10 20:35:57 abs Exp $ #define SPACE_CHAR 0x20 Pkg_private int -@@ -193,6 +193,15 @@ textsw_gprofed_routine(view, ie) +@@ -193,6 +194,15 @@ textsw_gprofed_routine(view, ie) #endif @@ -36,7 +37,7 @@ $NetBSD: patch-cz,v 1.4 2009/12/10 20:35:57 abs Exp $ Pkg_private int textsw_process_event(view_public, ie, arg) Textsw_view view_public; -@@ -200,14 +209,6 @@ textsw_process_event(view_public, ie, ar +@@ -200,14 +210,6 @@ textsw_process_event(view_public, ie, ar Notify_arg arg; { Pkg_private void textsw_update_scrollbars(); diff --git a/x11/xview-lib/patches/patch-da b/x11/xview-lib/patches/patch-da index 60442e93538..66f72fc6a9f 100644 --- a/x11/xview-lib/patches/patch-da +++ b/x11/xview-lib/patches/patch-da @@ -1,4 +1,4 @@ -$NetBSD: patch-da,v 1.2 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-da,v 1.3 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/textsw/txt_move.c.orig 1993-06-29 05:17:47.000000000 +0000 +++ lib/libxview/textsw/txt_move.c @@ -11,7 +11,34 @@ $NetBSD: patch-da,v 1.2 2009/12/10 20:35:57 abs Exp $ Pkg_private Es_handle textsw_esh_for_span(); Pkg_private Es_index ev_resolve_xy(); -@@ -688,7 +688,7 @@ textsw_do_drag_copy_move(view, ie, is_co +@@ -66,6 +66,8 @@ Pkg_private int textsw_end_quick_move(); + Pkg_private void textsw_finish_move(); + Pkg_private void textsw_finish_duplicate(); + Pkg_private void textsw_reset_cursor(); ++Pkg_private void xv_do_move(Textsw_view_handle, Event *); ++Pkg_private void textsw_do_duplicate(Textsw_view_handle, Event *); + + static unsigned short drag_move_arrow_data[] = { + #include <images/text_move_cursor.pr> +@@ -358,7 +360,7 @@ textsw_reset_cursor(view) + * all input events go to track move(). On button up, xv_do_move() is called... + * resets track state. + */ +-Pkg_private int ++Pkg_private void + xv_do_move(view, ie) + Textsw_view_handle view; + register Event *ie; +@@ -465,7 +467,7 @@ xv_do_move(view, ie) + } + } + +-Pkg_private int ++Pkg_private void + textsw_do_duplicate(view, ie) + Textsw_view_handle view; + register Event *ie; +@@ -688,7 +690,7 @@ textsw_do_drag_copy_move(view, ie, is_co xv_destroy(dnd_accept_cursor); } @@ -20,3 +47,12 @@ $NetBSD: patch-da,v 1.2 2009/12/10 20:35:57 abs Exp $ DndConvertProc(dnd, type, data, length, format) Dnd dnd; Atom *type; +@@ -777,7 +779,7 @@ DndConvertProc(dnd, type, data, length, + * ACTION_DRAG_MOVE is a result of XSendEvent called by the subwindow that + * originally sees the button-down that starts the drag move + */ +-Pkg_private ++Pkg_private void + textsw_do_remote_drag_copy_move(view, ie, is_copy) + register Textsw_view_handle view; + Event *ie; diff --git a/x11/xview-lib/patches/patch-de b/x11/xview-lib/patches/patch-de index 7ace0212f96..750d36214ba 100644 --- a/x11/xview-lib/patches/patch-de +++ b/x11/xview-lib/patches/patch-de @@ -1,4 +1,4 @@ -$NetBSD: patch-de,v 1.5 2009/12/10 20:35:58 abs Exp $ +$NetBSD: patch-de,v 1.6 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/textsw/es_file.c.orig 1993-06-29 05:17:34.000000000 +0000 +++ lib/libxview/textsw/es_file.c @@ -38,6 +38,15 @@ $NetBSD: patch-de,v 1.5 2009/12/10 20:35:58 abs Exp $ static void update_read_buf(); /* update the read buf if overlaps write buf */ static Es_status es_file_commit(); +@@ -216,7 +218,7 @@ update_read_buf(private,start,end,buf) + } + } + +-Pkg_private int ++Pkg_private void + es_file_append_error(error_buf, file_name, status) + char *error_buf; + CHAR *file_name; @@ -330,6 +332,16 @@ es_file_create(name, options, status) int open_option; struct stat buf; diff --git a/x11/xview-lib/patches/patch-ds b/x11/xview-lib/patches/patch-ds index 8206c83d81d..016da810457 100644 --- a/x11/xview-lib/patches/patch-ds +++ b/x11/xview-lib/patches/patch-ds @@ -1,4 +1,4 @@ -$NetBSD: patch-ds,v 1.4 2011/09/29 07:47:56 dholland Exp $ +$NetBSD: patch-ds,v 1.5 2012/11/16 00:29:40 joerg Exp $ - Needs sys/param.h to define BSD if it's going to test it. I'm not sure if this is actually failing at the moment but it could start @@ -51,3 +51,13 @@ without notice. #else #define sigisempty(s) (!(*(s))) #endif +@@ -492,6 +500,9 @@ void ntfy_assert_debug(); + + void ntfy_fatal_error(); + ++void ntfy_add_to_table(NTFY_CLIENT *, NTFY_CONDITION *, int); ++void ntfy_remove_from_table(NTFY_CLIENT *, NTFY_CONDITION *); ++ + #define pkg_private extern + #define pkg_private_data + diff --git a/x11/xview-lib/patches/patch-ee b/x11/xview-lib/patches/patch-ee index 000fae95e6a..288e1eff9f6 100644 --- a/x11/xview-lib/patches/patch-ee +++ b/x11/xview-lib/patches/patch-ee @@ -1,7 +1,25 @@ -$NetBSD: patch-ee,v 1.2 2009/12/10 20:35:58 abs Exp $ +$NetBSD: patch-ee,v 1.3 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/sel/seln.c.orig 1993-06-29 05:15:22.000000000 +0000 +++ lib/libxview/sel/seln.c +@@ -25,7 +25,7 @@ struct selection selnull; + char *selection_filename(); + + /* ARGSUSED */ +-selection_set(sel, sel_write, sel_clear, window) ++void selection_set(sel, sel_write, sel_clear, window) + struct selection *sel; + int (*sel_write) (), (*sel_clear) (); + Xv_object window; +@@ -61,7 +61,7 @@ Open: + (void) win_unlockdata(window); + } + +-selection_get(sel_read, window) ++void selection_get(sel_read, window) + int (*sel_read) (); + Xv_object window; + { @@ -69,7 +69,6 @@ selection_get(sel_read, window) FILE *file; int c; @@ -10,3 +28,12 @@ $NetBSD: patch-ee,v 1.2 2009/12/10 20:35:58 abs Exp $ *sel = selnull; (void) win_lockdata(window); +@@ -108,7 +107,7 @@ Cleanup: + (void) win_unlockdata(window); + } + +-selection_clear(window) ++void selection_clear(window) + Xv_object window; + { + FILE *file; diff --git a/x11/xview-lib/patches/patch-fg b/x11/xview-lib/patches/patch-fg index e8e52dbe949..7cf99f34037 100644 --- a/x11/xview-lib/patches/patch-fg +++ b/x11/xview-lib/patches/patch-fg @@ -1,8 +1,18 @@ -$NetBSD: patch-fg,v 1.2 2009/12/10 20:35:58 abs Exp $ +$NetBSD: patch-fg,v 1.3 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/window/window_set.c.orig 1993-06-29 05:15:47.000000000 +0000 +++ lib/libxview/window/window_set.c -@@ -960,6 +960,8 @@ window_set_avlist_tier2(win_public, attr +@@ -649,6 +649,9 @@ window_set_avlist(win_public, avlist) + return (error); + } + ++Xv_private void window_set_cms_data(Xv_Window, Xv_cmsdata *); ++Xv_private void window_set_cms_name(Xv_Window, char *); ++ + static Xv_opaque + window_set_avlist_tier2(win_public, attrs, error, new_rect, old_rect, win_attrs, win_attrs_mask) + Xv_Window win_public; +@@ -960,6 +963,8 @@ window_set_avlist_tier2(win_public, attr return(error); } @@ -11,7 +21,7 @@ $NetBSD: patch-fg,v 1.2 2009/12/10 20:35:58 abs Exp $ static Xv_opaque window_set_avlist_tier3(win_public, attrs, error, new_rect, old_rect, win_attrs, win_attrs_mask) Xv_Window win_public; -@@ -1072,7 +1074,6 @@ window_set_avlist_tier3(win_public, attr +@@ -1072,7 +1077,6 @@ window_set_avlist_tier3(win_public, attr case WIN_SOFT_FNKEY_LABELS: { register Xv_Drawable_info *info; diff --git a/x11/xview-lib/patches/patch-fi b/x11/xview-lib/patches/patch-fi index e722cbf112f..47bbcbbcec5 100644 --- a/x11/xview-lib/patches/patch-fi +++ b/x11/xview-lib/patches/patch-fi @@ -1,7 +1,16 @@ -$NetBSD: patch-fi,v 1.2 2009/12/10 20:35:58 abs Exp $ +$NetBSD: patch-fi,v 1.3 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/textsw/ev_display.c.orig 1994-06-26 21:11:43.000000000 +0000 +++ lib/libxview/textsw/ev_display.c +@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)ev_displ + #include <xview_private/txt_impl.h> + + Pkg_private void ev_notify(); +-Pkg_private int ev_remove_op_bdry(); ++Pkg_private void ev_remove_op_bdry(); + Pkg_private unsigned ev_op_bdry_info(), ev_op_bdry_info_merge(); + Pkg_private Es_index ev_line_start(); + Pkg_private Op_bdry_handle ev_add_op_bdry(); @@ -922,6 +922,8 @@ ev_swap_line_table(table1, table2) } diff --git a/x11/xview-lib/patches/patch-fj b/x11/xview-lib/patches/patch-fj index 30fbed0cee0..5acc19c43d8 100644 --- a/x11/xview-lib/patches/patch-fj +++ b/x11/xview-lib/patches/patch-fj @@ -1,14 +1,23 @@ -$NetBSD: patch-fj,v 1.2 2009/12/10 20:35:58 abs Exp $ +$NetBSD: patch-fj,v 1.3 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/textsw/txt_menu.c.orig 1994-06-26 01:05:22.000000000 +0000 +++ lib/libxview/textsw/txt_menu.c +@@ -71,7 +71,7 @@ Pkg_private int textsw_has_been_mod + pkg_private void textsw_get_extend_to_edge(); + pkg_private void textsw_set_extend_to_edge(); + Pkg_private Textsw_view_handle textsw_create_view(); +-int textsw_file_do_menu_action(); ++Pkg_private void textsw_file_do_menu_action(); + + Pkg_private Menu textsw_menu_init(); + Pkg_private void textsw_do_menu(); @@ -127,6 +127,9 @@ static Defaults_pairs line_break_pairs[] }; -+static int textsw_edit_do_menu_action(); -+static int textsw_view_do_menu_action(); -+static int textsw_find_do_menu_action(); ++static void textsw_edit_do_menu_action(); ++static void textsw_view_do_menu_action(); ++static void textsw_find_do_menu_action(); /* VARARGS0 */ static void @@ -21,3 +30,39 @@ $NetBSD: patch-fj,v 1.2 2009/12/10 20:35:58 abs Exp $ int index; Pkg_private char *textsw_get_extras_filename(); Pkg_private int textsw_build_extras_menu_items(); +@@ -778,7 +779,7 @@ textsw_from_menu(menu) + return (textsw_view); + } + +-Pkg_private int ++Pkg_private void + textsw_file_do_menu_action(cmd_menu, cmd_item) + Menu cmd_menu; + Menu_item cmd_item; +@@ -914,7 +915,7 @@ Load File Has Been Disabled."), + } + } + +-static int ++static void + textsw_edit_do_menu_action(cmd_menu, cmd_item) + Menu cmd_menu; + Menu_item cmd_item; +@@ -1131,7 +1132,7 @@ Press \"Continue\" to proceed."), + } + } + +-static int ++static void + textsw_view_do_menu_action(cmd_menu, cmd_item) + Menu cmd_menu; + Menu_item cmd_item; +@@ -1289,7 +1290,7 @@ Press \"Continue\" to proceed."), + break; + } + } +-static int ++static void + textsw_find_do_menu_action(cmd_menu, cmd_item) + Menu cmd_menu; + Menu_item cmd_item; diff --git a/x11/xview-lib/patches/patch-fk b/x11/xview-lib/patches/patch-fk index 70c10f09e5a..12a931dd830 100644 --- a/x11/xview-lib/patches/patch-fk +++ b/x11/xview-lib/patches/patch-fk @@ -1,4 +1,4 @@ -$NetBSD: patch-fk,v 1.2 2009/12/10 20:35:58 abs Exp $ +$NetBSD: patch-fk,v 1.3 2012/11/16 00:29:40 joerg Exp $ --- lib/libxview/textsw/txt_field.c.orig 1993-06-29 05:17:50.000000000 +0000 +++ lib/libxview/textsw/txt_field.c @@ -18,3 +18,12 @@ $NetBSD: patch-fk,v 1.2 2009/12/10 20:35:58 abs Exp $ (void) textsw_get_match_symbol(marker1, marker1_len, marker2, &marker2_len, &direction); +@@ -286,7 +284,7 @@ textsw_match_same_marker(folio, marker, + } + + /* Caller must set *first to be position at which to start the search. */ +-Pkg_private int ++Pkg_private void + textsw_match_field(textsw, first, last_plus_one, symbol1, symbol1_len, + symbol2, symbol2_len, field_flag, do_search) + Textsw_folio textsw; diff --git a/x11/xview-lib/patches/patch-lib_libxview_frame_fm__display.c b/x11/xview-lib/patches/patch-lib_libxview_frame_fm__display.c new file mode 100644 index 00000000000..36e1038323b --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_frame_fm__display.c @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_libxview_frame_fm__display.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/frame/fm_display.c.orig 2012-11-14 14:10:46.000000000 +0000 ++++ lib/libxview/frame/fm_display.c +@@ -524,7 +524,7 @@ frame_kbd_done(frame_public, sw) + } + + /* ARGSUSED */ +-Pkg_private ++Pkg_private void + frame_set_color(frame, fg, bg) + Frame_class_info *frame; + XColor *fg; diff --git a/x11/xview-lib/patches/patch-lib_libxview_notice_notice__ol.c b/x11/xview-lib/patches/patch-lib_libxview_notice_notice__ol.c new file mode 100644 index 00000000000..4e20b0c2623 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_notice_notice__ol.c @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_libxview_notice_notice__ol.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/notice/notice_ol.c.orig 2012-11-14 14:14:32.000000000 +0000 ++++ lib/libxview/notice/notice_ol.c +@@ -37,7 +37,7 @@ Xv_private void win_change_property(); + /* + * Public routines - these routines are private to the notice pkg + */ +-Pkg_private int notice_subframe_layout(); ++Pkg_private void notice_subframe_layout(); + Pkg_private int notice_determine_font(); + Pkg_private void notice_draw_borders(); + Pkg_private int notice_center(); +@@ -82,7 +82,7 @@ Notice_config Notice_dimensions[] = { + /* + * Routine to create sub_frame and panels + */ +-Pkg_private int ++Pkg_private void + notice_subframe_layout(notice, do_msg, do_butt) + Notice_info *notice; + Bool do_msg; diff --git a/x11/xview-lib/patches/patch-lib_libxview_notice_noticeimpl.h b/x11/xview-lib/patches/patch-lib_libxview_notice_noticeimpl.h new file mode 100644 index 00000000000..c1e116c2037 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_notice_noticeimpl.h @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_libxview_notice_noticeimpl.h,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/notice/noticeimpl.h.orig 2012-11-14 14:14:29.000000000 +0000 ++++ lib/libxview/notice/noticeimpl.h +@@ -185,7 +185,7 @@ Pkg_private void notice_build_button() + Pkg_private void notice_button_panel_proc(); + Pkg_private int notice_determine_font(); + Pkg_private int notice_center(); +-Pkg_private int notice_subframe_layout(); ++Pkg_private void notice_subframe_layout(); + Pkg_private int notice_text_width(); + Pkg_private int notice_button_width(); + Pkg_private int notice_get_owner_frame(); diff --git a/x11/xview-lib/patches/patch-lib_libxview_notify_ntfy__ctbl.c b/x11/xview-lib/patches/patch-lib_libxview_notify_ntfy__ctbl.c new file mode 100644 index 00000000000..00705d06673 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_notify_ntfy__ctbl.c @@ -0,0 +1,21 @@ +$NetBSD: patch-lib_libxview_notify_ntfy__ctbl.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/notify/ntfy_ctbl.c.orig 2012-11-14 14:18:33.000000000 +0000 ++++ lib/libxview/notify/ntfy_ctbl.c +@@ -15,7 +15,7 @@ NTFY_CNDTBL *ntfy_cndtbl[NTFY_LAST_CND]; + * has an interest in. + */ + +-ntfy_add_to_table(client, condition, type) ++void ntfy_add_to_table(client, condition, type) + NTFY_CLIENT *client; + NTFY_CONDITION *condition; + int type; +@@ -70,6 +70,7 @@ ntfy_add_to_table(client, condition, typ + * table. + */ + ++void + ntfy_remove_from_table(client, condition) + NTFY_CLIENT *client; + NTFY_CONDITION *condition; diff --git a/x11/xview-lib/patches/patch-lib_libxview_panel_p__num__txt.c b/x11/xview-lib/patches/patch-lib_libxview_panel_p__num__txt.c new file mode 100644 index 00000000000..8fe22f69cd6 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_panel_p__num__txt.c @@ -0,0 +1,21 @@ +$NetBSD: patch-lib_libxview_panel_p__num__txt.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/panel/p_num_txt.c.orig 1993-06-29 05:17:03.000000000 +0000 ++++ lib/libxview/panel/p_num_txt.c +@@ -698,7 +698,7 @@ num_textitem_scroll_itimer_func( item, w + Event event; + + if (dp->btn_state & OLGX_INACTIVE) +- return; ++ return (NOTIFY_DONE); + + if (dp->btn_state & UP_SELECTED) + { +@@ -729,6 +729,7 @@ num_textitem_scroll_itimer_func( item, w + if (dp->btn_state & DOWN_INACTIVE) + panel_autoscroll_stop_itimer( item ); + } ++ return (NOTIFY_DONE); + } /* num_textitem_scroll_itimer_func */ + + diff --git a/x11/xview-lib/patches/patch-lib_libxview_panel_p__select.c b/x11/xview-lib/patches/patch-lib_libxview_panel_p__select.c new file mode 100644 index 00000000000..8631a039edb --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_panel_p__select.c @@ -0,0 +1,76 @@ +$NetBSD: patch-lib_libxview_panel_p__select.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/panel/p_select.c.orig 2012-11-14 14:28:21.000000000 +0000 ++++ lib/libxview/panel/p_select.c +@@ -357,7 +357,7 @@ panel_default_event(p_public, event, arg + } + + +-Sv1_public ++Sv1_public void + panel_handle_event(client_object, event) + Panel_item client_object; /* could be a Panel */ + Event *event; +@@ -375,7 +375,7 @@ panel_handle_event(client_object, event) + } + + +-Sv1_public ++Sv1_public void + panel_begin_preview(client_object, event) + Panel_item client_object; /* could be a Panel */ + Event *event; +@@ -390,7 +390,7 @@ panel_begin_preview(client_object, event + } + + +-Sv1_public ++Sv1_public void + panel_update_preview(client_object, event) + Panel_item client_object; /* could be a Panel */ + Event *event; +@@ -405,7 +405,7 @@ panel_update_preview(client_object, even + } + + +-Sv1_public ++Sv1_public void + panel_accept_preview(client_object, event) + Panel_item client_object; /* could be a Panel */ + Event *event; +@@ -434,7 +434,7 @@ panel_accept_preview(client_object, even + } + + +-Sv1_public ++Sv1_public void + panel_cancel_preview(client_object, event) + Panel_item client_object; /* could be a Panel */ + Event *event; +@@ -456,7 +456,7 @@ panel_cancel_preview(client_object, even + } + + +-Sv1_public ++Sv1_public void + panel_accept_menu(client_object, event) + Panel_item client_object; /* could be a Panel */ + Event *event; +@@ -480,7 +480,7 @@ panel_accept_menu(client_object, event) + } + + +-Sv1_public ++Sv1_public void + panel_accept_key(client_object, event) + Panel_item client_object; /* could be a Panel */ + Event *event; +@@ -495,7 +495,7 @@ panel_accept_key(client_object, event) + } + + +-Sv1_public ++Sv1_public void + panel_cancel(client_object, event) + Panel_item client_object; /* could be a Panel */ + Event *event; diff --git a/x11/xview-lib/patches/patch-lib_libxview_panel_p__utl.c b/x11/xview-lib/patches/patch-lib_libxview_panel_p__utl.c new file mode 100644 index 00000000000..f9ae304a500 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_panel_p__utl.c @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_libxview_panel_p__utl.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/panel/p_utl.c.orig 2012-11-14 14:26:03.000000000 +0000 ++++ lib/libxview/panel/p_utl.c +@@ -775,7 +775,7 @@ panel_nullproc() + } + + +-Pkg_private ++Pkg_private void + panel_free_choices(choices, first, last) + Panel_image *choices; + int first, last; diff --git a/x11/xview-lib/patches/patch-lib_libxview_panel_panel.h b/x11/xview-lib/patches/patch-lib_libxview_panel_panel.h new file mode 100644 index 00000000000..9187728254e --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_panel_panel.h @@ -0,0 +1,32 @@ +$NetBSD: patch-lib_libxview_panel_panel.h,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/panel/panel.h.orig 1993-06-29 05:17:02.000000000 +0000 ++++ lib/libxview/panel/panel.h +@@ -703,19 +703,19 @@ EXTERN_FUNCTION (void panel_show_focus_ + /* + * event mapping routines + */ +-EXTERN_FUNCTION (int panel_handle_event, (Panel_item item, Event *event)); ++EXTERN_FUNCTION (void panel_handle_event, (Panel_item item, Event *event)); + EXTERN_FUNCTION (void panel_default_handle_event, (Panel_item item, Event *event)); +-EXTERN_FUNCTION (int panel_cancel, (Panel_item item, Event *event)); ++EXTERN_FUNCTION (void panel_cancel, (Panel_item item, Event *event)); + + /* + * Panel_item action routines + */ +-EXTERN_FUNCTION (int panel_begin_preview, (Panel_item item, Event * event)); +-EXTERN_FUNCTION (int panel_update_preview, (Panel_item item, Event *event)); +-EXTERN_FUNCTION (int panel_accept_preview, (Panel_item item, Event *event)); +-EXTERN_FUNCTION (int panel_cancel_preview, (Panel_item item, Event *event)); +-EXTERN_FUNCTION (int panel_accept_menu, (Panel_item item, Event *event)); +-EXTERN_FUNCTION (int panel_accept_key, (Panel_item item, Event *event)); ++EXTERN_FUNCTION (void panel_begin_preview, (Panel_item item, Event * event)); ++EXTERN_FUNCTION (void panel_update_preview, (Panel_item item, Event *event)); ++EXTERN_FUNCTION (void panel_accept_preview, (Panel_item item, Event *event)); ++EXTERN_FUNCTION (void panel_cancel_preview, (Panel_item item, Event *event)); ++EXTERN_FUNCTION (void panel_accept_menu, (Panel_item item, Event *event)); ++EXTERN_FUNCTION (void panel_accept_key, (Panel_item item, Event *event)); + + /* + * utilities diff --git a/x11/xview-lib/patches/patch-lib_libxview_pw_pixwin.h b/x11/xview-lib/patches/patch-lib_libxview_pw_pixwin.h new file mode 100644 index 00000000000..26172bb2491 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_pw_pixwin.h @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_libxview_pw_pixwin.h,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/pw/pixwin.h.orig 2012-11-14 14:58:02.000000000 +0000 ++++ lib/libxview/pw/pixwin.h +@@ -143,8 +143,8 @@ EXTERN_FUNCTION (int xv_read, (Pixrect * + EXTERN_FUNCTION (int xv_replrop, (Xv_opaque window, int op, int xw, int yw, int width, int height, Pixrect *pr, int xr, int yr)); + EXTERN_FUNCTION (int xv_rop, (Xv_opaque window, int op, int x, int y, int width, int height, Pixrect *pr, int xr, int yr)); + EXTERN_FUNCTION (int xv_stencil, (Xv_opaque window, int op, int dx, int dy, int width, int height, Pixrect *stpr, int stx, int sty, Pixrect *spr, int sx, int sy)); +-EXTERN_FUNCTION (int xv_text, (Xv_opaque window, int op, int xbasew, int ybasew, Xv_opaque font, char *str)); +-EXTERN_FUNCTION (int xv_ttext, (Xv_opaque window, int xbasew, int ybasew, int op, Xv_opaque font, char *str)); ++EXTERN_FUNCTION (void xv_text, (Xv_opaque window, int op, int xbasew, int ybasew, Xv_opaque font, char *str)); ++EXTERN_FUNCTION (void xv_ttext, (Xv_opaque window, int xbasew, int ybasew, int op, Xv_opaque font, char *str)); + EXTERN_FUNCTION (int xv_vector, (Xv_opaque window, int x0, int y0, int x1, int y1, int op, int cms_index)); + EXTERN_FUNCTION (int pw_batchrop, (Pixwin *pw, int x, int y, int op, struct pr_prpos *sbp, int m)); + EXTERN_FUNCTION (int pw_get, (Xv_opaque xv_drawable, int x, int y)); diff --git a/x11/xview-lib/patches/patch-lib_libxview_pw_xv__text.c b/x11/xview-lib/patches/patch-lib_libxview_pw_xv__text.c new file mode 100644 index 00000000000..261532acbb0 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_pw_xv__text.c @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_libxview_pw_xv__text.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/pw/xv_text.c.orig 2012-11-14 14:57:50.000000000 +0000 ++++ lib/libxview/pw/xv_text.c +@@ -37,7 +37,7 @@ pw_char(pw, xw, yw, op, pixfont, c) + (void) xv_text(pw, xw, yw, op, (Xv_opaque)pixfont, str); + } + +-Xv_public int ++Xv_public void + xv_ttext(window, xbasew, ybasew, op, pixfont, str) + Xv_opaque window; + int op; +@@ -76,7 +76,7 @@ xv_ttext(window, xbasew, ybasew, op, pix + XDrawString(display, d, gc, xbasew, ybasew, str, len); + } + +-Xv_public int ++Xv_public void + xv_text(window, xbasew, ybasew, op, pixfont, str) + Xv_opaque window; + int op; diff --git a/x11/xview-lib/patches/patch-lib_libxview_rect_rect.c b/x11/xview-lib/patches/patch-lib_libxview_rect_rect.c new file mode 100644 index 00000000000..67bfdbf11c7 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_rect_rect.c @@ -0,0 +1,14 @@ +$NetBSD: patch-lib_libxview_rect_rect.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/rect/rect.c.orig 2012-11-14 15:07:09.000000000 +0000 ++++ lib/libxview/rect/rect.c +@@ -24,8 +24,7 @@ static char sccsid[] = "@(#)rect.c 2 + /* + * Rect geometry functions + */ +-rect_intersection(r1, r2, r) +- register struct rect *r1, *r2, *r; ++void rect_intersection(Rect *r1, Rect *r2, Rect *r) + { + r->r_left = MAX(r1->r_left, r2->r_left); + r->r_top = MAX(r1->r_top, r2->r_top); diff --git a/x11/xview-lib/patches/patch-lib_libxview_rect_rect.h b/x11/xview-lib/patches/patch-lib_libxview_rect_rect.h new file mode 100644 index 00000000000..6a9e7d729df --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_rect_rect.h @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_libxview_rect_rect.h,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/rect/rect.h.orig 1993-06-29 05:15:17.000000000 +0000 ++++ lib/libxview/rect/rect.h +@@ -135,10 +135,7 @@ EXTERN_FUNCTION (unsigned rect_clipvecto + EXTERN_FUNCTION (unsigned rect_order, (Rect *rl, Rect *r2, int sortorder)); + EXTERN_FUNCTION (int rect_right_of, (Rect *rect1, Rect *rect2)); + EXTERN_FUNCTION (int rect_below, (Rect *rect1, Rect *rect2)); +-#ifdef _OTHER_RECT_FUNCTIONS +- + EXTERN_FUNCTION (void rect_intersection, (Rect *rl, Rect *r2, Rect *r)); + EXTERN_FUNCTION (int rect_distance, (Rect *rect, int x, int y, int * x_used, int * y_used)); +-#endif /* _OTHER_RECT_FUNCTIONS */ + + #endif /* ~xview_rect_DEFINED */ diff --git a/x11/xview-lib/patches/patch-lib_libxview_rect_rectlist.c b/x11/xview-lib/patches/patch-lib_libxview_rect_rectlist.c new file mode 100644 index 00000000000..dd9933740a7 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_rect_rectlist.c @@ -0,0 +1,141 @@ +$NetBSD: patch-lib_libxview_rect_rectlist.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/rect/rectlist.c.orig 2012-11-14 15:15:07.000000000 +0000 ++++ lib/libxview/rect/rectlist.c +@@ -39,6 +39,9 @@ extern struct rectlist rl_null; + struct rectnode *_rl_getrectnode(), **_rl_removerectnode(); + unsigned rl_boundintersectsrect(); + ++void _rl_appendrect(struct rect *r, struct rectlist *rl); ++void _rl_removerect(struct rect *r, struct rectlist *rl); ++ + /* + * rectlist geometry functions + */ +@@ -85,7 +88,7 @@ rl_intersection(rl1, rl2, rl) + *rl = rlresult; + } + +-rl_sort(rl1, rl, sortorder) ++void rl_sort(rl1, rl, sortorder) + register struct rectlist *rl1, *rl; + int sortorder; + { +@@ -130,7 +133,7 @@ rl_sort(rl1, rl, sortorder) + *rl = rlresult; + } + +-rl_union(rl1, rl2, rl) ++void rl_union(rl1, rl2, rl) + register struct rectlist *rl1, *rl2, *rl; + { + if (rl1 == rl) +@@ -143,7 +146,7 @@ rl_union(rl1, rl2, rl) + } + } + +-rl_difference(rl1, rl2, rl) ++void rl_difference(rl1, rl2, rl) + register struct rectlist *rl1, *rl2, *rl; + { + struct rect r; +@@ -245,7 +248,7 @@ rl_rectintersects(r, rl) + return (FALSE); + } + +-rl_rectintersection(r, rl1, rl) ++void rl_rectintersection(r, rl1, rl) + register struct rect *r; + register struct rectlist *rl1, *rl; + { +@@ -265,7 +268,7 @@ rl_rectintersection(r, rl1, rl) + *rl = rlresult; + } + +-rl_rectunion(r, rl1, rl) ++void rl_rectunion(r, rl1, rl) + register struct rect *r; + register struct rectlist *rl1, *rl; + { +@@ -284,7 +287,7 @@ rl_rectunion(r, rl1, rl) + _rl_append(rl, &rlresult); + } + +-rl_rectdifference(r, rl1, rl) ++void rl_rectdifference(r, rl1, rl) + register struct rect *r; + register struct rectlist *rl1, *rl; + { +@@ -316,7 +319,7 @@ rl_rectdifference(r, rl1, rl) + * rectlist initialization functions + */ + +-rl_initwithrect(r, rl) ++void rl_initwithrect(r, rl) + register struct rect *r; + struct rectlist *rl; + { +@@ -328,7 +331,7 @@ rl_initwithrect(r, rl) + /* + * rectlist List Memory Management functions + */ +-rl_copy(rl1, rl) ++void rl_copy(rl1, rl) + register struct rectlist *rl1, *rl; + { + register struct rectnode *rn; +@@ -343,8 +346,7 @@ rl_copy(rl1, rl) + } + } + +-rl_free(rl) +- register struct rectlist *rl; ++void rl_free(struct rectlist *rl) + { + register struct rectnode *rn, *rn_next, *rn_last = (struct rectnode *) 0; + +@@ -362,7 +364,7 @@ rl_free(rl) + *rl = rl_null; + } + +-rl_coalesce(rl) ++void rl_coalesce(rl) + register struct rectlist *rl; + { + struct rectnode *rn; +@@ -390,7 +392,7 @@ rl_coalesce(rl) + } + } + +-rl_normalize(rl) ++void rl_normalize(rl) + register struct rectlist *rl; + { + struct rectnode *rn; +@@ -407,7 +409,7 @@ rl_normalize(rl) + + /* Debug Utilities */ + +-rl_print(rl, tag) ++void rl_print(rl, tag) + struct rectlist *rl; + char *tag; + { +@@ -432,7 +434,7 @@ rl_print(rl, tag) + /* + * Create node for r and app to rl + */ +-_rl_appendrect(r, rl) ++void _rl_appendrect(r, rl) + register struct rect *r; + register struct rectlist *rl; + { +@@ -579,7 +581,7 @@ _rl_freerectnode(rn) + rnFree = rn; + } + +-_rl_removerect(r, rl) ++void _rl_removerect(r, rl) + register struct rect *r; + register struct rectlist *rl; + { diff --git a/x11/xview-lib/patches/patch-lib_libxview_rect_rectlist.h b/x11/xview-lib/patches/patch-lib_libxview_rect_rectlist.h new file mode 100644 index 00000000000..61b58560866 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_rect_rectlist.h @@ -0,0 +1,20 @@ +$NetBSD: patch-lib_libxview_rect_rectlist.h,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/rect/rectlist.h.orig 2012-11-14 15:15:09.000000000 +0000 ++++ lib/libxview/rect/rectlist.h +@@ -100,8 +100,6 @@ EXTERN_FUNCTION (unsigned rl_rectinterse + EXTERN_FUNCTION (unsigned rl_equalrect, (Rect *r, Rectlist *rl)); + EXTERN_FUNCTION (unsigned rl_includespoint, (Rectlist *r, int x, int y)); + +-#ifdef xview_other_rl_funcs +- + EXTERN_FUNCTION (void rl_rectintersection, (Rect *r, Rectlist *rl1, Rectlist *rl)); + EXTERN_FUNCTION (void rl_rectunion, (Rect *r, Rectlist *rl1, Rectlist *rl)); + EXTERN_FUNCTION (void rl_rectdifference, (Rect *r, Rectlist *rl1, Rectlist *rl)); +@@ -116,6 +114,4 @@ EXTERN_FUNCTION (void rl_coalesce, (Rect + EXTERN_FUNCTION (void rl_normalize, (Rectlist *rl)); + EXTERN_FUNCTION (void rl_print, (Rectlist *rl, char *tag)); + +-#endif /* xview_other_rl_funcs */ +- + #endif /* ~xview_rectlist_DEFINED */ diff --git a/x11/xview-lib/patches/patch-lib_libxview_server_svr__parse.c b/x11/xview-lib/patches/patch-lib_libxview_server_svr__parse.c new file mode 100644 index 00000000000..8036618be59 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_server_svr__parse.c @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_libxview_server_svr__parse.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/server/svr_parse.c.orig 2012-11-14 15:26:31.000000000 +0000 ++++ lib/libxview/server/svr_parse.c +@@ -674,7 +674,7 @@ CHAR *pos; + /* if keysym already set, that's an error */ + if( avp->keysym ) { + avp->error = 1; +- return; ++ return NULL; + } + + /* look for 'raw' space or punctuation */ diff --git a/x11/xview-lib/patches/patch-lib_libxview_textsw_txt__18impl.h b/x11/xview-lib/patches/patch-lib_libxview_textsw_txt__18impl.h new file mode 100644 index 00000000000..1531ad4581e --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_textsw_txt__18impl.h @@ -0,0 +1,12 @@ +$NetBSD: patch-lib_libxview_textsw_txt__18impl.h,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/textsw/txt_18impl.h.orig 2012-11-14 15:33:44.000000000 +0000 ++++ lib/libxview/textsw/txt_18impl.h +@@ -24,4 +24,7 @@ + + #endif /* OW_I18N */ + ++Pkg_private void ++es_file_append_error(char *, CHAR *, Es_status); ++ + #endif /* txt_18impl_h_DEFINED */ diff --git a/x11/xview-lib/patches/patch-lib_libxview_textsw_txt__find.c b/x11/xview-lib/patches/patch-lib_libxview_textsw_txt__find.c new file mode 100644 index 00000000000..428c2c19028 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_textsw_txt__find.c @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_libxview_textsw_txt__find.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/textsw/txt_find.c.orig 2012-11-14 15:43:10.000000000 +0000 ++++ lib/libxview/textsw/txt_find.c +@@ -142,7 +142,7 @@ textsw_find_selection_and_normalize(view + } + + /* Caller must set *first to be position at which to start the search. */ +-Pkg_private int ++Pkg_private void + textsw_find_pattern(textsw, first, last_plus_one, buf, buf_len, flags) + Textsw_folio textsw; + Es_index *first, *last_plus_one; diff --git a/x11/xview-lib/patches/patch-lib_libxview_textsw_txt__sel.c b/x11/xview-lib/patches/patch-lib_libxview_textsw_txt__sel.c new file mode 100644 index 00000000000..dea72e016b0 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_textsw_txt__sel.c @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_libxview_textsw_txt__sel.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/textsw/txt_sel.c.orig 2012-11-14 16:32:32.000000000 +0000 ++++ lib/libxview/textsw/txt_sel.c +@@ -588,7 +588,7 @@ textsw_mouseless_select_event(view, ie, + return is_select_event; + } + +-static int ++static void + update_selection(view, ie) + Textsw_view_handle view; + register Event *ie; diff --git a/x11/xview-lib/patches/patch-lib_libxview_ttysw_tty__menu.c b/x11/xview-lib/patches/patch-lib_libxview_ttysw_tty__menu.c new file mode 100644 index 00000000000..f8d1b8b87d9 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_ttysw_tty__menu.c @@ -0,0 +1,33 @@ +$NetBSD: patch-lib_libxview_ttysw_tty__menu.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/ttysw/tty_menu.c.orig 2012-11-14 16:02:26.000000000 +0000 ++++ lib/libxview/ttysw/tty_menu.c +@@ -67,8 +67,8 @@ static void ttysw_disable_scrolling( + static void ttysw_menu_page(); + static void ttysw_menu_copy(); + static void ttysw_menu_paste(); +-/* static */ int ttysw_enable_editor(); +-/* static */ int ttysw_disable_editor(); ++/* static */ void ttysw_enable_editor(); ++/* static */ void ttysw_disable_editor(); + /* static */ int ttysw_mode_action(); + /* static */ void + fit_termsw_panel_and_textsw(); /* BUG ALERT: No XView prefix */ +@@ -684,7 +684,7 @@ fit_termsw_panel_and_textsw(frame, terms + } + + /*ARGSUSED*/ +-/* static */ int ++/* static */ void + ttysw_enable_editor(cmd_menu, cmd_item) + Menu cmd_menu; + Menu_item cmd_item; +@@ -794,7 +794,7 @@ Press \"Continue\" to proceed."), + + + /* ARGSUSED */ +-/* static */ int ++/* static */ void + ttysw_disable_editor(cmd_menu, cmd_item) + Menu cmd_menu; + Menu_item cmd_item; diff --git a/x11/xview-lib/patches/patch-lib_libxview_win_win__global.c b/x11/xview-lib/patches/patch-lib_libxview_win_win__global.c new file mode 100644 index 00000000000..6e5a600485d --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_win_win__global.c @@ -0,0 +1,85 @@ +$NetBSD: patch-lib_libxview_win_win__global.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/win/win_global.c.orig 2012-11-14 16:04:45.000000000 +0000 ++++ lib/libxview/win/win_global.c +@@ -46,7 +46,7 @@ int win_grabiodebug; + /* + * Server operations applying globally. + */ +-win_lockdata(window) ++void win_lockdata(window) + Xv_object window; + { + Xv_Drawable_info *info; +@@ -58,7 +58,7 @@ win_lockdata(window) + XGrabServer(xv_display(info)); + } + +-win_unlockdata(window) ++void win_unlockdata(window) + Xv_object window; + { + Xv_Drawable_info *info; +@@ -99,7 +99,7 @@ xv_win_grab(window, im, cursor_window, c + if (status) + *status = 1; /* initialize to be OK */ + if (win_grabiodebug) +- return; ++ return 0; + DRAWABLE_INFO_MACRO(window, info); + display = xv_display(info); + +@@ -160,7 +160,7 @@ xv_win_grab(window, im, cursor_window, c + return (GrabSuccess); + } + +-Xv_private int ++Xv_private void + xv_win_ungrab(window, ungrab_pointer, ungrab_kbd, ungrab_server) + Xv_object window; + int ungrab_pointer, ungrab_kbd, ungrab_server; +@@ -196,7 +196,7 @@ win_grabio(window) + return (win_xgrabio_async(window, im, 0, 0)); + } + +-win_xgrabio_sync(window, im, cursor_window, cursor) ++int win_xgrabio_sync(window, im, cursor_window, cursor) + Xv_object window; + Inputmask *im; + Xv_object cursor_window; +@@ -207,7 +207,7 @@ win_xgrabio_sync(window, im, cursor_wind + unsigned int xevent_mask = win_im_to_xmask(window, im); + + if (win_grabiodebug) +- return; ++ return 0; + DRAWABLE_INFO_MACRO(window, info); + display = xv_display(info); + +@@ -245,7 +245,7 @@ win_xgrabio_sync(window, im, cursor_wind + return (1); + } + +-win_xgrabio_async(window, im, cursor_window, cursor) ++int win_xgrabio_async(window, im, cursor_window, cursor) + Xv_object window; + Inputmask *im; + Xv_object cursor_window; +@@ -256,7 +256,7 @@ win_xgrabio_async(window, im, cursor_win + unsigned int xevent_mask = win_im_to_xmask(window, im); + + if (win_grabiodebug) +- return; ++ return 0; + DRAWABLE_INFO_MACRO(window, info); + display = xv_display(info); + +@@ -309,7 +309,7 @@ win_set_grabio_params(window, im, cursor + CurrentTime); + } + +-win_releaseio(window) ++void win_releaseio(window) + Xv_object window; + { + Xv_Drawable_info *info; diff --git a/x11/xview-lib/patches/patch-lib_libxview_window_window__cms.c b/x11/xview-lib/patches/patch-lib_libxview_window_window__cms.c new file mode 100644 index 00000000000..cd4303c9ba8 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_window_window__cms.c @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_libxview_window_window__cms.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/window/window_cms.c.orig 2012-11-14 16:20:06.000000000 +0000 ++++ lib/libxview/window/window_cms.c +@@ -24,7 +24,7 @@ Attr_attribute xv_cms_name_key = NULL; + void window_set_cms(); + void window_set_cmap_property(); + +-Xv_private ++Xv_private void + window_set_cms_name(win_public, new_name) + Xv_Window win_public; + char *new_name; +@@ -65,7 +65,7 @@ window_set_cms_name(win_public, new_name + } + } + +-Xv_private ++Xv_private void + window_set_cms_data(win_public, cms_data) + Xv_Window win_public; + Xv_cmsdata *cms_data; diff --git a/x11/xview-lib/patches/patch-lib_libxview_window_windowutil.c b/x11/xview-lib/patches/patch-lib_libxview_window_windowutil.c new file mode 100644 index 00000000000..d2e7d479ac1 --- /dev/null +++ b/x11/xview-lib/patches/patch-lib_libxview_window_windowutil.c @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_libxview_window_windowutil.c,v 1.1 2012/11/16 00:29:40 joerg Exp $ + +--- lib/libxview/window/windowutil.c.orig 2012-11-14 16:17:51.000000000 +0000 ++++ lib/libxview/window/windowutil.c +@@ -508,7 +508,7 @@ window_set_cache_rect(window, rect) + } + } + +-Xv_private ++Xv_private void + window_set_parent(window, parent) + Xv_Window window, parent; + { +@@ -767,7 +767,7 @@ window_adjust_rects(rect_obj_list, paren + + adjust_rect_obj(num_elems, this_sw, rect_obj_list, parent_width, parent_height); + window_outer_to_innerrect(&(rect_obj_list[this_sw]), +- rect_obj_list[this_sw].new_rect); ++ &rect_obj_list[this_sw].new_rect); + } + } + |