From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 5 20:50:38 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61E3D16A4C2 for ; Thu, 5 Oct 2006 20:50:38 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A33B843D62 for ; Thu, 5 Oct 2006 20:50:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k95KoNWK004553 for ; Thu, 5 Oct 2006 20:50:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k95KoNLE004552; Thu, 5 Oct 2006 20:50:23 GMT (envelope-from gnats) Resent-Date: Thu, 5 Oct 2006 20:50:23 GMT Resent-Message-Id: <200610052050.k95KoNLE004552@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, trasz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 902A316A566 for ; Thu, 5 Oct 2006 20:43:19 +0000 (UTC) (envelope-from trasz@pin.if.uz.zgora.pl) Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1CE143D46 for ; Thu, 5 Oct 2006 20:43:10 +0000 (GMT) (envelope-from trasz@pin.if.uz.zgora.pl) Received: by pin.if.uz.zgora.pl (Postfix, from userid 1001) id D22ED39DB8; Thu, 5 Oct 2006 22:43:12 +0200 (CEST) Message-Id: <20061005204312.D22ED39DB8@pin.if.uz.zgora.pl> Date: Thu, 5 Oct 2006 22:43:12 +0200 (CEST) From: trasz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/104032: [PATCH] x11-toolkits/xview: fix build with gcc41 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Oct 2006 20:50:38 -0000 >Number: 104032 >Category: ports >Synopsis: [PATCH] x11-toolkits/xview: fix build with gcc41 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 05 20:50:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: trasz >Release: FreeBSD 6.1-RELEASE i386 >Organization: >Environment: System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat Jun 3 01:12:10 CEST >Description: - Fix build with gcc41 - Make it respect $CC - Install fonts, it fails without them. Added file(s): - files/patch-lib+libxview+dnd+dnd_dsdm.c - files/patch-lib+libxview+misc+quark.c - files/patch-lib+libxview+panel+item_set.c - files/patch-lib+libxview+textsw+es.h - files/patch-lib+libxview+textsw+ev_display.c - files/patch-lib+libxview+textsw+ps_impl.h - files/patch-lib+libxview+window+window_set.c - files/pkg-message.in Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- xview-3.2.1_4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/Makefile /home/trasz/xview/Makefile --- /usr/ports/x11-toolkits/xview/Makefile Fri Sep 22 16:03:41 2006 +++ /home/trasz/xview/Makefile Thu Oct 5 22:40:47 2006 @@ -24,6 +24,8 @@ IMAKEINCLUDE= "-I${X11BASE}/lib/X11/config -I${WRKSRC}/config" MAKE_ENV+= IMAKEINCLUDE=${IMAKEINCLUDE} ALL_TARGET= World +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message MAN1= xview.1 @@ -32,6 +34,8 @@ post-patch: @${REINPLACE_CMD} -e 's+/usr/X11R6+${PREFIX}+;' \ ${WRKSRC}/config/XView.cf + @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \ + ${WRKSRC}/config/XView.tmpl @${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \ ${WRKSRC}/clients/olwm/screen.c @${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+g;' \ @@ -39,7 +43,7 @@ ${WRKSRC}/lib/libxview/help/help_file.c \ ${WRKSRC}/lib/libxview/misc/gettext.h \ ${WRKSRC}/lib/libxview/textsw/txt_e_menu.c - ${REINPLACE_CMD} -e "s,^MSG_UTIL,#MSG_UTIL," \ + @${REINPLACE_CMD} -e "s,^MSG_UTIL,#MSG_UTIL," \ ${WRKSRC}/util/Imakefile pre-configure: @@ -51,5 +55,6 @@ .if !defined{NOPORTDOCS} @(cd ${WRKSRC}/doc; ${MAKE} install) .endif + @${CAT} ${PKGMESSAGE} .include diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-config+XView.cf /home/trasz/xview/files/patch-config+XView.cf --- /usr/ports/x11-toolkits/xview/files/patch-config+XView.cf Sun Dec 14 00:38:20 2003 +++ /home/trasz/xview/files/patch-config+XView.cf Thu Oct 5 22:40:30 2006 @@ -1,5 +1,5 @@ ---- config/XView.cf.orig Sun Jun 26 21:09:19 1994 -+++ config/XView.cf Sat Oct 4 12:37:28 2003 +--- config/XView.cf.orig Mon Jun 27 04:09:19 1994 ++++ config/XView.cf Thu Oct 5 22:23:13 2006 @@ -101,7 +101,7 @@ * the appropriate value. */ @@ -18,6 +18,15 @@ #endif /* * If you would like the XView man pages to be installed in +@@ -162,7 +162,7 @@ + * These are unchanged from X.V11R4 and the XView 2 release. + */ + #ifndef InstallOpenLookFonts +-#define InstallOpenLookFonts NO ++#define InstallOpenLookFonts YES + #endif + /* + * If you want to install the private header files, set below value to @@ -195,7 +195,7 @@ # if PreR4Server # define LibXViewDefines -DPRE_R4_ICCCM diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+dnd+dnd_dsdm.c /home/trasz/xview/files/patch-lib+libxview+dnd+dnd_dsdm.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+dnd+dnd_dsdm.c Thu Jan 1 01:00:00 1970 +++ /home/trasz/xview/files/patch-lib+libxview+dnd+dnd_dsdm.c Thu Oct 5 22:40:46 2006 @@ -0,0 +1,20 @@ +--- lib/libxview/dnd/dnd_dsdm.c.orig Thu Oct 5 18:16:17 2006 ++++ lib/libxview/dnd/dnd_dsdm.c Thu Oct 5 18:17:26 2006 +@@ -40,7 +40,7 @@ + if (!dnd->sel) { + Xv_object owner, + server; +- static void ReplyProc(); ++ void ReplyProc(); + + owner = (Xv_object)xv_get(DND_PUBLIC(dnd), XV_OWNER); + +@@ -95,7 +95,7 @@ + } + + /* ARGSUSED */ +-static void ++void + ReplyProc(sel, target, type, buffer, length, format) + Selection_requestor sel; + Atom target, type; diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c /home/trasz/xview/files/patch-lib+libxview+file_chooser+file_list.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c Sun Dec 14 00:38:20 2003 +++ /home/trasz/xview/files/patch-lib+libxview+file_chooser+file_list.c Thu Oct 5 22:40:32 2006 @@ -1,6 +1,6 @@ ---- ./lib/libxview/file_chooser/file_list.c.orig Tue Jun 29 07:17:56 1993 -+++ ./lib/libxview/file_chooser/file_list.c Sat Apr 1 18:25:23 2000 -@@ -23,6 +23,9 @@ static char sccsid[] = "@(#)file_lis +--- lib/libxview/file_chooser/file_list.c.orig Thu Oct 5 18:21:11 2006 ++++ lib/libxview/file_chooser/file_list.c Thu Oct 5 18:43:18 2006 +@@ -23,6 +23,9 @@ #include #include @@ -10,7 +10,7 @@ /* X bitmaps for default glyphs */ -@@ -41,6 +44,7 @@ static int go_down_one_directory(); +@@ -41,6 +44,7 @@ static int flist_list_notify(); static int validate_new_directory(); static void flist_new_dir(); @@ -18,21 +18,21 @@ #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) static void flist_error(File_list_private *private, char *format, ...); -@@ -521,7 +525,11 @@ file_list_destroy ( public, status ) +@@ -521,7 +525,11 @@ if (status == DESTROY_CLEANUP) { xv_free_ref( private->directory ); xv_free_ref( private->regex_pattern ); +#ifndef __FreeBSD__ xv_free_ref( private->regex_compile ); +#else -+ xv_free_regex_t( (regex_t *)private->regex_compile ); ++ xv_free_regex_t( private->regex_compile ); +#endif xv_free_ref( private->dotdot_string ); if ( private->dir_ptr ) (void) closedir( private->dir_ptr ); -@@ -1174,14 +1182,16 @@ static char *compile(); +@@ -1174,14 +1182,16 @@ static int step(); - #endif /* SVR4 */ + #endif - +#ifndef __FreeBSD__ @@ -48,7 +48,7 @@ char compile_buf[MAXPATHLEN+1]; char *end_ptr; size_t num_bytes; -@@ -1197,6 +1207,17 @@ flist_compile_regex( private ) +@@ -1197,6 +1207,17 @@ xv_free_ref( private->regex_compile ); private->regex_compile = xv_alloc_n(char, num_bytes); (void) XV_BCOPY(compile_buf, private->regex_compile, num_bytes); @@ -59,14 +59,14 @@ + exit(-1); + } + regcomp(compile_buf, private->regex_pattern, 0); -+ xv_free_regex_t((regex_t *)private->regex_compile); ++ xv_free_regex_t(private->regex_compile); + private->regex_compile = (char *)compile_buf; +#endif + } -@@ -1205,7 +1226,11 @@ flist_match_regex( s, private ) +@@ -1205,7 +1226,11 @@ char *s; File_list_private *private; { diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c /home/trasz/xview/files/patch-lib+libxview+misc+gettext.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c Sat Aug 6 23:39:23 2005 +++ /home/trasz/xview/files/patch-lib+libxview+misc+gettext.c Thu Oct 5 22:40:35 2006 @@ -1,12 +1,13 @@ ---- lib/libxview/misc/gettext.c.orig Sat Aug 6 21:47:27 2005 -+++ lib/libxview/misc/gettext.c Sat Aug 6 21:51:07 2005 +--- lib/libxview/misc/gettext.c.orig Thu Oct 5 18:45:03 2006 ++++ lib/libxview/misc/gettext.c Thu Oct 5 18:50:03 2006 @@ -10,10 +10,12 @@ #include char *strdup(); -char * dgettext(), *bindtextdomain(); +-char *_gettext(); +char * dgettext(char* domain_nane, char* msg_id), *bindtextdomain(); - char *_gettext(); ++static char *_gettext(); char *fgets(), *getenv(); +#ifndef OS_HAS_MMAP caddr_t mmap(); diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+misc+quark.c /home/trasz/xview/files/patch-lib+libxview+misc+quark.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+misc+quark.c Thu Jan 1 01:00:00 1970 +++ /home/trasz/xview/files/patch-lib+libxview+misc+quark.c Thu Oct 5 22:40:46 2006 @@ -0,0 +1,11 @@ +--- lib/libxview/misc/quark.c.orig Thu Oct 5 18:57:21 2006 ++++ lib/libxview/misc/quark.c Thu Oct 5 18:57:45 2006 +@@ -16,7 +16,7 @@ + #include + #include + +-Xv_opaque resource_type_conv(); ++static Xv_opaque resource_type_conv(); + + /* + * Utilities to deal with quark lists and such. diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+panel+item_set.c /home/trasz/xview/files/patch-lib+libxview+panel+item_set.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+panel+item_set.c Thu Jan 1 01:00:00 1970 +++ /home/trasz/xview/files/patch-lib+libxview+panel+item_set.c Thu Oct 5 22:40:47 2006 @@ -0,0 +1,11 @@ +--- lib/libxview/panel/item_set.c.orig Thu Oct 5 19:03:02 2006 ++++ lib/libxview/panel/item_set.c Thu Oct 5 19:04:55 2006 +@@ -26,6 +26,8 @@ + + static void item_adjust_label_size(); + ++static fix_positions(); ++ + extern Notify_value panel_base_event_handler(); + + Pkg_private Xv_opaque diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+es.h /home/trasz/xview/files/patch-lib+libxview+textsw+es.h --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+es.h Thu Jan 1 01:00:00 1970 +++ /home/trasz/xview/files/patch-lib+libxview+textsw+es.h Thu Oct 5 22:40:47 2006 @@ -0,0 +1,13 @@ +--- lib/libxview/textsw/es.h.orig Thu Oct 5 19:15:38 2006 ++++ lib/libxview/textsw/es.h Thu Oct 5 19:15:44 2006 +@@ -182,8 +182,8 @@ + } Es_buf_object; + typedef Es_buf_object *Es_buf_handle; + +-EXTERN_FUNCTION( caddr_t es_file_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT )); +-EXTERN_FUNCTION( caddr_t es_mem_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT )); ++EXTERN_FUNCTION( static caddr_t es_file_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT )); ++EXTERN_FUNCTION( static caddr_t es_mem_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT )); + + #define ES_READ_BUF_LEN 2047 + #define ES_WRITE_BUF_LEN 2047 diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+ev_display.c /home/trasz/xview/files/patch-lib+libxview+textsw+ev_display.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+ev_display.c Thu Jan 1 01:00:00 1970 +++ /home/trasz/xview/files/patch-lib+libxview+textsw+ev_display.c Thu Oct 5 22:40:47 2006 @@ -0,0 +1,11 @@ +--- lib/libxview/textsw/ev_display.c.orig Thu Oct 5 19:30:17 2006 ++++ lib/libxview/textsw/ev_display.c Thu Oct 5 19:32:21 2006 +@@ -940,7 +940,7 @@ + register int i; + Es_index pos, pos_to_remember; + Pkg_private void ev_lt_format(); +- static void ev_swap_line_table(); ++ void ev_swap_line_table(); + + esbuf.esh = chain->esh; + esbuf.buf = buf; diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+ps_impl.h /home/trasz/xview/files/patch-lib+libxview+textsw+ps_impl.h --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+ps_impl.h Thu Jan 1 01:00:00 1970 +++ /home/trasz/xview/files/patch-lib+libxview+textsw+ps_impl.h Thu Oct 5 22:40:47 2006 @@ -0,0 +1,11 @@ +--- lib/libxview/textsw/ps_impl.h.orig Thu Oct 5 19:26:54 2006 ++++ lib/libxview/textsw/ps_impl.h Thu Oct 5 19:27:04 2006 +@@ -134,7 +134,7 @@ + #define SCRATCH_HAS_WRAPPED(_private) \ + ((_private)->scratch_length > (_private)->scratch_max_len) + +-EXTERN_FUNCTION( caddr_t ps_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT )); ++EXTERN_FUNCTION( static caddr_t ps_get, (Es_handle esh, Es_attribute attribute, DOTDOTDOT )); + + #endif + diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_e_menu.c /home/trasz/xview/files/patch-lib+libxview+textsw+txt_e_menu.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_e_menu.c Sun Dec 14 00:38:21 2003 +++ /home/trasz/xview/files/patch-lib+libxview+textsw+txt_e_menu.c Thu Oct 5 22:40:41 2006 @@ -1,22 +1,44 @@ -*** lib/libxview/textsw/txt_e_menu.c.org Sun Jan 21 16:01:52 2001 ---- lib/libxview/textsw/txt_e_menu.c Sun Jan 21 16:03:27 2001 -*************** -*** 144,153 **** ---- 144,160 ---- - - #ifdef __FreeBSD__ - /* Gee, still?... We will try the old fashioned way */ -+ /* If it is never defined, EXTRASMENU is set to text_extras_menu -+ see top of this file ... */ - (void) sprintf(tmp, "%s/lib/.%s", - filename, EXTRASMENU); - if ((result = check_filename_locale(NULL, tmp, 1)) != NULL) - goto found; -+ /* EXTRASMENU is absolute specified as normally done -+ during compile time option -DEXTRASMENU="\"$(TEXT_EXTRAS_MENU)\" */ -+ (void) sprintf(tmp, "%s", EXTRASMENU); -+ if ((result = check_filename_locale(NULL, tmp, 1)) != NULL) -+ goto found; - #endif - } - +--- lib/libxview/textsw/txt_e_menu.c.orig Thu Oct 5 19:18:11 2006 ++++ lib/libxview/textsw/txt_e_menu.c Thu Oct 5 20:03:45 2006 +@@ -19,7 +19,7 @@ + * 3. $(HOME)/.text_extras_menu{.} (home dir), + * 4. locale sensitive system default + * ("$OPENWINHOME/lib/locale//XView/.text_extras_menu") +- * 4. fall back to SunView1 ("/usr/lib/.text_extras_menu") ++ * 4. fall back to SunView1 ("/usr/X11R6/lib/.text_extras_menu") + * + * Always try locale specific name first, if not there, try without + * locale name. In the #4, we will fall back to the "C" locale. +@@ -76,6 +76,8 @@ + static int Nargs; + static char *check_filename_locale(); + ++static any_shell_meta(); ++ + extern int EXTRASMENU_FILENAME_KEY; + + Pkg_private char * +@@ -138,15 +140,22 @@ + + #ifdef notdef + /* Gee, still?... We will try the old fashioned way */ ++ /* If it is never defined, EXTRASMENU is set to text_extras_menu ++ see top of this file ... */ + (void) sprintf(tmp, "%s/lib/.%s", + filename, EXTRASMENU); + if ((result = check_filename_locale(NULL, tmp, 1)) != NULL) + goto found; ++ /* EXTRASMENU is absolute specified as normally done ++ during compile time option -DEXTRASMENU="\"$(TEXT_EXTRAS_MENU)\" */ ++ (void) sprintf(tmp, "%s", EXTRASMENU); ++ if ((result = check_filename_locale(NULL, tmp, 1)) != NULL) ++ goto found; + #endif + } + + /* Giving up, try with ancient way (SunView1) */ +- (void) sprintf(tmp, "/usr/lib/.%s", EXTRASMENU); ++ (void) sprintf(tmp, "/usr/X11R6/lib/.%s", EXTRASMENU); + result = xv_strsave(tmp); + + found: diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_input.c /home/trasz/xview/files/patch-lib+libxview+textsw+txt_input.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_input.c Sun Dec 14 00:38:21 2003 +++ /home/trasz/xview/files/patch-lib+libxview+textsw+txt_input.c Thu Oct 5 22:40:41 2006 @@ -1,11 +1,43 @@ ---- ./lib/libxview/textsw/txt_input.c.orig Tue Jun 29 07:17:42 1993 -+++ ./lib/libxview/textsw/txt_input.c Sat Apr 1 18:25:29 2000 -@@ -57,6 +57,8 @@ static void textsw_do_undo(); +--- lib/libxview/textsw/txt_input.c.orig Thu Oct 5 19:18:11 2006 ++++ lib/libxview/textsw/txt_input.c Thu Oct 5 19:59:29 2006 +@@ -57,6 +57,17 @@ Pkg_private void textsw_implicit_commit_doit(); #endif +static int textsw_do_newline(); + ++static int textsw_scroll_event(); ++static int textsw_function_key_event(); ++static int textsw_mouse_event(); ++static int textsw_edit_function_key_event(); ++static int textsw_caret_motion_event(); ++static int textsw_field_event(); ++static int textsw_file_operation(); ++static int textsw_erase_action(); ++ #define SPACE_CHAR 0x20 Pkg_private int +@@ -200,14 +211,14 @@ + Notify_arg arg; + { + Pkg_private void textsw_update_scrollbars(); +- static int textsw_scroll_event(); +- static int textsw_function_key_event(); +- static int textsw_mouse_event(); +- static int textsw_edit_function_key_event(); +- static int textsw_caret_motion_event(); +- static int textsw_field_event(); +- static int textsw_file_operation(); +- static int textsw_erase_action(); ++ int textsw_scroll_event(); ++ int textsw_function_key_event(); ++ int textsw_mouse_event(); ++ int textsw_edit_function_key_event(); ++ int textsw_caret_motion_event(); ++ int textsw_field_event(); ++ int textsw_file_operation(); ++ int textsw_erase_action(); + + int caret_was_up; + int result = TEXTSW_PE_USED; diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_once.c /home/trasz/xview/files/patch-lib+libxview+textsw+txt_once.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_once.c Sun Dec 14 00:38:21 2003 +++ /home/trasz/xview/files/patch-lib+libxview+textsw+txt_once.c Thu Oct 5 22:40:42 2006 @@ -1,5 +1,5 @@ ---- lib/libxview/textsw/txt_once.c.orig Sun Oct 5 12:27:25 2003 -+++ lib/libxview/textsw/txt_once.c Sun Oct 5 13:37:04 2003 +--- lib/libxview/textsw/txt_once.c.orig Thu Oct 5 19:18:11 2006 ++++ lib/libxview/textsw/txt_once.c Thu Oct 5 19:51:36 2006 @@ -44,7 +44,9 @@ #ifdef OW_I18N #include @@ -19,11 +19,12 @@ ev_destroy(view->e_view); free((char *) view); } -@@ -1350,6 +1353,7 @@ +@@ -1350,6 +1353,8 @@ xv_destroy(view->drop_site); textsw_view_cleanup(view); -+ VIEW_PRIVATE(view_public) = NULL; /* WG Mar '95 */ ++ ++ ((Xv_textsw_view *) (view_public))->private_data = NULL; break; default: /* Conservative in face of new cases. */ diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c /home/trasz/xview/files/patch-lib+libxview+win+win_input.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c Sat Aug 6 23:39:23 2005 +++ /home/trasz/xview/files/patch-lib+libxview+win+win_input.c Thu Oct 5 22:40:44 2006 @@ -1,6 +1,15 @@ ---- lib/libxview/win/win_input.c.orig Sat Aug 6 21:47:27 2005 -+++ lib/libxview/win/win_input.c Sat Aug 6 22:12:06 2005 -@@ -853,7 +853,9 @@ +--- lib/libxview/win/win_input.c.orig Thu Oct 5 19:18:09 2006 ++++ lib/libxview/win/win_input.c Thu Oct 5 20:10:42 2006 +@@ -87,6 +87,8 @@ + static int process_wm_pushpin_state(); + Pkg_private int win_handle_compose(); + ++static int xevent_to_event(); ++ + struct _XKeytrans { + struct _XKeytrans *next;/* next on list */ + char *string; /* string to return when the time comes */ +@@ -853,7 +855,9 @@ #ifdef X11R6 /* lumpi@dobag.in-berlin.de */ int ksym_pcc; @@ -11,7 +20,7 @@ for (index = 0; index < ksym_pcc; index++) { #else for (index = 0; index < display->keysyms_per_keycode; index++) { -@@ -861,7 +863,7 @@ +@@ -861,7 +865,7 @@ if ((ksym = XLookupKeysym(ek, index)) != NoSymbol) if (IsKeypadKey(ksym)) { /* See if key has been rebound. */ @@ -20,7 +29,7 @@ buffer, BUFFERSIZE)) { (void)win_translate_KP_keysym(ksym, buffer); } -@@ -2311,7 +2313,7 @@ +@@ -2311,7 +2315,7 @@ XButtonEvent *bEvent; int timeout; { @@ -29,7 +38,7 @@ /* XView does a passive grab on the SELECT button! */ window_x_allow_events(display); -@@ -2720,8 +2722,10 @@ +@@ -2720,8 +2724,10 @@ * Xlib's. */ @@ -42,7 +51,7 @@ static int translate_key(dpy, symbol, modifiers, buffer, nbytes) Display *dpy; -@@ -2731,11 +2735,18 @@ +@@ -2731,11 +2737,18 @@ int nbytes; { /* This is _very_ rude ! */ diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+window+window_set.c /home/trasz/xview/files/patch-lib+libxview+window+window_set.c --- /usr/ports/x11-toolkits/xview/files/patch-lib+libxview+window+window_set.c Thu Jan 1 01:00:00 1970 +++ /home/trasz/xview/files/patch-lib+libxview+window+window_set.c Thu Oct 5 22:40:47 2006 @@ -0,0 +1,20 @@ +--- lib/libxview/window/window_set.c.orig Thu Oct 5 20:15:03 2006 ++++ lib/libxview/window/window_set.c Thu Oct 5 20:16:04 2006 +@@ -53,6 +53,8 @@ + static Xv_opaque window_set_avlist_tier2(); + static Xv_opaque window_set_avlist_tier3(); + ++static void window_set_softkey_labels(); ++ + static Defaults_pairs setinput_pairs[] = { + "select", FALSE, + "followmouse", TRUE, +@@ -1072,7 +1074,7 @@ + + case WIN_SOFT_FNKEY_LABELS: { + register Xv_Drawable_info *info; +- static void window_set_softkey_labels(); ++ void window_set_softkey_labels(); + + DRAWABLE_INFO_MACRO(win_public, info); + win->softkey_flag = TRUE; diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/files/pkg-message.in /home/trasz/xview/files/pkg-message.in --- /usr/ports/x11-toolkits/xview/files/pkg-message.in Thu Jan 1 01:00:00 1970 +++ /home/trasz/xview/files/pkg-message.in Thu Oct 5 22:40:47 2006 @@ -0,0 +1,11 @@ +Please add the following paths to your X11 font path: + +%%PREFIX%%/lib/X11/fonts/ol100dpi +%%PREFIX%%/lib/X11/fonts/ol75dpi + +Otherwise you will get the following error: + +XView warning: Cannot load font '-b&h-lucida-medium-r-*-*-*-120-*-*-*-*-*-*' (Font package) +XView warning: Cannot load font '-b&h-lucida-medium-r-normal-sans-*-120-*-*-*-*-*-*' (Font package) +XView error: Cannot open connection to window server: :0.0 (Server package) + diff -ruN --exclude=CVS /usr/ports/x11-toolkits/xview/pkg-plist /home/trasz/xview/pkg-plist --- /usr/ports/x11-toolkits/xview/pkg-plist Fri Sep 22 16:03:41 2006 +++ /home/trasz/xview/pkg-plist Thu Oct 5 22:40:48 2006 @@ -542,6 +542,154 @@ lib/X11/config/XView.rules lib/X11/config/XView.tmpl lib/X11/config/XView.prog +lib/X11/fonts/ol75dpi/luBIS08.pcf.gz +lib/X11/fonts/ol75dpi/luBIS10.pcf.gz +lib/X11/fonts/ol75dpi/luBIS12.pcf.gz +lib/X11/fonts/ol75dpi/luBIS14.pcf.gz +lib/X11/fonts/ol75dpi/luBIS18.pcf.gz +lib/X11/fonts/ol75dpi/luBIS24.pcf.gz +lib/X11/fonts/ol75dpi/luBS08.pcf.gz +lib/X11/fonts/ol75dpi/luBS10.pcf.gz +lib/X11/fonts/ol75dpi/luBS12.pcf.gz +lib/X11/fonts/ol75dpi/luBS14.pcf.gz +lib/X11/fonts/ol75dpi/luBS18.pcf.gz +lib/X11/fonts/ol75dpi/luBS24.pcf.gz +lib/X11/fonts/ol75dpi/luIS08.pcf.gz +lib/X11/fonts/ol75dpi/luIS10.pcf.gz +lib/X11/fonts/ol75dpi/luIS12.pcf.gz +lib/X11/fonts/ol75dpi/luIS14.pcf.gz +lib/X11/fonts/ol75dpi/luIS18.pcf.gz +lib/X11/fonts/ol75dpi/luIS24.pcf.gz +lib/X11/fonts/ol75dpi/luRS08.pcf.gz +lib/X11/fonts/ol75dpi/luRS10.pcf.gz +lib/X11/fonts/ol75dpi/luRS12.pcf.gz +lib/X11/fonts/ol75dpi/luRS14.pcf.gz +lib/X11/fonts/ol75dpi/luRS18.pcf.gz +lib/X11/fonts/ol75dpi/luRS24.pcf.gz +lib/X11/fonts/ol75dpi/lubB08.pcf.gz +lib/X11/fonts/ol75dpi/lubB10.pcf.gz +lib/X11/fonts/ol75dpi/lubB12.pcf.gz +lib/X11/fonts/ol75dpi/lubB14.pcf.gz +lib/X11/fonts/ol75dpi/lubB18.pcf.gz +lib/X11/fonts/ol75dpi/lubB24.pcf.gz +lib/X11/fonts/ol75dpi/lubBI08.pcf.gz +lib/X11/fonts/ol75dpi/lubBI10.pcf.gz +lib/X11/fonts/ol75dpi/lubBI12.pcf.gz +lib/X11/fonts/ol75dpi/lubBI14.pcf.gz +lib/X11/fonts/ol75dpi/lubBI18.pcf.gz +lib/X11/fonts/ol75dpi/lubBI24.pcf.gz +lib/X11/fonts/ol75dpi/lubI08.pcf.gz +lib/X11/fonts/ol75dpi/lubI10.pcf.gz +lib/X11/fonts/ol75dpi/lubI12.pcf.gz +lib/X11/fonts/ol75dpi/lubI14.pcf.gz +lib/X11/fonts/ol75dpi/lubI18.pcf.gz +lib/X11/fonts/ol75dpi/lubI24.pcf.gz +lib/X11/fonts/ol75dpi/lubR08.pcf.gz +lib/X11/fonts/ol75dpi/lubR10.pcf.gz +lib/X11/fonts/ol75dpi/lubR12.pcf.gz +lib/X11/fonts/ol75dpi/lubR14.pcf.gz +lib/X11/fonts/ol75dpi/lubR18.pcf.gz +lib/X11/fonts/ol75dpi/lubR24.pcf.gz +lib/X11/fonts/ol75dpi/lutBS08.pcf.gz +lib/X11/fonts/ol75dpi/lutBS10.pcf.gz +lib/X11/fonts/ol75dpi/lutBS12.pcf.gz +lib/X11/fonts/ol75dpi/lutBS14.pcf.gz +lib/X11/fonts/ol75dpi/lutBS18.pcf.gz +lib/X11/fonts/ol75dpi/lutBS24.pcf.gz +lib/X11/fonts/ol75dpi/lutRS08.pcf.gz +lib/X11/fonts/ol75dpi/lutRS10.pcf.gz +lib/X11/fonts/ol75dpi/lutRS12.pcf.gz +lib/X11/fonts/ol75dpi/lutRS14.pcf.gz +lib/X11/fonts/ol75dpi/lutRS18.pcf.gz +lib/X11/fonts/ol75dpi/lutRS24.pcf.gz +lib/X11/fonts/ol75dpi/luBIS19.pcf.gz +lib/X11/fonts/ol75dpi/luBS19.pcf.gz +lib/X11/fonts/ol75dpi/luIS19.pcf.gz +lib/X11/fonts/ol75dpi/luRS19.pcf.gz +lib/X11/fonts/ol75dpi/lubB19.pcf.gz +lib/X11/fonts/ol75dpi/lubBI19.pcf.gz +lib/X11/fonts/ol75dpi/lubI19.pcf.gz +lib/X11/fonts/ol75dpi/lubR19.pcf.gz +lib/X11/fonts/ol75dpi/lutBS19.pcf.gz +lib/X11/fonts/ol75dpi/lutRS19.pcf.gz +lib/X11/fonts/ol75dpi/fonts.scale +lib/X11/fonts/ol75dpi/fonts.dir +lib/X11/fonts/ol75dpi/fonts.alias +@dirrm lib/X11/fonts/ol75dpi +lib/X11/fonts/ol100dpi/luBIS08.pcf.gz +lib/X11/fonts/ol100dpi/luBIS10.pcf.gz +lib/X11/fonts/ol100dpi/luBIS12.pcf.gz +lib/X11/fonts/ol100dpi/luBIS14.pcf.gz +lib/X11/fonts/ol100dpi/luBIS18.pcf.gz +lib/X11/fonts/ol100dpi/luBIS24.pcf.gz +lib/X11/fonts/ol100dpi/luBS08.pcf.gz +lib/X11/fonts/ol100dpi/luBS10.pcf.gz +lib/X11/fonts/ol100dpi/luBS12.pcf.gz +lib/X11/fonts/ol100dpi/luBS14.pcf.gz +lib/X11/fonts/ol100dpi/luBS18.pcf.gz +lib/X11/fonts/ol100dpi/luBS24.pcf.gz +lib/X11/fonts/ol100dpi/luIS08.pcf.gz +lib/X11/fonts/ol100dpi/luIS10.pcf.gz +lib/X11/fonts/ol100dpi/luIS12.pcf.gz +lib/X11/fonts/ol100dpi/luIS14.pcf.gz +lib/X11/fonts/ol100dpi/luIS18.pcf.gz +lib/X11/fonts/ol100dpi/luIS24.pcf.gz +lib/X11/fonts/ol100dpi/luRS08.pcf.gz +lib/X11/fonts/ol100dpi/luRS10.pcf.gz +lib/X11/fonts/ol100dpi/luRS12.pcf.gz +lib/X11/fonts/ol100dpi/luRS14.pcf.gz +lib/X11/fonts/ol100dpi/luRS18.pcf.gz +lib/X11/fonts/ol100dpi/luRS24.pcf.gz +lib/X11/fonts/ol100dpi/lubB08.pcf.gz +lib/X11/fonts/ol100dpi/lubB10.pcf.gz +lib/X11/fonts/ol100dpi/lubB12.pcf.gz +lib/X11/fonts/ol100dpi/lubB14.pcf.gz +lib/X11/fonts/ol100dpi/lubB18.pcf.gz +lib/X11/fonts/ol100dpi/lubB24.pcf.gz +lib/X11/fonts/ol100dpi/lubBI08.pcf.gz +lib/X11/fonts/ol100dpi/lubBI10.pcf.gz +lib/X11/fonts/ol100dpi/lubBI12.pcf.gz +lib/X11/fonts/ol100dpi/lubBI14.pcf.gz +lib/X11/fonts/ol100dpi/lubBI18.pcf.gz +lib/X11/fonts/ol100dpi/lubBI24.pcf.gz +lib/X11/fonts/ol100dpi/lubI08.pcf.gz +lib/X11/fonts/ol100dpi/lubI10.pcf.gz +lib/X11/fonts/ol100dpi/lubI12.pcf.gz +lib/X11/fonts/ol100dpi/lubI14.pcf.gz +lib/X11/fonts/ol100dpi/lubI18.pcf.gz +lib/X11/fonts/ol100dpi/lubI24.pcf.gz +lib/X11/fonts/ol100dpi/lubR08.pcf.gz +lib/X11/fonts/ol100dpi/lubR10.pcf.gz +lib/X11/fonts/ol100dpi/lubR12.pcf.gz +lib/X11/fonts/ol100dpi/lubR14.pcf.gz +lib/X11/fonts/ol100dpi/lubR18.pcf.gz +lib/X11/fonts/ol100dpi/lubR24.pcf.gz +lib/X11/fonts/ol100dpi/lutBS08.pcf.gz +lib/X11/fonts/ol100dpi/lutBS10.pcf.gz +lib/X11/fonts/ol100dpi/lutBS12.pcf.gz +lib/X11/fonts/ol100dpi/lutBS14.pcf.gz +lib/X11/fonts/ol100dpi/lutBS18.pcf.gz +lib/X11/fonts/ol100dpi/lutBS24.pcf.gz +lib/X11/fonts/ol100dpi/lutRS08.pcf.gz +lib/X11/fonts/ol100dpi/lutRS10.pcf.gz +lib/X11/fonts/ol100dpi/lutRS12.pcf.gz +lib/X11/fonts/ol100dpi/lutRS14.pcf.gz +lib/X11/fonts/ol100dpi/lutRS18.pcf.gz +lib/X11/fonts/ol100dpi/lutRS24.pcf.gz +lib/X11/fonts/ol100dpi/luBIS19.pcf.gz +lib/X11/fonts/ol100dpi/luBS19.pcf.gz +lib/X11/fonts/ol100dpi/luIS19.pcf.gz +lib/X11/fonts/ol100dpi/luRS19.pcf.gz +lib/X11/fonts/ol100dpi/lubB19.pcf.gz +lib/X11/fonts/ol100dpi/lubBI19.pcf.gz +lib/X11/fonts/ol100dpi/lubI19.pcf.gz +lib/X11/fonts/ol100dpi/lubR19.pcf.gz +lib/X11/fonts/ol100dpi/lutBS19.pcf.gz +lib/X11/fonts/ol100dpi/lutRS19.pcf.gz +lib/X11/fonts/ol100dpi/fonts.scale +lib/X11/fonts/ol100dpi/fonts.dir +lib/X11/fonts/ol100dpi/fonts.alias +@dirrm lib/X11/fonts/ol100dpi %%PORTDOCS%%%%DOCSDIR%%/bugform %%PORTDOCS%%%%DOCSDIR%%/dnd_api.txt %%PORTDOCS%%%%DOCSDIR%%/olgx_api.txt --- xview-3.2.1_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: