View | Details | Raw Unified | Return to bug 104032
Collapse All | Expand All

(-)/home/trasz/xview/Makefile (-1 / +6 lines)
Lines 24-29 Link Here
24
IMAKEINCLUDE=	"-I${X11BASE}/lib/X11/config -I${WRKSRC}/config"
24
IMAKEINCLUDE=	"-I${X11BASE}/lib/X11/config -I${WRKSRC}/config"
25
MAKE_ENV+=	IMAKEINCLUDE=${IMAKEINCLUDE}
25
MAKE_ENV+=	IMAKEINCLUDE=${IMAKEINCLUDE}
26
ALL_TARGET=	World
26
ALL_TARGET=	World
27
SUB_FILES=	pkg-message
28
PKGMESSAGE=	${WRKDIR}/pkg-message
27
29
28
MAN1=		xview.1
30
MAN1=		xview.1
29
31
Lines 32-37 Link Here
32
post-patch:
34
post-patch:
33
	@${REINPLACE_CMD} -e 's+/usr/X11R6+${PREFIX}+;' \
35
	@${REINPLACE_CMD} -e 's+/usr/X11R6+${PREFIX}+;' \
34
	  ${WRKSRC}/config/XView.cf
36
	  ${WRKSRC}/config/XView.cf
37
	@${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \
38
	  ${WRKSRC}/config/XView.tmpl
35
	@${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \
39
	@${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \
36
	  ${WRKSRC}/clients/olwm/screen.c
40
	  ${WRKSRC}/clients/olwm/screen.c
37
	@${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+g;' \
41
	@${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+g;' \
Lines 39-45 Link Here
39
	  ${WRKSRC}/lib/libxview/help/help_file.c \
43
	  ${WRKSRC}/lib/libxview/help/help_file.c \
40
	  ${WRKSRC}/lib/libxview/misc/gettext.h \
44
	  ${WRKSRC}/lib/libxview/misc/gettext.h \
41
	  ${WRKSRC}/lib/libxview/textsw/txt_e_menu.c
45
	  ${WRKSRC}/lib/libxview/textsw/txt_e_menu.c
42
	${REINPLACE_CMD} -e "s,^MSG_UTIL,#MSG_UTIL," \
46
	@${REINPLACE_CMD} -e "s,^MSG_UTIL,#MSG_UTIL," \
43
	  ${WRKSRC}/util/Imakefile
47
	  ${WRKSRC}/util/Imakefile
44
48
45
pre-configure:
49
pre-configure:
Lines 51-55 Link Here
51
.if !defined{NOPORTDOCS}
55
.if !defined{NOPORTDOCS}
52
	@(cd ${WRKSRC}/doc; ${MAKE} install)
56
	@(cd ${WRKSRC}/doc; ${MAKE} install)
53
.endif
57
.endif
58
	@${CAT} ${PKGMESSAGE}
54
59
55
.include <bsd.port.post.mk>
60
.include <bsd.port.post.mk>
(-)/home/trasz/xview/files/patch-config+XView.cf (-2 / +11 lines)
Lines 1-5 Link Here
1
--- config/XView.cf.orig	Sun Jun 26 21:09:19 1994
1
--- config/XView.cf.orig	Mon Jun 27 04:09:19 1994
2
+++ config/XView.cf	Sat Oct  4 12:37:28 2003
2
+++ config/XView.cf	Thu Oct  5 22:23:13 2006
3
@@ -101,7 +101,7 @@
3
@@ -101,7 +101,7 @@
4
  *	the appropriate value.
4
  *	the appropriate value.
5
  */
5
  */
Lines 18-23 Link Here
18
 #endif 
18
 #endif 
19
 /*
19
 /*
20
  *	If you would like the XView man pages to be installed in 
20
  *	If you would like the XView man pages to be installed in 
21
@@ -162,7 +162,7 @@
22
  *	These are unchanged from X.V11R4 and the XView 2 release.
23
  */
24
 #ifndef InstallOpenLookFonts
25
-#define InstallOpenLookFonts NO
26
+#define InstallOpenLookFonts YES
27
 #endif
28
 /*
29
  *	If you want to install the private header files, set below value to
21
@@ -195,7 +195,7 @@
30
@@ -195,7 +195,7 @@
22
 # if PreR4Server
31
 # if PreR4Server
23
 # define LibXViewDefines -DPRE_R4_ICCCM
32
 # define LibXViewDefines -DPRE_R4_ICCCM
(-)/home/trasz/xview/files/patch-lib+libxview+dnd+dnd_dsdm.c (+20 lines)
Line 0 Link Here
1
--- lib/libxview/dnd/dnd_dsdm.c.orig	Thu Oct  5 18:16:17 2006
2
+++ lib/libxview/dnd/dnd_dsdm.c	Thu Oct  5 18:17:26 2006
3
@@ -40,7 +40,7 @@
4
     if (!dnd->sel) {
5
         Xv_object  	owner,
6
     			server;
7
-    	static void	ReplyProc();
8
+    	void	ReplyProc();
9
 
10
     	owner = (Xv_object)xv_get(DND_PUBLIC(dnd), XV_OWNER);
11
 
12
@@ -95,7 +95,7 @@
13
 }
14
 
15
 /* ARGSUSED */
16
-static void
17
+void
18
 ReplyProc(sel, target, type, buffer, length, format)
19
     Selection_requestor	 sel;
20
     Atom		 target, type;
(-)/home/trasz/xview/files/patch-lib+libxview+file_chooser+file_list.c (-11 / +11 lines)
Lines 1-6 Link Here
1
--- ./lib/libxview/file_chooser/file_list.c.orig	Tue Jun 29 07:17:56 1993
1
--- lib/libxview/file_chooser/file_list.c.orig	Thu Oct  5 18:21:11 2006
2
+++ ./lib/libxview/file_chooser/file_list.c	Sat Apr  1 18:25:23 2000
2
+++ lib/libxview/file_chooser/file_list.c	Thu Oct  5 18:43:18 2006
3
@@ -23,6 +23,9 @@ static char     sccsid[] = "@(#)file_lis
3
@@ -23,6 +23,9 @@
4
 #include <xview_private/flist_impl.h>
4
 #include <xview_private/flist_impl.h>
5
 #include <xview_private/portable.h>
5
 #include <xview_private/portable.h>
6
 
6
 
Lines 10-16 Link Here
10
 
10
 
11
 
11
 
12
 /* X bitmaps for default glyphs */
12
 /* X bitmaps for default glyphs */
13
@@ -41,6 +44,7 @@ static int		go_down_one_directory();
13
@@ -41,6 +44,7 @@
14
 static int		flist_list_notify();
14
 static int		flist_list_notify();
15
 static int		validate_new_directory();
15
 static int		validate_new_directory();
16
 static void		flist_new_dir();
16
 static void		flist_new_dir();
Lines 18-38 Link Here
18
 
18
 
19
 #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
19
 #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
20
 static void	flist_error(File_list_private *private, char *format, ...);
20
 static void	flist_error(File_list_private *private, char *format, ...);
21
@@ -521,7 +525,11 @@ file_list_destroy ( public, status )
21
@@ -521,7 +525,11 @@
22
     if (status == DESTROY_CLEANUP) {
22
     if (status == DESTROY_CLEANUP) {
23
 	xv_free_ref( private->directory );
23
 	xv_free_ref( private->directory );
24
 	xv_free_ref( private->regex_pattern );
24
 	xv_free_ref( private->regex_pattern );
25
+#ifndef __FreeBSD__
25
+#ifndef __FreeBSD__
26
 	xv_free_ref( private->regex_compile );
26
 	xv_free_ref( private->regex_compile );
27
+#else
27
+#else
28
+	xv_free_regex_t( (regex_t *)private->regex_compile );
28
+	xv_free_regex_t( private->regex_compile );
29
+#endif
29
+#endif
30
 	xv_free_ref( private->dotdot_string );
30
 	xv_free_ref( private->dotdot_string );
31
 	if ( private->dir_ptr )
31
 	if ( private->dir_ptr )
32
 	    (void) closedir( private->dir_ptr );
32
 	    (void) closedir( private->dir_ptr );
33
@@ -1174,14 +1182,16 @@ static char	*compile();
33
@@ -1174,14 +1182,16 @@
34
 static int 	step();
34
 static int 	step();
35
 #endif /* SVR4 */
35
 #endif
36
 
36
 
37
-
37
-
38
+#ifndef __FreeBSD__
38
+#ifndef __FreeBSD__
Lines 48-54 Link Here
48
     char compile_buf[MAXPATHLEN+1];
48
     char compile_buf[MAXPATHLEN+1];
49
     char *end_ptr;
49
     char *end_ptr;
50
     size_t num_bytes;
50
     size_t num_bytes;
51
@@ -1197,6 +1207,17 @@ flist_compile_regex( private )
51
@@ -1197,6 +1207,17 @@
52
     xv_free_ref( private->regex_compile );
52
     xv_free_ref( private->regex_compile );
53
     private->regex_compile = xv_alloc_n(char, num_bytes);
53
     private->regex_compile = xv_alloc_n(char, num_bytes);
54
     (void) XV_BCOPY(compile_buf, private->regex_compile, num_bytes);
54
     (void) XV_BCOPY(compile_buf, private->regex_compile, num_bytes);
Lines 59-72 Link Here
59
+      exit(-1);
59
+      exit(-1);
60
+    } 
60
+    } 
61
+    regcomp(compile_buf, private->regex_pattern, 0);
61
+    regcomp(compile_buf, private->regex_pattern, 0);
62
+    xv_free_regex_t((regex_t *)private->regex_compile);
62
+    xv_free_regex_t(private->regex_compile);
63
+    private->regex_compile = (char *)compile_buf;
63
+    private->regex_compile = (char *)compile_buf;
64
+#endif
64
+#endif
65
+
65
+
66
 } 
66
 } 
67
 
67
 
68
 
68
 
69
@@ -1205,7 +1226,11 @@ flist_match_regex( s, private )
69
@@ -1205,7 +1226,11 @@
70
      char *s;
70
      char *s;
71
      File_list_private *private;
71
      File_list_private *private;
72
 {
72
 {
(-)/home/trasz/xview/files/patch-lib+libxview+misc+gettext.c (-3 / +4 lines)
Lines 1-12 Link Here
1
--- lib/libxview/misc/gettext.c.orig	Sat Aug  6 21:47:27 2005
1
--- lib/libxview/misc/gettext.c.orig	Thu Oct  5 18:45:03 2006
2
+++ lib/libxview/misc/gettext.c	Sat Aug  6 21:51:07 2005
2
+++ lib/libxview/misc/gettext.c	Thu Oct  5 18:50:03 2006
3
@@ -10,10 +10,12 @@
3
@@ -10,10 +10,12 @@
4
 #include <xview_private/gettext.h>
4
 #include <xview_private/gettext.h>
5
 
5
 
6
 char *strdup();
6
 char *strdup();
7
-char * dgettext(), *bindtextdomain();
7
-char * dgettext(), *bindtextdomain();
8
-char *_gettext();
8
+char * dgettext(char* domain_nane, char* msg_id), *bindtextdomain();
9
+char * dgettext(char* domain_nane, char* msg_id), *bindtextdomain();
9
 char *_gettext();
10
+static char *_gettext();
10
 char *fgets(), *getenv();
11
 char *fgets(), *getenv();
11
+#ifndef OS_HAS_MMAP
12
+#ifndef OS_HAS_MMAP
12
 caddr_t mmap();
13
 caddr_t mmap();
(-)/home/trasz/xview/files/patch-lib+libxview+misc+quark.c (+11 lines)
Line 0 Link Here
1
--- lib/libxview/misc/quark.c.orig	Thu Oct  5 18:57:21 2006
2
+++ lib/libxview/misc/quark.c	Thu Oct  5 18:57:45 2006
3
@@ -16,7 +16,7 @@
4
 #include  <xview/xview.h>
5
 #include  <xview/pkg.h>
6
 
7
-Xv_opaque resource_type_conv();
8
+static Xv_opaque resource_type_conv();
9
 
10
 /* 
11
  *    Utilities to deal with quark lists and such.
(-)/home/trasz/xview/files/patch-lib+libxview+panel+item_set.c (+11 lines)
Line 0 Link Here
1
--- lib/libxview/panel/item_set.c.orig	Thu Oct  5 19:03:02 2006
2
+++ lib/libxview/panel/item_set.c	Thu Oct  5 19:04:55 2006
3
@@ -26,6 +26,8 @@
4
 
5
 static void item_adjust_label_size();
6
 
7
+static fix_positions();
8
+
9
 extern Notify_value panel_base_event_handler();
10
 
11
 Pkg_private     Xv_opaque
(-)/home/trasz/xview/files/patch-lib+libxview+textsw+es.h (+13 lines)
Line 0 Link Here
1
--- lib/libxview/textsw/es.h.orig	Thu Oct  5 19:15:38 2006
2
+++ lib/libxview/textsw/es.h	Thu Oct  5 19:15:44 2006
3
@@ -182,8 +182,8 @@
4
 } Es_buf_object;
5
 typedef Es_buf_object *Es_buf_handle;
6
 
7
-EXTERN_FUNCTION( caddr_t es_file_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT ));
8
-EXTERN_FUNCTION( caddr_t es_mem_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT ));
9
+EXTERN_FUNCTION( static caddr_t es_file_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT ));
10
+EXTERN_FUNCTION( static caddr_t es_mem_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT ));
11
 
12
 #define ES_READ_BUF_LEN 2047
13
 #define ES_WRITE_BUF_LEN 2047
(-)/home/trasz/xview/files/patch-lib+libxview+textsw+ev_display.c (+11 lines)
Line 0 Link Here
1
--- lib/libxview/textsw/ev_display.c.orig	Thu Oct  5 19:30:17 2006
2
+++ lib/libxview/textsw/ev_display.c	Thu Oct  5 19:32:21 2006
3
@@ -940,7 +940,7 @@
4
 	register int    i;
5
 	Es_index        pos, pos_to_remember;
6
 	Pkg_private void ev_lt_format();
7
-	static void     ev_swap_line_table();
8
+	void     ev_swap_line_table();
9
 
10
 	esbuf.esh = chain->esh;
11
 	esbuf.buf = buf;
(-)/home/trasz/xview/files/patch-lib+libxview+textsw+ps_impl.h (+11 lines)
Line 0 Link Here
1
--- lib/libxview/textsw/ps_impl.h.orig	Thu Oct  5 19:26:54 2006
2
+++ lib/libxview/textsw/ps_impl.h	Thu Oct  5 19:27:04 2006
3
@@ -134,7 +134,7 @@
4
 #define	SCRATCH_HAS_WRAPPED(_private)					\
5
 	((_private)->scratch_length > (_private)->scratch_max_len)
6
 
7
-EXTERN_FUNCTION( caddr_t ps_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT ));
8
+EXTERN_FUNCTION( static caddr_t ps_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT ));
9
 
10
 #endif
11
 
(-)/home/trasz/xview/files/patch-lib+libxview+textsw+txt_e_menu.c (-22 / +44 lines)
Lines 1-22 Link Here
1
*** lib/libxview/textsw/txt_e_menu.c.org	Sun Jan 21 16:01:52 2001
1
--- lib/libxview/textsw/txt_e_menu.c.orig	Thu Oct  5 19:18:11 2006
2
--- lib/libxview/textsw/txt_e_menu.c	Sun Jan 21 16:03:27 2001
2
+++ lib/libxview/textsw/txt_e_menu.c	Thu Oct  5 20:03:45 2006
3
***************
3
@@ -19,7 +19,7 @@
4
*** 144,153 ****
4
  *  3. $(HOME)/.text_extras_menu{.<locale>} (home dir),
5
--- 144,160 ----
5
  *  4. locale sensitive system default
6
  
6
  *		("$OPENWINHOME/lib/locale/<locale>/XView/.text_extras_menu")
7
  #ifdef __FreeBSD__
7
- *  4. fall back to SunView1 ("/usr/lib/.text_extras_menu")
8
  	/* Gee, still?... We will try the old fashioned way */
8
+ *  4. fall back to SunView1 ("/usr/X11R6/lib/.text_extras_menu")
9
+ 	/* If it is never defined, EXTRASMENU is set to text_extras_menu
9
  *
10
+ 	   see top of this file ... */
10
  * Always try locale specific name first, if not there, try without
11
          (void) sprintf(tmp, "%s/lib/.%s",
11
  * locale name.  In the #4, we will fall back to the "C" locale.
12
  		       filename, EXTRASMENU);
12
@@ -76,6 +76,8 @@
13
  	if ((result = check_filename_locale(NULL, tmp, 1)) != NULL)
13
 static	int      Nargs;
14
  		goto found;
14
 static	char	*check_filename_locale();
15
+ 	/* EXTRASMENU is absolute specified as normally done
15
 
16
+ 	   during  compile time option -DEXTRASMENU="\"$(TEXT_EXTRAS_MENU)\" */
16
+static any_shell_meta();
17
+ 	(void) sprintf(tmp, "%s", EXTRASMENU);
17
+
18
+ 	if ((result = check_filename_locale(NULL, tmp, 1)) != NULL)
18
 extern int      EXTRASMENU_FILENAME_KEY;
19
+ 	    goto found;
19
 
20
  #endif
20
 Pkg_private char *
21
      }
21
@@ -138,15 +140,22 @@
22
  
22
 
23
 #ifdef notdef
24
 	/* Gee, still?... We will try the old fashioned way */
25
+	/* If it is never defined, EXTRASMENU is set to text_extras_menu
26
+	   see top of this file ... */
27
         (void) sprintf(tmp, "%s/lib/.%s",
28
 		       filename, EXTRASMENU);
29
 	if ((result = check_filename_locale(NULL, tmp, 1)) != NULL)
30
 		goto found;
31
+	/* EXTRASMENU is absolute specified as normally done
32
+	   during  compile time option -DEXTRASMENU="\"$(TEXT_EXTRAS_MENU)\" */
33
+	(void) sprintf(tmp, "%s", EXTRASMENU);
34
+	if ((result = check_filename_locale(NULL, tmp, 1)) != NULL)
35
+	    goto found;
36
 #endif
37
     }
38
 
39
     /* Giving up, try with ancient way (SunView1) */
40
-    (void) sprintf(tmp, "/usr/lib/.%s", EXTRASMENU);
41
+    (void) sprintf(tmp, "/usr/X11R6/lib/.%s", EXTRASMENU);
42
     result = xv_strsave(tmp);
43
 
44
 found:
(-)/home/trasz/xview/files/patch-lib+libxview+textsw+txt_input.c (-3 / +35 lines)
Lines 1-11 Link Here
1
--- ./lib/libxview/textsw/txt_input.c.orig	Tue Jun 29 07:17:42 1993
1
--- lib/libxview/textsw/txt_input.c.orig	Thu Oct  5 19:18:11 2006
2
+++ ./lib/libxview/textsw/txt_input.c	Sat Apr  1 18:25:29 2000
2
+++ lib/libxview/textsw/txt_input.c	Thu Oct  5 19:59:29 2006
3
@@ -57,6 +57,8 @@ static	void	textsw_do_undo();
3
@@ -57,6 +57,17 @@
4
 Pkg_private     void textsw_implicit_commit_doit();
4
 Pkg_private     void textsw_implicit_commit_doit();
5
 #endif
5
 #endif
6
 
6
 
7
+static int textsw_do_newline();
7
+static int textsw_do_newline();
8
+
8
+
9
+static int textsw_scroll_event();
10
+static int textsw_function_key_event();
11
+static int textsw_mouse_event();
12
+static int textsw_edit_function_key_event();
13
+static int textsw_caret_motion_event();
14
+static int textsw_field_event();
15
+static int textsw_file_operation();
16
+static int textsw_erase_action();
17
+
9
 #define SPACE_CHAR 0x20
18
 #define SPACE_CHAR 0x20
10
 
19
 
11
 Pkg_private int
20
 Pkg_private int
21
@@ -200,14 +211,14 @@
22
     Notify_arg      arg;
23
 {
24
     Pkg_private void     textsw_update_scrollbars();
25
-    static int      textsw_scroll_event();
26
-    static int      textsw_function_key_event();
27
-    static int      textsw_mouse_event();
28
-    static int      textsw_edit_function_key_event();
29
-    static int      textsw_caret_motion_event();
30
-    static int      textsw_field_event();
31
-    static int      textsw_file_operation();
32
-    static int      textsw_erase_action();
33
+    int      textsw_scroll_event();
34
+    int      textsw_function_key_event();
35
+    int      textsw_mouse_event();
36
+    int      textsw_edit_function_key_event();
37
+    int      textsw_caret_motion_event();
38
+    int      textsw_field_event();
39
+    int      textsw_file_operation();
40
+    int      textsw_erase_action();
41
 
42
     int             caret_was_up;
43
     int             result = TEXTSW_PE_USED;
(-)/home/trasz/xview/files/patch-lib+libxview+textsw+txt_once.c (-4 / +5 lines)
Lines 1-5 Link Here
1
--- lib/libxview/textsw/txt_once.c.orig	Sun Oct  5 12:27:25 2003
1
--- lib/libxview/textsw/txt_once.c.orig	Thu Oct  5 19:18:11 2006
2
+++ lib/libxview/textsw/txt_once.c	Sun Oct  5 13:37:04 2003
2
+++ lib/libxview/textsw/txt_once.c	Thu Oct  5 19:51:36 2006
3
@@ -44,7 +44,9 @@
3
@@ -44,7 +44,9 @@
4
 #ifdef OW_I18N
4
 #ifdef OW_I18N
5
 #include <xview_private/draw_impl.h>
5
 #include <xview_private/draw_impl.h>
Lines 19-29 Link Here
19
     ev_destroy(view->e_view);
19
     ev_destroy(view->e_view);
20
     free((char *) view);
20
     free((char *) view);
21
 }
21
 }
22
@@ -1350,6 +1353,7 @@
22
@@ -1350,6 +1353,8 @@
23
 	    
23
 	    
24
 	xv_destroy(view->drop_site);
24
 	xv_destroy(view->drop_site);
25
 	textsw_view_cleanup(view);
25
 	textsw_view_cleanup(view);
26
+	VIEW_PRIVATE(view_public) = NULL; /* WG Mar '95 */
26
+
27
+	((Xv_textsw_view *) (view_public))->private_data = NULL;
27
 	break;
28
 	break;
28
 
29
 
29
       default:			/* Conservative in face of new cases. */
30
       default:			/* Conservative in face of new cases. */
(-)/home/trasz/xview/files/patch-lib+libxview+win+win_input.c (-7 / +16 lines)
Lines 1-6 Link Here
1
--- lib/libxview/win/win_input.c.orig	Sat Aug  6 21:47:27 2005
1
--- lib/libxview/win/win_input.c.orig	Thu Oct  5 19:18:09 2006
2
+++ lib/libxview/win/win_input.c	Sat Aug  6 22:12:06 2005
2
+++ lib/libxview/win/win_input.c	Thu Oct  5 20:10:42 2006
3
@@ -853,7 +853,9 @@
3
@@ -87,6 +87,8 @@
4
 static int      process_wm_pushpin_state();
5
 Pkg_private int win_handle_compose();
6
 
7
+static int xevent_to_event();
8
+
9
 struct _XKeytrans {
10
         struct _XKeytrans *next;/* next on list */
11
         char *string;           /* string to return when the time comes */
12
@@ -853,7 +855,9 @@
4
 #ifdef X11R6
13
 #ifdef X11R6
5
 	/* lumpi@dobag.in-berlin.de */
14
 	/* lumpi@dobag.in-berlin.de */
6
 		int ksym_pcc;
15
 		int ksym_pcc;
Lines 11-17 Link Here
11
 		for (index = 0; index < ksym_pcc; index++) {
20
 		for (index = 0; index < ksym_pcc; index++) {
12
 #else
21
 #else
13
 		for (index = 0; index < display->keysyms_per_keycode; index++) {
22
 		for (index = 0; index < display->keysyms_per_keycode; index++) {
14
@@ -861,7 +863,7 @@
23
@@ -861,7 +865,7 @@
15
 		    if ((ksym = XLookupKeysym(ek, index)) != NoSymbol)
24
 		    if ((ksym = XLookupKeysym(ek, index)) != NoSymbol)
16
 			if (IsKeypadKey(ksym)) {
25
 			if (IsKeypadKey(ksym)) {
17
 			    /* See if key has been rebound. */
26
 			    /* See if key has been rebound. */
Lines 20-26 Link Here
20
 					       buffer, BUFFERSIZE)) {
29
 					       buffer, BUFFERSIZE)) {
21
 			        (void)win_translate_KP_keysym(ksym, buffer);
30
 			        (void)win_translate_KP_keysym(ksym, buffer);
22
 			    }
31
 			    }
23
@@ -2311,7 +2313,7 @@
32
@@ -2311,7 +2315,7 @@
24
     XButtonEvent   *bEvent;
33
     XButtonEvent   *bEvent;
25
     int             timeout;
34
     int             timeout;
26
 {
35
 {
Lines 29-35 Link Here
29
 
38
 
30
     /* XView does a passive grab on the SELECT button! */
39
     /* XView does a passive grab on the SELECT button! */
31
     window_x_allow_events(display);
40
     window_x_allow_events(display);
32
@@ -2720,8 +2722,10 @@
41
@@ -2720,8 +2724,10 @@
33
  * Xlib's.
42
  * Xlib's.
34
  */
43
  */
35
 
44
 
Lines 42-48 Link Here
42
 static int
51
 static int
43
 translate_key(dpy, symbol, modifiers, buffer, nbytes)
52
 translate_key(dpy, symbol, modifiers, buffer, nbytes)
44
     Display 		*dpy;
53
     Display 		*dpy;
45
@@ -2731,11 +2735,18 @@
54
@@ -2731,11 +2737,18 @@
46
     int 		 nbytes;
55
     int 		 nbytes;
47
 {
56
 {
48
 	/* This is _very_ rude ! */
57
 	/* This is _very_ rude ! */
(-)/home/trasz/xview/files/patch-lib+libxview+window+window_set.c (+20 lines)
Line 0 Link Here
1
--- lib/libxview/window/window_set.c.orig	Thu Oct  5 20:15:03 2006
2
+++ lib/libxview/window/window_set.c	Thu Oct  5 20:16:04 2006
3
@@ -53,6 +53,8 @@
4
 static     Xv_opaque 	window_set_avlist_tier2();
5
 static     Xv_opaque 	window_set_avlist_tier3();
6
 
7
+static void window_set_softkey_labels();
8
+
9
 static Defaults_pairs setinput_pairs[] = {
10
     "select",		FALSE,
11
     "followmouse",	TRUE,
12
@@ -1072,7 +1074,7 @@
13
 
14
       case WIN_SOFT_FNKEY_LABELS: {
15
         register Xv_Drawable_info 	*info;
16
-        static void                   	 window_set_softkey_labels();
17
+        void                   	 	window_set_softkey_labels();
18
 
19
         DRAWABLE_INFO_MACRO(win_public, info);
20
         win->softkey_flag = TRUE;
(-)/home/trasz/xview/files/pkg-message.in (+11 lines)
Line 0 Link Here
1
Please add the following paths to your X11 font path:
2
3
%%PREFIX%%/lib/X11/fonts/ol100dpi
4
%%PREFIX%%/lib/X11/fonts/ol75dpi
5
6
Otherwise you will get the following error:
7
8
XView warning: Cannot load font '-b&h-lucida-medium-r-*-*-*-120-*-*-*-*-*-*' (Font package)
9
XView warning: Cannot load font '-b&h-lucida-medium-r-normal-sans-*-120-*-*-*-*-*-*' (Font package)
10
XView error: Cannot open connection to window server: :0.0 (Server package)
11
(-)/home/trasz/xview/pkg-plist (+148 lines)
Lines 542-547 Link Here
542
lib/X11/config/XView.rules
542
lib/X11/config/XView.rules
543
lib/X11/config/XView.tmpl
543
lib/X11/config/XView.tmpl
544
lib/X11/config/XView.prog
544
lib/X11/config/XView.prog
545
lib/X11/fonts/ol75dpi/luBIS08.pcf.gz
546
lib/X11/fonts/ol75dpi/luBIS10.pcf.gz
547
lib/X11/fonts/ol75dpi/luBIS12.pcf.gz
548
lib/X11/fonts/ol75dpi/luBIS14.pcf.gz
549
lib/X11/fonts/ol75dpi/luBIS18.pcf.gz
550
lib/X11/fonts/ol75dpi/luBIS24.pcf.gz
551
lib/X11/fonts/ol75dpi/luBS08.pcf.gz
552
lib/X11/fonts/ol75dpi/luBS10.pcf.gz
553
lib/X11/fonts/ol75dpi/luBS12.pcf.gz
554
lib/X11/fonts/ol75dpi/luBS14.pcf.gz
555
lib/X11/fonts/ol75dpi/luBS18.pcf.gz
556
lib/X11/fonts/ol75dpi/luBS24.pcf.gz
557
lib/X11/fonts/ol75dpi/luIS08.pcf.gz
558
lib/X11/fonts/ol75dpi/luIS10.pcf.gz
559
lib/X11/fonts/ol75dpi/luIS12.pcf.gz
560
lib/X11/fonts/ol75dpi/luIS14.pcf.gz
561
lib/X11/fonts/ol75dpi/luIS18.pcf.gz
562
lib/X11/fonts/ol75dpi/luIS24.pcf.gz
563
lib/X11/fonts/ol75dpi/luRS08.pcf.gz
564
lib/X11/fonts/ol75dpi/luRS10.pcf.gz
565
lib/X11/fonts/ol75dpi/luRS12.pcf.gz
566
lib/X11/fonts/ol75dpi/luRS14.pcf.gz
567
lib/X11/fonts/ol75dpi/luRS18.pcf.gz
568
lib/X11/fonts/ol75dpi/luRS24.pcf.gz
569
lib/X11/fonts/ol75dpi/lubB08.pcf.gz
570
lib/X11/fonts/ol75dpi/lubB10.pcf.gz
571
lib/X11/fonts/ol75dpi/lubB12.pcf.gz
572
lib/X11/fonts/ol75dpi/lubB14.pcf.gz
573
lib/X11/fonts/ol75dpi/lubB18.pcf.gz
574
lib/X11/fonts/ol75dpi/lubB24.pcf.gz
575
lib/X11/fonts/ol75dpi/lubBI08.pcf.gz
576
lib/X11/fonts/ol75dpi/lubBI10.pcf.gz
577
lib/X11/fonts/ol75dpi/lubBI12.pcf.gz
578
lib/X11/fonts/ol75dpi/lubBI14.pcf.gz
579
lib/X11/fonts/ol75dpi/lubBI18.pcf.gz
580
lib/X11/fonts/ol75dpi/lubBI24.pcf.gz
581
lib/X11/fonts/ol75dpi/lubI08.pcf.gz
582
lib/X11/fonts/ol75dpi/lubI10.pcf.gz
583
lib/X11/fonts/ol75dpi/lubI12.pcf.gz
584
lib/X11/fonts/ol75dpi/lubI14.pcf.gz
585
lib/X11/fonts/ol75dpi/lubI18.pcf.gz
586
lib/X11/fonts/ol75dpi/lubI24.pcf.gz
587
lib/X11/fonts/ol75dpi/lubR08.pcf.gz
588
lib/X11/fonts/ol75dpi/lubR10.pcf.gz
589
lib/X11/fonts/ol75dpi/lubR12.pcf.gz
590
lib/X11/fonts/ol75dpi/lubR14.pcf.gz
591
lib/X11/fonts/ol75dpi/lubR18.pcf.gz
592
lib/X11/fonts/ol75dpi/lubR24.pcf.gz
593
lib/X11/fonts/ol75dpi/lutBS08.pcf.gz
594
lib/X11/fonts/ol75dpi/lutBS10.pcf.gz
595
lib/X11/fonts/ol75dpi/lutBS12.pcf.gz
596
lib/X11/fonts/ol75dpi/lutBS14.pcf.gz
597
lib/X11/fonts/ol75dpi/lutBS18.pcf.gz
598
lib/X11/fonts/ol75dpi/lutBS24.pcf.gz
599
lib/X11/fonts/ol75dpi/lutRS08.pcf.gz
600
lib/X11/fonts/ol75dpi/lutRS10.pcf.gz
601
lib/X11/fonts/ol75dpi/lutRS12.pcf.gz
602
lib/X11/fonts/ol75dpi/lutRS14.pcf.gz
603
lib/X11/fonts/ol75dpi/lutRS18.pcf.gz
604
lib/X11/fonts/ol75dpi/lutRS24.pcf.gz
605
lib/X11/fonts/ol75dpi/luBIS19.pcf.gz
606
lib/X11/fonts/ol75dpi/luBS19.pcf.gz
607
lib/X11/fonts/ol75dpi/luIS19.pcf.gz
608
lib/X11/fonts/ol75dpi/luRS19.pcf.gz
609
lib/X11/fonts/ol75dpi/lubB19.pcf.gz
610
lib/X11/fonts/ol75dpi/lubBI19.pcf.gz
611
lib/X11/fonts/ol75dpi/lubI19.pcf.gz
612
lib/X11/fonts/ol75dpi/lubR19.pcf.gz
613
lib/X11/fonts/ol75dpi/lutBS19.pcf.gz
614
lib/X11/fonts/ol75dpi/lutRS19.pcf.gz
615
lib/X11/fonts/ol75dpi/fonts.scale
616
lib/X11/fonts/ol75dpi/fonts.dir
617
lib/X11/fonts/ol75dpi/fonts.alias
618
@dirrm lib/X11/fonts/ol75dpi
619
lib/X11/fonts/ol100dpi/luBIS08.pcf.gz
620
lib/X11/fonts/ol100dpi/luBIS10.pcf.gz
621
lib/X11/fonts/ol100dpi/luBIS12.pcf.gz
622
lib/X11/fonts/ol100dpi/luBIS14.pcf.gz
623
lib/X11/fonts/ol100dpi/luBIS18.pcf.gz
624
lib/X11/fonts/ol100dpi/luBIS24.pcf.gz
625
lib/X11/fonts/ol100dpi/luBS08.pcf.gz
626
lib/X11/fonts/ol100dpi/luBS10.pcf.gz
627
lib/X11/fonts/ol100dpi/luBS12.pcf.gz
628
lib/X11/fonts/ol100dpi/luBS14.pcf.gz
629
lib/X11/fonts/ol100dpi/luBS18.pcf.gz
630
lib/X11/fonts/ol100dpi/luBS24.pcf.gz
631
lib/X11/fonts/ol100dpi/luIS08.pcf.gz
632
lib/X11/fonts/ol100dpi/luIS10.pcf.gz
633
lib/X11/fonts/ol100dpi/luIS12.pcf.gz
634
lib/X11/fonts/ol100dpi/luIS14.pcf.gz
635
lib/X11/fonts/ol100dpi/luIS18.pcf.gz
636
lib/X11/fonts/ol100dpi/luIS24.pcf.gz
637
lib/X11/fonts/ol100dpi/luRS08.pcf.gz
638
lib/X11/fonts/ol100dpi/luRS10.pcf.gz
639
lib/X11/fonts/ol100dpi/luRS12.pcf.gz
640
lib/X11/fonts/ol100dpi/luRS14.pcf.gz
641
lib/X11/fonts/ol100dpi/luRS18.pcf.gz
642
lib/X11/fonts/ol100dpi/luRS24.pcf.gz
643
lib/X11/fonts/ol100dpi/lubB08.pcf.gz
644
lib/X11/fonts/ol100dpi/lubB10.pcf.gz
645
lib/X11/fonts/ol100dpi/lubB12.pcf.gz
646
lib/X11/fonts/ol100dpi/lubB14.pcf.gz
647
lib/X11/fonts/ol100dpi/lubB18.pcf.gz
648
lib/X11/fonts/ol100dpi/lubB24.pcf.gz
649
lib/X11/fonts/ol100dpi/lubBI08.pcf.gz
650
lib/X11/fonts/ol100dpi/lubBI10.pcf.gz
651
lib/X11/fonts/ol100dpi/lubBI12.pcf.gz
652
lib/X11/fonts/ol100dpi/lubBI14.pcf.gz
653
lib/X11/fonts/ol100dpi/lubBI18.pcf.gz
654
lib/X11/fonts/ol100dpi/lubBI24.pcf.gz
655
lib/X11/fonts/ol100dpi/lubI08.pcf.gz
656
lib/X11/fonts/ol100dpi/lubI10.pcf.gz
657
lib/X11/fonts/ol100dpi/lubI12.pcf.gz
658
lib/X11/fonts/ol100dpi/lubI14.pcf.gz
659
lib/X11/fonts/ol100dpi/lubI18.pcf.gz
660
lib/X11/fonts/ol100dpi/lubI24.pcf.gz
661
lib/X11/fonts/ol100dpi/lubR08.pcf.gz
662
lib/X11/fonts/ol100dpi/lubR10.pcf.gz
663
lib/X11/fonts/ol100dpi/lubR12.pcf.gz
664
lib/X11/fonts/ol100dpi/lubR14.pcf.gz
665
lib/X11/fonts/ol100dpi/lubR18.pcf.gz
666
lib/X11/fonts/ol100dpi/lubR24.pcf.gz
667
lib/X11/fonts/ol100dpi/lutBS08.pcf.gz
668
lib/X11/fonts/ol100dpi/lutBS10.pcf.gz
669
lib/X11/fonts/ol100dpi/lutBS12.pcf.gz
670
lib/X11/fonts/ol100dpi/lutBS14.pcf.gz
671
lib/X11/fonts/ol100dpi/lutBS18.pcf.gz
672
lib/X11/fonts/ol100dpi/lutBS24.pcf.gz
673
lib/X11/fonts/ol100dpi/lutRS08.pcf.gz
674
lib/X11/fonts/ol100dpi/lutRS10.pcf.gz
675
lib/X11/fonts/ol100dpi/lutRS12.pcf.gz
676
lib/X11/fonts/ol100dpi/lutRS14.pcf.gz
677
lib/X11/fonts/ol100dpi/lutRS18.pcf.gz
678
lib/X11/fonts/ol100dpi/lutRS24.pcf.gz
679
lib/X11/fonts/ol100dpi/luBIS19.pcf.gz
680
lib/X11/fonts/ol100dpi/luBS19.pcf.gz
681
lib/X11/fonts/ol100dpi/luIS19.pcf.gz
682
lib/X11/fonts/ol100dpi/luRS19.pcf.gz
683
lib/X11/fonts/ol100dpi/lubB19.pcf.gz
684
lib/X11/fonts/ol100dpi/lubBI19.pcf.gz
685
lib/X11/fonts/ol100dpi/lubI19.pcf.gz
686
lib/X11/fonts/ol100dpi/lubR19.pcf.gz
687
lib/X11/fonts/ol100dpi/lutBS19.pcf.gz
688
lib/X11/fonts/ol100dpi/lutRS19.pcf.gz
689
lib/X11/fonts/ol100dpi/fonts.scale
690
lib/X11/fonts/ol100dpi/fonts.dir
691
lib/X11/fonts/ol100dpi/fonts.alias
692
@dirrm lib/X11/fonts/ol100dpi
545
%%PORTDOCS%%%%DOCSDIR%%/bugform
693
%%PORTDOCS%%%%DOCSDIR%%/bugform
546
%%PORTDOCS%%%%DOCSDIR%%/dnd_api.txt
694
%%PORTDOCS%%%%DOCSDIR%%/dnd_api.txt
547
%%PORTDOCS%%%%DOCSDIR%%/olgx_api.txt
695
%%PORTDOCS%%%%DOCSDIR%%/olgx_api.txt

Return to bug 104032