editors/xwpe: Fix broken patch and address remaining compiler warnings.

5 files changed, 68 insertions, 11 deletions

diff --git a/editors/xwpe/distinfo b/editors/xwpe/distinfo
index 5c50cdcc559..d1fd76836b8 100644
--- a/editors/xwpe/distinfo
+++ b/editors/xwpe/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.9 2022/12/08 08:51:55 vins Exp $
+$NetBSD: distinfo,v 1.10 2022/12/08 10:31:07 vins Exp $
 
 BLAKE2s (xwpe-1.5.30a.tar.gz) = 5e33b6cb1880b38dbf551138e807b18a952d282a41411704ada6fabdb34680d4
 SHA512 (xwpe-1.5.30a.tar.gz) = c5b182f798caeeaa7ba62bd3692690030623d317795d907e4fac3f524f53aa299af5d735d9b03185eaa07526f0146c4fa8d09efbbab6790f5e329fd52359b797
 Size (xwpe-1.5.30a.tar.gz) = 325043 bytes
+SHA1 (patch-WeXterm.c) = d60a373aafdcc586aad27f25d82b2af53e318e6b
 SHA1 (patch-aa) = cf7bc074e1dc8cda086dfe29ebfdca1c0f261c1d
-SHA1 (patch-ab) = d2618c3656b8826019272537d251a66c867cba5d
-SHA1 (patch-edit.h) = af55c26886af6447747f31b47f3af5f1a8726595
+SHA1 (patch-ab) = c59dc6c530bbe21e0c22f2c258745ecb7730b156
+SHA1 (patch-edit.h) = 8fa47ec3d81a761a9c70e4ead6ab182b9c3eccb4
 SHA1 (patch-we__main.c) = 5112e6ce7ab4c11afd230f4709fcf1c6ed702fc0
+SHA1 (patch-we__prog.c) = ec904471c0b1e8e1ee286e7fccbb9351d9a04620
 SHA1 (patch-we__xterm.c) = 5b63e0df612ffdff64838d1faf5b558d9179b3dc
diff --git a/editors/xwpe/patches/patch-WeXterm.c b/editors/xwpe/patches/patch-WeXterm.c
new file mode 100644
index 00000000000..9879ff399e2
--- /dev/null
+++ b/editors/xwpe/patches/patch-WeXterm.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-WeXterm.c,v 1.1 2022/12/08 10:31:08 vins Exp $
+
+Fix implicit declaration warnings.
+
+--- WeXterm.c.orig	2005-07-07 01:53:09.000000000 +0000
++++ WeXterm.c
+@@ -37,6 +37,13 @@
+ #endif
+ #endif
+ 
++#ifndef __WE_XTERM_H
++#define __WE_XTERM_H
++
++int e_X_sw_color(void);
++
++#endif
++
+ /* Information from X that is needed throughout execution */
+ WpeXStruct WpeXInfo;
+ 
diff --git a/editors/xwpe/patches/patch-ab b/editors/xwpe/patches/patch-ab
index baffe331526..df120eae5d6 100644
--- a/editors/xwpe/patches/patch-ab
+++ b/editors/xwpe/patches/patch-ab
@@ -1,10 +1,25 @@
-$NetBSD: patch-ab,v 1.2 2022/12/08 08:51:56 vins Exp $
+$NetBSD: patch-ab,v 1.3 2022/12/08 10:31:08 vins Exp $
 
-Depend on [n]curses to provide prototypes for tparm and tgoto.
+* Depend on [n]curses to provide prototypes for tparm and tgoto.
+* Fix implicit declaration warnings.
 
 --- we_debug.c.orig	2005-07-07 01:53:09.000000000 +0000
 +++ we_debug.c
-@@ -62,10 +62,6 @@ extern BUFFER *e_p_w_buffer;
+@@ -7,6 +7,13 @@
+ #include "messages.h"
+ #include "edit.h"
+ 
++#ifndef __WE_PROG_H
++#define __WE_PROG_H
++
++int print_to_end_of_buffer(BUFFER *b, char *str, int wrap_limit);
++
++#endif
++
+ #ifndef NO_XWINDOWS
+ #include "WeXterm.h"
+ #endif
+@@ -62,10 +69,6 @@ extern BUFFER *e_p_w_buffer;
  extern char *att_no;
  extern char *e_tmp_dir;
  
diff --git a/editors/xwpe/patches/patch-edit.h b/editors/xwpe/patches/patch-edit.h
index 9cdcc3c38e8..09e0c6d321c 100644
--- a/editors/xwpe/patches/patch-edit.h
+++ b/editors/xwpe/patches/patch-edit.h
@@ -1,15 +1,15 @@
-$NetBSD: patch-edit.h,v 1.1 2022/12/08 08:51:56 vins Exp $
+$NetBSD: patch-edit.h,v 1.2 2022/12/08 10:31:08 vins Exp $
 
 Fix typo in int declaration.
 
 --- edit.h.orig	2005-07-07 01:53:09.000000000 +0000
 +++ edit.h
-@@ -794,7 +794,7 @@ int e_d_reinit_watches(FENSTER *f,char *
+@@ -793,7 +793,7 @@ int e_d_reinit_watches(FENSTER *f,char *
+ 
  /* we_gpm.c */
  #ifdef HAVE_LIBGPM
- int WpeGpmInit(void);
--int WpeGpmMouse(int *g);
+-int WpeGpmInit(void);
 +int WpeGpmMouseInit(void);
+ int WpeGpmMouse(int *g);
  #endif
  
- /* WeLinux.c */
diff --git a/editors/xwpe/patches/patch-we__prog.c b/editors/xwpe/patches/patch-we__prog.c
new file mode 100644
index 00000000000..42f753db421
--- /dev/null
+++ b/editors/xwpe/patches/patch-we__prog.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-we__prog.c,v 1.1 2022/12/08 10:31:08 vins Exp $
+
+Fix implicit declaration warnings.
+
+--- we_prog.c.orig	2005-07-07 01:53:09.000000000 +0000
++++ we_prog.c
+@@ -8,6 +8,13 @@
+ #include "edit.h"
+ #include "WeExpArr.h"
+ 
++#ifndef __WE_PROG_H
++#define __WE_PROG_H
++
++int print_to_end_of_buffer(BUFFER *b, char *str, int wrap_limit);
++
++#endif
++
+ #ifdef PROG
+ 
+ #include <time.h>