From 39f1ef7136bc6d8d6e24a74f08a85bb41fe4f448 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 17 Sep 1998 18:26:04 +0000
Subject: [PATCH] Minor fixes for the XV port to make it compile (hacks for the
 viewer are not submitted because they are very brutal)

---
 src/ChangeLog  |  6 ++++++
 xv/Makefile.in | 10 +++++-----
 xv/xvmain.c    | 11 +++++++++++
 xv/xvscreen.c  | 13 +++++++++++--
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 8f9127321..aad5b9461 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 17 19:12:25 1998  Pavel Roskin <pavel_roskin@geocities.com>
+
+	* xv/Makefile.in, xv/xvmain.c, xv/xvscreen.c: Minor fixes to
+	make compilation of the XV port possible (currently without
+	viewer).
+
 Thu Sep 17 07:32:23 1998  Norbert Warmuth  <k3190@fh-sw.de>
 
 	* Makefile.in: After creating symlinks invoke another instance of
diff --git a/xv/Makefile.in b/xv/Makefile.in
index b123ce896..a65824b8a 100644
--- a/xv/Makefile.in
+++ b/xv/Makefile.in
@@ -77,10 +77,10 @@ mx: @LIBVFS@ $(OBJS) @LIBSLANG@ @LIBEDIT_A@
 	$(CC) $(LDFLAGS) -o mxc $(OBJS) -L../vfs -L../slang -L../edit $(EXTRALIBS) $(LIBS)
 	touch mx
 
-libvfs.a:
-	cd ../vfs; $(MAKE) libvfs.a
-@PCENTRULE@	-$(RMF) libvfs.a
-@PCENTRULE@	$(LN_S) ../vfs/libvfs.a .
+@LIBVFS@:
+	cd ../vfs; $(MAKE) @LIBVFS@
+@PCENTRULE@	-$(RMF) @LIBVFS@
+@PCENTRULE@	$(LN_S) ../vfs/@LIBVFS@ .
 
 libmcslang.a:
 	cd ../slang; $(MAKE) libmcslang.a
@@ -119,7 +119,7 @@ TAGS: $(XVSRCS)
 	etags $(XVSRCS)
 
 clean:
-	$(RMF) @mxc@ *.o core a.out mx libvfs.a libedit.a libmcslang.a
+	$(RMF) @mxc@ *.o core a.out mx @LIBVFS@ libedit.a libmcslang.a
 
 realclean: clean
 	$(RMF) .depend
diff --git a/xv/xvmain.c b/xv/xvmain.c
index c19fbd4da..173531e12 100644
--- a/xv/xvmain.c
+++ b/xv/xvmain.c
@@ -1096,6 +1096,11 @@ x_focus_widget (Widget_Item *p)
 {
 }
 
+void
+x_unfocus_widget (Widget_Item *p)
+{
+}
+
 void
 edition_post_exec (void)
 {
@@ -1105,3 +1110,9 @@ void
 edition_pre_exec  (void)
 {
 }
+
+/* This is only used by the editor, so we provide a dummy implementation */
+void
+try_alloc_color_pair (char *str, char *str2)
+{
+}
diff --git a/xv/xvscreen.c b/xv/xvscreen.c
index 9543ba382..98de1f7a7 100644
--- a/xv/xvscreen.c
+++ b/xv/xvscreen.c
@@ -1168,7 +1168,7 @@ void xv_panel_split_proc (Xv_Window origview, Xv_Window newview, int pos)
     free (rect);
 }
         
-int x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
+void x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
 {
     Canvas canvas = 
         (Canvas) x_get_parent_object ((Widget *) panel, parent);
@@ -1224,7 +1224,11 @@ int x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
         panel->item_height = 16;
     panel->item_height += 2 * PANELITEMBORDER;
     x_fill_panel (panel);
-    return 1;
+}
+
+void
+x_panel_destroy (WPanel *panel)
+{
 }
 
 void x_panel_set_size (int idx)
@@ -1234,3 +1238,8 @@ void x_panel_set_size (int idx)
 void set_attr (int h, int m)
 {
 }
+
+void
+repaint_file (WPanel *panel, int file_index, int move, int attr, int isstatus)
+{
+}