head 1.6; access; symbols pkgsrc-2022Q1:1.4.0.66 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.64 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.62 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.60 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.58 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.56 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.54 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.50 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.30 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.52 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.48 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.46 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.44 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.42 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.40 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.38 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.36 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.34 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.32 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.28 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.26 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.24 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.22 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.20 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.18 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.16 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.14 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.12 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.10 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.8 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.6 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.4 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.2 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.3.0.66 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.64 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.62 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.60 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.58 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.56 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.54 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.52 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.48 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.46 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.44 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.42 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.40 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.38 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.36 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.32 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.1.1.0.22 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.20 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.18 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.16 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.14 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.12 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.10 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.8 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.4 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.6 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.2 pkgviews-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2022.06.07.10.15.01; author wiz; state dead; branches; next 1.5; commitid hceaBFRK9HvWQ5HD; 1.5 date 2022.06.06.05.11.58; author dholland; state Exp; branches; next 1.4; commitid XY2Gus66oa6WcWGD; 1.4 date 2014.02.22.07.53.47; author obache; state Exp; branches; next 1.3; commitid 7KsVtJ87Uandk4qx; 1.3 date 2006.04.21.12.09.57; author joerg; state Exp; branches; next 1.2; 1.2 date 2005.10.26.04.29.01; author minskim; state Exp; branches; next 1.1; 1.1 date 2002.07.03.09.27.01; author dmcmahill; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.07.03.09.27.01; author dmcmahill; state Exp; branches; next ; desc @@ 1.6 log @tkdesk: remove Last release from 2004, dead upstream, broken despite valiant efforts by dholland. @ text @$NetBSD: patch-aj,v 1.5 2022/06/06 05:11:58 dholland Exp $ - remove panic declaration (XXX: why?) - update for newer tcl --- libdesk/tixImgXpm.c.orig 2022-06-06 01:40:39.166611462 +0000 +++ libdesk/tixImgXpm.c @@@@ -58,8 +58,6 @@@@ #include "tkPort.h"*/ /*#include */ -EXTERN void panic(); - /* constants used only in this file */ #define XPM_MONO 1 @@@@ -151,7 +149,7 @@@@ typedef struct PixmapInstance { */ static int ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp, - char *name, int argc, char **argv, + char *name, int objc, Tcl_Obj *CONST objv[], Tk_ImageType *typePtr, Tk_ImageMaster master, ClientData *clientDataPtr)); static ClientData ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin, @@@@ -239,12 +237,12 @@@@ static int xpmTableInited = 0; *---------------------------------------------------------------------- */ static int -ImgXpmCreate(interp, name, argc, argv, typePtr, master, clientDataPtr) +ImgXpmCreate(interp, name, objc, objv, typePtr, master, clientDataPtr) Tcl_Interp *interp; /* Interpreter for application containing * image. */ char *name; /* Name to use for image. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings for options (doesn't + int objc; /* Number of arguments. */ + Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't * include image name or type). */ Tk_ImageType *typePtr; /* Pointer to our type record (not used). */ Tk_ImageMaster master; /* Token for image, to be used by us in @@@@ -254,6 +252,13 @@@@ ImgXpmCreate(interp, name, argc, argv, t { PixmapMaster *masterPtr; + int i; + char **argv = (char **) Tcl_Alloc(objc * sizeof(char*)); + for (i=0; i < objc; i++) { + + argv[i] = Tcl_GetString(objv[i]); + } + masterPtr = (PixmapMaster *) ckalloc(sizeof(PixmapMaster)); masterPtr->tkMaster = master; masterPtr->interp = interp; @@@@ -267,10 +272,11 @@@@ ImgXpmCreate(interp, name, argc, argv, t masterPtr->isDataAlloced = 0; masterPtr->instancePtr = NULL; - if (ImgXpmConfigureMaster(masterPtr, argc, argv, 0) != TCL_OK) { + if (ImgXpmConfigureMaster(masterPtr, objc, argv, 0) != TCL_OK) { ImgXpmDelete((ClientData) masterPtr); return TCL_ERROR; } + Tcl_Free((char *) argv); *clientDataPtr = (ClientData) masterPtr; return TCL_OK; } @@@@ -1152,9 +1158,11 @@@@ ImgXpmCmd(clientData, interp, argc, argv size_t length; if (argc < 2) { - sprintf(interp->result, + char buf[128]; + snprintf(buf, sizeof(buf), "wrong # args: should be \"%.50s option ?arg arg ...?\"", argv[0]); + Tcl_SetResult(interp, buf, TCL_VOLATILE); return TCL_ERROR; } c = argv[1][0]; @ 1.5 log @Fix up sysutils/tkdesk, some. - Fix up the TCL interpreter result handling so we don't need to use USE_INTERP_RESULT. - Fix the first startup segfault (probably the one seen in PR 32807 but not necessarily) by using Tcl_Free instead of trying to bypass it. Unfortunately, there's at least one more segfault at startup with no obvious cause. - Don't run off the end of string buffers. - Remove some uses of sprintf. Use standard headers. Other minor tidyups. - Correct glitch in the configury patches that made it link statically to blt. - Avoid passing empty variable names to test(1) during configure. - Fix some pkglint. Bump PKGREVISION to 4, because even though it didn't run and still doesn't, it does build. :-| @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.4 2014/02/22 07:53:47 obache Exp $ @ 1.4 log @Update fkdesk to 2.0p2, apply upstream patches, with fixes build with TCL 8.6, Itcl 4.0.0 is bundled. XXX: but not works well yet. 2.0p1 04/16/2004 Compilation of the file libdesk/tixImgXpm.c fails when using a Tk version lower than 8.3. 2.0p2 04/20/2004 Some Linux distributions are using newer "unofficial" versions of Incr Tcl (Itcl). Though TkDesk 2.0 works with the official Itcl 3.2.1 release, these newer Itcl installations disable backwards compatibility for some older Itcl syntax that TkDesk still requires. The typical symptom of this problem is this error message when TkDesk is started: Error in startup script: can't rename "itcl_class": command doesn't exist... @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.3 2006/04/21 12:09:57 joerg Exp $ d3 4 a6 1 --- libdesk/tixImgXpm.c.orig 2014-02-22 04:59:11.000000000 +0000 d69 13 @ 1.3 log @Fix build on DragonFly and with newer GCC versions. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.2 2005/10/26 04:29:01 minskim Exp $ d3 1 a3 1 --- libdesk/tixImgXpm.c.orig 2004-04-13 21:32:20.000000000 -0500 d5 1 a5 1 @@@@ -63,8 +63,6 @@@@ d14 1 a14 1 @@@@ -156,7 +154,7 @@@@ typedef struct PixmapInstance { d23 1 a23 10 @@@@ -177,7 +175,7 @@@@ Tk_ImageType tixPixmapImageType = { ImgXpmFree, /* freeProc */ ImgXpmDelete, /* deleteProc */ (Tk_ImagePostscriptProc *) NULL, /* postscriptProc ?? */ - (struct Tk_ImageType *) NULL /* nextPtr */ + /* (struct Tk_ImageType *) NULL *//* nextPtr */ }; /* @@@@ -242,12 +240,12 @@@@ static int xpmTableInited = 0; d39 1 a39 1 @@@@ -257,6 +255,13 @@@@ ImgXpmCreate(interp, name, argc, argv, t d53 1 a53 1 @@@@ -270,10 +275,11 @@@@ ImgXpmCreate(interp, name, argc, argv, t @ 1.2 log @Update tkdesk to 2.0. This version has a problem as shown in PR pkg/25274, but 1.x didn't build at all since the recent blt update. perry@@ will work on fixing this packge. Changes: - Tcl/Tk 8.4 compatibility - Dropped support for Tcl/Tk 7.x - Mouse wheel support - diff support - Improved configure script - New TkDesk logo @ text @d1 1 a1 1 $NetBSD$ d5 10 a14 1 @@@@ -156,7 +156,7 @@@@ typedef struct PixmapInstance { d23 1 a23 1 @@@@ -177,7 +177,7 @@@@ Tk_ImageType tixPixmapImageType = { d32 1 a32 1 @@@@ -242,12 +242,12 @@@@ static int xpmTableInited = 0; d48 1 a48 1 @@@@ -257,6 +257,13 @@@@ ImgXpmCreate(interp, name, argc, argv, t d62 1 a62 1 @@@@ -270,10 +277,11 @@@@ ImgXpmCreate(interp, name, argc, argv, t @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- libdesk/tixImgXpm.c.orig Sun Nov 14 16:07:47 1999 +++ libdesk/tixImgXpm.c Sun Sep 2 22:41:43 2001 @@@@ -156,7 +156,7 @@@@ d14 1 a14 2 @@@@ -176,7 +176,7 @@@@ ImgXpmDisplay, /* displayProc */ d17 3 a19 2 - (Tk_ImageType *) NULL /* nextPtr */ + /* (Tk_ImageType *) NULL *//* nextPtr */ d23 1 a23 1 @@@@ -241,12 +241,12 @@@@ d39 1 a39 1 @@@@ -256,6 +256,13 @@@@ d53 1 a53 1 @@@@ -269,10 +276,11 @@@@ @ 1.1.1.1 log @import tkdesk-1.2. Submitted in PR pkg/17423 by Rui-Xiang Guo TkDesk is a graphical file manager for Unix and the X-Window System. It offers a very rich set of file operations and services, and provides the user with an immense amount of configurability. TkDesk's configuration flexibility results from the use of Tcl/Tk as the primary implementation language. Another benefit of using Tcl/Tk is that TkDesk is very portable and runs on virtually any Unix platform. @ text @@