ports/69793: [PATCH] tkdesk doesn't built on recent -current

[Giorgos Keramidas]

>Number:         69793
>Category:       ports
>Synopsis:       [PATCH] tkdesk doesn't built on recent -current
>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:   Fri Jul 30 10:00:43 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Giorgos Keramidas
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD orion.daedalusnetworks.priv 5.2-CURRENT
FreeBSD 5.2-CURRENT #0: Fri Jul 30 10:46:50 EEST 2004
root at orion.daedalusnetworks.priv:/usr/obj/usr/src/sys/ORION i386

>Description:

I tried building TkDesk today after my recent current upgrade, and it
failed with the following message:

: tixImgXpm.c:66: error: conflicting types for 'Tcl_Panic'
: tixImgXpm.c:66: note: a parameter list with an ellipsis can't match an empty parameter name list declaration
: /usr/local/include/tcl8.3/tclDecls.h:38: error: previous declaration of 'Tcl_Panic' was here
: tixImgXpm.c:66: error: conflicting types for 'Tcl_Panic'
: tixImgXpm.c:66: note: a parameter list with an ellipsis can't match an empty parameter name list declaration
: /usr/local/include/tcl8.3/tclDecls.h:38: error: previous declaration of 'Tcl_Panic' was here
: gmake[1]: *** [tixImgXpm.o] Error 1
: gmake[1]: Leaving directory `/home/ports/x11-fm/tkdesk/work/tkdesk-2.0/libdesk'
: gmake: *** [lib_libdesk] Error 2
: *** Error code 2
:
: Stop in /home/ports/x11-fm/tkdesk.

Removing the offending prototype from tixImgXpm.c fixed the build for me
and now that I've used TkDesk without any obvious problems for a while,
I thought it'd be safe to submit the diff.

>How-To-Repeat:

Build TkDesk on today's CURRENT.

>Fix:

%%
--- libdesk/tixImgXpm.c.orig	Fri Jul 30 11:36:18 2004
+++ libdesk/tixImgXpm.c	Fri Jul 30 11:36:30 2004
@@ -63,8 +63,6 @@
 #include "tkPort.h"*/
 /*#include <tix.h>*/
 
-EXTERN void		panic();
-
 /* constants used only in this file */
 
 #define XPM_MONO		1
%%

>Release-Note:
>Audit-Trail:
>Unformatted: