pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/38552: update graphics/magicpoint to 1.13a, fix 64bit bugs
>Number: 38552
>Category: pkg
>Synopsis: update graphics/magicpoint to 1.13a
>Confidential: yes
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Apr 30 16:30:00 +0000 2008
>Originator: Eric Schnoebelen
>Release: NetBSD 4.99.60
>Organization:
Eric Schnoebelen eschnoebelen%efjohnson.com@localhost
eric%cirr.com@localhost
>Environment:
System: NetBSD duke 4.99.60 NetBSD 4.99.60 (GENERIC) #2: Fri Apr 18 02:46:47
CDT 2008
eric@duke:/home/eric/work/eric/NetBSD-current/obj/amd64/sys/arch/amd64/compile/GENERIC
amd64
Architecture: x86_64
Machine: amd64
>Description:
magicpoint is down-rev at 1.10a, and doesn't work on 64bit
systems (suchs as amd64.)
The attached patch updates to 1.13a, and includes patches to
allow magic point to run on amd64 systems (running a 64 bit
kernel/userland.)
>How-To-Repeat:
build on amd64;
try to use labelled tabs;
# see error message about invalid tab index?
try to use any fonts from xft2;
# watch mgp dump core!
>Fix:
diff -Nrbuw graphics/magicpoint/Makefile graphics/magicpoint.egs/Makefile
--- graphics/magicpoint/Makefile 2007-12-08 09:38:38.000000000 -0600
+++ graphics/magicpoint.egs/Makefile 2008-04-28 21:24:21.000000000 -0500
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.60 2007/12/02 00:06:13 wiz Exp $
-DISTNAME= magicpoint-1.10a
-PKGREVISION= 11
-#DISTNAME= magicpoint-1.11b.tar.gz
+# DISTNAME= magicpoint-1.10a
+# PKGREVISION= 11
+DISTNAME= magicpoint-1.13a
CATEGORIES= x11 graphics
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
@@ -26,6 +26,7 @@
CONFIGURE_ARGS+= --enable-freetype-charset16
CONFIGURE_ARGS+= --enable-locale
CONFIGURE_ARGS+= --enable-gif
+CONFIGURE_ARGS+= --enable-debug
CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
CONFIGURE_ENV+= mgp_cv_path_perl=${TOOLS_PERL5:Q}
@@ -77,6 +78,7 @@
.if !empty(PKG_OPTIONS:Mxft2)
.include "../../graphics/freetype2/buildlink3.mk"
.endif
+.include "../../graphics/imlib/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
.include "../../graphics/netpbm/buildlink3.mk"
diff -Nrbuw graphics/magicpoint/PLIST graphics/magicpoint.egs/PLIST
--- graphics/magicpoint/PLIST 2003-03-02 13:47:23.000000000 -0600
+++ graphics/magicpoint.egs/PLIST 2008-04-27 19:07:45.000000000 -0500
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/02 19:47:23 jschauma Exp $
+@comment $NetBSD$
bin/mgp
bin/mgp2ps
bin/mgpembed
@@ -33,6 +33,7 @@
share/examples/mgp/embed.mgp
share/examples/mgp/gradation-jp.mgp
share/examples/mgp/gradation.mgp
+share/examples/mgp/m17n-lib.mgp
share/examples/mgp/mgp-old1.jpg
share/examples/mgp/mgp-old2.jpg
share/examples/mgp/mgp-old3.jpg
@@ -43,6 +44,7 @@
share/examples/mgp/mgprc-sample
share/examples/mgp/multilingual.mgp
share/examples/mgp/sample-fr.mgp
+share/examples/mgp/sample-jp-xft.mgp
share/examples/mgp/sample-jp.mgp
share/examples/mgp/sample.mgp
share/examples/mgp/sendmail6-jp.mgp
diff -Nrbuw graphics/magicpoint/distinfo graphics/magicpoint.egs/distinfo
--- graphics/magicpoint/distinfo 2006-02-23 14:49:49.000000000 -0600
+++ graphics/magicpoint.egs/distinfo 2008-04-30 10:01:06.000000000 -0500
@@ -1,18 +1,15 @@
$NetBSD: distinfo,v 1.15 2006/02/23 20:49:49 joerg Exp $
-SHA1 (magicpoint-1.10a.tar.gz) = 7510ee965316cb52eac7a430f0e19a87a337fe5c
-RMD160 (magicpoint-1.10a.tar.gz) = 167bf8b57bd4bb98c8f4fdba82a5733dda1f8a6a
-Size (magicpoint-1.10a.tar.gz) = 843657 bytes
-SHA1 (patch-aa) = f4d97279e878a58900ceff5ea07c61ca678e61f5
-SHA1 (patch-ab) = 0553e8369f3337e53ecd8a8926ceeed9757953b8
-SHA1 (patch-ac) = 1b2de41c2a8da28c9023552eff676c40069630fe
-SHA1 (patch-ad) = d6dd11bee4091de4f1c8d5fffa61987d16a063e1
-SHA1 (patch-ae) = c293c8f9c406fe8f090378b328b6bdbe89050eee
-SHA1 (patch-af) = b52455c3018d5de4ee7d20c42680df8978f15b55
-SHA1 (patch-ag) = 02e53e3e498b150d528349c9712978f164e8836f
+SHA1 (magicpoint-1.13a.tar.gz) = 2bc662ad0a482d42578766258a143b06a4718ae3
+RMD160 (magicpoint-1.13a.tar.gz) = 067d7dee3b90ec354975d9ad4ea0c0df48cca191
+Size (magicpoint-1.13a.tar.gz) = 890670 bytes
+SHA1 (patch-ab) = 6a5cbc7e9b0bad32c2cb888e4f552ee8a497bbcc
+SHA1 (patch-ac) = c13cae0b83964fd7d3cb76208b844e2bc660c8e1
+SHA1 (patch-ad) = 0ab6e41e2753bbee705921145a3a5da937f67198
SHA1 (patch-ah) = 2cd87d9697be2ebd9d7c0a936d49583286de62d3
SHA1 (patch-ai) = 809b2cf509bab0ee1bed1fecb2cf2d8df912ce8b
SHA1 (patch-aj) = 07ed5e995bf35dcbe65fc7c0ab800d1b8905e004
-SHA1 (patch-ak) = bb1364f9fec905e09eb7453a4bc0a8cab557b3b3
SHA1 (patch-al) = a0956fc353d38f937d3829fa0e6cd70c9cb60faa
SHA1 (patch-am) = ba255a9e749f627d777cebbd29521b8c368d69dc
+SHA1 (patch-bc) = 7e883142582bc616326db14c7a8f6ffc58943279
+SHA1 (patch-bd) = b36fca606f08fd4ce4c5fa0dbb0f8325784fcdd6
diff -Nrbuw graphics/magicpoint/patches/patch-aa
graphics/magicpoint.egs/patches/patch-aa
--- graphics/magicpoint/patches/patch-aa 2004-01-12 09:19:28.000000000
-0600
+++ graphics/magicpoint.egs/patches/patch-aa 1969-12-31 18:00:00.000000000
-0600
@@ -1,121 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2004/01/12 15:19:28 wennmach Exp $
-
---- configure.orig 2003-05-28 14:34:23.000000000 +0900
-+++ configure 2004-01-11 04:18:35.000000000 +0900
-@@ -4108,7 +4108,7 @@
- # XXX: freetype2 may use freetype-config
- echo "$as_me:$LINENO: checking for freetype1 library/header" >&5
- echo $ECHO_N "checking for freetype1 library/header... $ECHO_C" >&6
-- for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr
/usr/include/freetype1 ; do
-+ for dir in ${BUILDLINK_DIR}; do
- ac_cv_ft_lib=no
- ac_cv_ft_include=no
- shlib1=`echo $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'`
-@@ -4379,15 +4379,13 @@
- echo "$as_me:$LINENO: result: $mgp_use_xft2" >&5
- echo "${ECHO_T}$mgp_use_xft2" >&6
- if test "$mgp_use_xft2" = "yes"; then
-- if type pkg-config > /dev/null 2>&1; then
-- if pkg-config xft; then
-- OPTFLAGS="`pkg-config --cflags xft` $OPTFLAGS"
-- LIBS="$LIBS `pkg-config --libs xft`"
-- cat >>confdefs.h <<\_ACEOF
-+ if type pkg-config > /dev/null 2>&1 && pkg-config xft; then
-+ OPTFLAGS="`pkg-config --cflags xft` $OPTFLAGS"
-+ LIBS="$LIBS `pkg-config --libs xft`"
-+ cat >>confdefs.h <<\_ACEOF
- #define USE_XFT2 1
- _ACEOF
-
-- fi
- else
- echo "$as_me:$LINENO: checking for xft2 and ft2 and fc header.." >&5
- echo $ECHO_N "checking for xft2 and ft2 and fc header..... $ECHO_C" >&6
-@@ -4643,7 +4641,7 @@
- if test "$mgp_use_vflib" = "yes"; then
- echo "$as_me:$LINENO: checking for VFlib library/header" >&5
- echo $ECHO_N "checking for VFlib library/header... $ECHO_C" >&6
-- for dir in /usr/local/VFlib /usr/local/vflib /usr/local /usr/pkg /usr;
do
-+ for dir in ${BUILDLINK_DIR}; do
- ac_cv_vf_libname=VFlib
- ac_cv_vf_libdir=no
- ac_cv_vf_hdrdir=no
-@@ -4815,6 +4813,7 @@
- /usr/local/lib /usr/local/etc /etc \
- /usr/local/libdata/vflib /usr/local/share/VFlib \
- /usr/local/share/VFlib/* \
-+ ${prefix}/share/VFlib/* \
- ../../VFlib* ../VFlib* VFlib*; do
- if test -d $ac_dir -a -f $ac_dir/vfontcap; then
- ac_cv_vf_fontcap=$ac_dir/vfontcap;
-@@ -4857,17 +4856,15 @@
- fi
- fi
-
--if type pkg-config > /dev/null 2>&1; then
-- if pkg-config libpng; then
-- LIBS="$LIBS `pkg-config --libs libpng`"
-- OPTFLAGS="$OPTFLAGS `pkg-config --cflags libpng`"
-- cat >>confdefs.h <<\_ACEOF
-+if type pkg-config > /dev/null 2>&1 && pkg-config libpng; then
-+ LIBS="$LIBS `pkg-config --libs libpng`"
-+ OPTFLAGS="$OPTFLAGS `pkg-config --cflags libpng`"
-+ cat >>confdefs.h <<\_ACEOF
- #define USE_PNG 1
- _ACEOF
-
-- fi
- else
-- for i in /usr/pkg /usr/local /usr; do
-+ for i in ${BUILDLINK_DIR}; do
- if test -f $i/include/png.h; then
- if test -f $i/lib/libpng.a ; then
- DEPLIBS="$DEPLIBS $i/lib/libpng.a"
-@@ -5010,7 +5007,7 @@
- done
- fi
-
--for i in /usr/pkg /usr/local /usr; do
-+for i in ${BUILDLINK_DIR}; do
- if test -f $i/include/libmng.h; then
- if test -f $i/lib/libmng.a ; then
- DEPLIBS="$DEPLIBS $i/lib/libmng.a"
-@@ -5647,7 +5644,7 @@
- echo 'FATAL: You need libungif to use gif images. pass proper
LIBS to configure.'
- exit 1
- fi
-- for i in /usr/pkg /usr/local /usr; do
-+ for i in ${BUILDLINK_DIR}; do
- if test -f $i/include/gif_lib.h; then
- gif_h_ok=yes
- OPTFLAGS="$OPTFLAGS -I$i/include"
-@@ -5677,16 +5674,14 @@
- echo "$as_me:$LINENO: result: $mgp_imlib" >&5
- echo "${ECHO_T}$mgp_imlib" >&6
- if test $mgp_imlib = "yes"; then
-- if type pkg-config > /dev/null 2>&1; then
-- if pkg-config imlib; then
-- LIBS="$LIBS `pkg-config --libs imlib`"
-- OPTFLAGS="$OPTFLAGS `pkg-config --cflags imlib`"
-- cat >>confdefs.h <<\_ACEOF
-+ if type pkg-config > /dev/null 2>&1 && pkg-config imlib; then
-+ LIBS="$LIBS `pkg-config --libs imlib`"
-+ OPTFLAGS="$OPTFLAGS `pkg-config --cflags imlib`"
-+ cat >>confdefs.h <<\_ACEOF
- #define USE_IMLIB 1
- _ACEOF
-
- USE_IMLIB=1
-- fi
- else
- echo "$as_me:$LINENO: checking for Imlib_init in -lImlib" >&5
- echo $ECHO_N "checking for Imlib_init in -lImlib... $ECHO_C" >&6
-@@ -5757,7 +5752,7 @@
- echo 'FATAL: You need libImlib to use Imlib loading. pass
proper LIBS to configure.'
- exit 1
- fi
-- for i in /usr/pkg /usr/local; do
-+ for i in ${BUILDLINK_DIR}; do
- if test -f $i/include/Imlib.h; then
- imlib_h_ok=yes
- OPTFLAGS="$OPTFLAGS -I$i/include"
diff -Nrbuw graphics/magicpoint/patches/patch-ab
graphics/magicpoint.egs/patches/patch-ab
--- graphics/magicpoint/patches/patch-ab 2004-04-27 10:42:58.000000000
-0500
+++ graphics/magicpoint.egs/patches/patch-ab 2008-04-27 21:47:00.000000000
-0500
@@ -1,12 +1,17 @@
-$NetBSD: patch-ab,v 1.3 2004/04/27 15:42:58 adam Exp $
+$NetBSD$
---- mgp.h.orig 2004-04-27 17:39:53.000000000 +0000
+--- mgp.h.orig 2008-01-18 11:43:20.000000000 -0600
+++ mgp.h
-@@ -62,6 +62,7 @@
- #include <X11/cursorfont.h>
- #include <X11/Xatom.h>
- #ifdef USE_XFT2
-+#include <ft2build.h>
- #include <freetype/freetype.h>
- #include <fontconfig/fontconfig.h>
- #include <X11/Xft/Xft.h>
+@@ -308,6 +308,12 @@ struct ctrl_pcache {
+ struct ctrl {
+ u_char ct_op;
+ u_char ct_flag;
++ enum {
++ CTRL_DOUBLE, CTRL_INT, CTRL_INT2, CTRL_INT3,
++ CTRL_LONG, CTRL_CHAR, CTRL_CHAR2, CTRL_IMAGE,
++ CTRL_GRAD, CTRL_BAR, CTRL_ARGS, CTRL_ICON,
++ CTRL_AREA, CTRL_PCACHE, CTRL_VOID
++ } ct_type;
+ u_int ct_page;
+ struct ctrl *ct_next;
+ union {
diff -Nrbuw graphics/magicpoint/patches/patch-ac
graphics/magicpoint.egs/patches/patch-ac
--- graphics/magicpoint/patches/patch-ac 2003-09-11 11:09:41.000000000
-0500
+++ graphics/magicpoint.egs/patches/patch-ac 2008-04-30 10:00:56.000000000
-0500
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2003/09/11 16:09:41 jmmv Exp $
+$NetBSD$
---- Imakefile.in.orig 2001-02-03 19:46:49.000000000 +0100
+--- Imakefile.in.orig 2007-12-03 03:08:40.000000000 -0600
+++ Imakefile.in
@@ -22,8 +22,9 @@ LEX= @LEX@
- OPTFLAGS= @OPTFLAGS@
+ OPTFLAGS= @OPTFLAGS@ ${CPPFLAGS}
DEFS= @DEFS@ -DMGPLIBDIR=\"$(LIBDIR)/mgp\"
#DEFS+= -DGLYPHEDGE
+DEPENDFLAGS= $(DEFS) $(OPTFLAGS)
diff -Nrbuw graphics/magicpoint/patches/patch-ad
graphics/magicpoint.egs/patches/patch-ad
--- graphics/magicpoint/patches/patch-ad 2004-01-12 09:19:28.000000000
-0600
+++ graphics/magicpoint.egs/patches/patch-ad 2008-04-27 22:52:41.000000000
-0500
@@ -1,13 +1,26 @@
-$NetBSD: patch-ad,v 1.1 2004/01/12 15:19:28 wennmach Exp $
+$NetBSD$
---- parse.c.orig 2003-11-24 21:49:38.000000000 +0900
-+++ parse.c 2003-11-24 21:50:13.000000000 +0900
-@@ -848,7 +848,7 @@
- tmpint[2]->cti_value = DEFAULT_VGAP;
- tmpint[3] = ctlalloc1(CTL_QUALITY);
- tmpint[3]->cti_value = DEFAULT_BQUALITY;
--#ifdef XFT2
-+#ifdef USE_XFT2
- tmpint[4] = ctlalloc1(CTL_OPAQUE);
- tmpint[4]->cti_value = DEFAULT_OPAQUE;
- #endif
+--- parse.c.orig 2007-11-24 11:35:28.000000000 -0600
++++ parse.c
+@@ -470,13 +470,14 @@ read_file(fp, filename, page, line, prea
+ case CTL_TAB:
+ {
+ int i = root->cti_value;
+- if (i < 0) {
+- fprintf(stderr, "%s:%d: "
+- "invalid tab index %d\n",
+- filename, lineno, root->cti_value);
+- exit(-1);
+- }
+- if (i >= MAXTAB) { /*XXX*/
++ if (root->ct_type == CTRL_INT) {
++ if (i < 0 || i >= MAXTAB ) {
++ fprintf(stderr, "%s:%d: "
++ "invalid tab index %d\n",
++ filename, lineno, root->cti_value);
++ exit(-1);
++ }
++ } else {
+ /* must be a string */
+ /* find a free entry */
+ for (i = MAXTAB ; i < MAXTAB + MAXSTYLE ; i++) {
diff -Nrbuw graphics/magicpoint/patches/patch-ae
graphics/magicpoint.egs/patches/patch-ae
--- graphics/magicpoint/patches/patch-ae 2005-04-07 18:11:57.000000000
-0500
+++ graphics/magicpoint.egs/patches/patch-ae 1969-12-31 18:00:00.000000000
-0600
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/04/07 23:11:57 hira Exp $
-
---- draw.c.orig 2003-05-14 16:45:35.000000000 +0900
-+++ draw.c 2005-04-08 07:31:28.000000000 +0900
-@@ -4498,12 +4498,12 @@
- struct ctrl *cp;
- char *fontname = NULL;
- int i;
-- static char etab[3][20] = { "iso2022jp", "gb2312", "ksc5601"};
-+ static char etab[3][20] = { "iso-2022-jp", "gb2312", "ksc5601"};
- static char rtab[3][20] = { "jisx208", "gb2312", "ksc5601"};
- static char prefix[3][20] = { "\033$B", "\033$A", "\033$(C"};
- char buf16[1024], *p16;
- char out16[1024], *o16;
-- int ileft, oleft;
-+ size_t ileft, oleft;
- #ifdef HAVE_ICONV
- static iconv_t icv[3];
- #endif
-@@ -4529,8 +4529,8 @@
- }
- if (i == 3) return NULL; /* cannot find codeset */
- sprintf(buf16, "%s%s\0", prefix[i], p);
-- if (!icv[i]) icv[i] = iconv_open("UTF8", etab[i]);
-- if (icv[i] < 0){
-+ if (icv[i] == (iconv_t)0) icv[i] = iconv_open("UTF-8", etab[i]);
-+ if (icv[i] == (iconv_t)-1){
- fprintf(stderr, "your iconv doesn't support %s\n",
etab[i]);
- return NULL;
- }
diff -Nrbuw graphics/magicpoint/patches/patch-af
graphics/magicpoint.egs/patches/patch-af
--- graphics/magicpoint/patches/patch-af 2004-05-24 20:30:22.000000000
-0500
+++ graphics/magicpoint.egs/patches/patch-af 1969-12-31 18:00:00.000000000
-0600
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/05/25 01:30:22 danw Exp $
-
---- image/image.h.orig Mon May 24 21:09:56 2004
-+++ image/image.h
-@@ -182,6 +182,8 @@ unsigned long doMemToValLSB();
- unsigned long doValToMemLSB();
- void flipBits();
-
-+#define zopen mgp_zopen
-+
- ZFILE *zopen();
- int zread();
- void zreset();
diff -Nrbuw graphics/magicpoint/patches/patch-ag
graphics/magicpoint.egs/patches/patch-ag
--- graphics/magicpoint/patches/patch-ag 2004-05-24 20:30:22.000000000
-0500
+++ graphics/magicpoint.egs/patches/patch-ag 1969-12-31 18:00:00.000000000
-0600
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/05/25 01:30:22 danw Exp $
-
---- image/new.c.orig Mon Dec 28 03:23:13 1998
-+++ image/new.c
-@@ -11,7 +11,7 @@
- #include "copyright.h"
- #include "image.h"
-
--#include <malloc.h>
-+#include <stdlib.h>
-
- extern int _Xdebug;
- extern void memoryExhausted(void);
diff -Nrbuw graphics/magicpoint/patches/patch-ak
graphics/magicpoint.egs/patches/patch-ak
--- graphics/magicpoint/patches/patch-ak 2006-02-23 14:49:49.000000000
-0600
+++ graphics/magicpoint.egs/patches/patch-ak 1969-12-31 18:00:00.000000000
-0600
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/02/23 20:49:49 joerg Exp $
-
---- mng.c.orig 2006-02-23 20:22:29.000000000 +0000
-+++ mng.c
-@@ -43,6 +43,8 @@ typedef struct {
- mng_uint32 delay; /* ticks to wait before resuming decode */
- } mngstuff;
-
-+void mng_window_setup(mngstuff *, int, int, int, int);
-+
- /* callbacks for the mng decoder */
-
- /* memory allocation; data must be zeroed */
diff -Nrbuw graphics/magicpoint/patches/patch-bc
graphics/magicpoint.egs/patches/patch-bc
--- graphics/magicpoint/patches/patch-bc 1969-12-31 18:00:00.000000000
-0600
+++ graphics/magicpoint.egs/patches/patch-bc 2008-04-27 21:55:45.000000000
-0500
@@ -0,0 +1,158 @@
+$NetBSD$
+
+--- grammar.y.orig 2008-01-18 11:43:20.000000000 -0600
++++ grammar.y
+@@ -130,6 +130,7 @@ gen_void(op)
+ yyerror("cannot allocate void node");
+ return ct;
+ }
++ ct->ct_type = CTRL_VOID;
+ return ct;
+ }
+
+@@ -145,6 +146,7 @@ gen_double_int(op, v)
+ return ct;
+ }
+ ct->ctf_value = (double)v;
++ ct->ct_type = CTRL_DOUBLE;
+ return ct;
+ }
+
+@@ -160,6 +162,7 @@ gen_double(op, v)
+ return ct;
+ }
+ ct->ctf_value = v;
++ ct->ct_type = CTRL_DOUBLE;
+ return ct;
+ }
+
+@@ -175,6 +178,7 @@ gen_int(op, v)
+ return ct;
+ }
+ ct->cti_value = v;
++ ct->ct_type = CTRL_INT;
+ return ct;
+ }
+
+@@ -192,6 +196,7 @@ gen_int2(op, v1, v2)
+ }
+ ct->cti2_value1 = v1;
+ ct->cti2_value2 = v2;
++ ct->ct_type = CTRL_INT2;
+ return ct;
+ }
+
+@@ -210,7 +215,8 @@ gen_int3(op, v1, v2, v3)
+ }
+ ct->cti3_value1 = v1;
+ ct->cti3_value2 = v2;
+- ct->cti3_value3 = v3;
++ ct->cti3_value3 = v3;
++ ct->ct_type = CTRL_INT3;
+ return ct;
+ }
+
+@@ -226,6 +232,7 @@ gen_str(op, str)
+ return ct;
+ }
+ ct->ctc_value = strdup(str);
++ ct->ct_type = CTRL_CHAR;
+ return ct;
+ }
+
+@@ -243,6 +250,7 @@ gen_str2(op, str1, str2)
+ }
+ ct->ctc2_value1 = strdup(str1);
+ ct->ctc2_value2 = strdup(str2);
++ ct->ct_type = CTRL_CHAR2;
+ return ct;
+ }
+
+@@ -259,6 +267,7 @@ gen_color(op, color)
+ }
+ if (get_color(color, &ct->ctl_value) < 0)
+ yyerror("cannot allocate color \"%s\"", color);
++ ct->ct_type = CTRL_LONG;
+ return ct;
+ }
+
+@@ -284,6 +293,7 @@ gen_bgrad(w, h, colors, dir, zoomflg, ex
+ ct->ctd_numcolor = colors;
+ ct->ctd_dir = dir;
+ ct->ctd_zoomflag = zoomflg;
++ ct->ct_type = CTRL_GRAD;
+
+ /* process color list. */
+ siz = ct->ctd_g_colors = 0;
+@@ -353,6 +363,7 @@ gen_newimage(arg)
+ }
+
+ /* default setting */
++ ct->ct_type = CTRL_IMAGE;
+ ct->ctm_ximagesize = 100;
+ ct->ctm_yimagesize = 100;
+ ct->ctm_zoomflag = Z_NORMAL | (Z_NORMAL << Z_YSHIFT);
+@@ -463,6 +474,7 @@ gen_image(op, fname, colors, xsiz, ysiz,
+ yyerror("cannot allocate node (op=IMAGE)");
+ return ct;
+ }
++ ct->ct_type = CTRL_IMAGE;
+ ct->ctm_fname = embed_fname(fname);
+ ct->ctm_numcolor = colors;
+ ct->ctm_ximagesize = xsiz;
+@@ -511,6 +523,7 @@ gen_bar(color, thick, start, len)
+ }
+ if (get_color(color, &ct->ctb_color) < 0)
+ yyerror("cannot allocate color %s", color);
++ ct->ct_type = CTRL_BAR;
+ ct->ctb_width = thick;
+ ct->ctb_start = start;
+ ct->ctb_length = len;
+@@ -542,6 +555,7 @@ gen_icon(n, color, siz)
+ yyerror("cannot allocate node (op=ICON)");
+ return ct;
+ }
++ ct->ct_type = CTRL_ICON;
+ ct->ctic_value = n;
+ if (get_color(color, &ct->ctic_color) < 0)
+ yyerror("cannot allocate color %s", color);
+@@ -562,6 +576,7 @@ gen_pcache(flag, mode, effect, value)
+ yyerror("cannot allocate node (op=PCACHE)");
+ return ct;
+ }
++ ct->ct_type = CTRL_PCACHE;
+ ct->ctch_flag = flag;
+ ct->ctch_mode = mode;
+ ct->ctch_effect = effect;
+@@ -580,6 +595,7 @@ gen_valign(align)
+ yyerror("cannot allocate node (op=VALIGN)");
+ return ct;
+ }
++ ct->ct_type = CTRL_INT;
+ if (!strcmp(align, "center"))
+ ct->cti_value = VL_CENTER;
+ else {
+@@ -629,6 +645,7 @@ gen_area(width, height, xoff, yoff)
+ ct->ctar_height = height;
+ ct->ctar_xoff = xoff;
+ ct->ctar_yoff = yoff;
++ ct->ct_type = CTRL_AREA;
+ return ct;
+ }
+
+@@ -663,6 +680,7 @@ gen_argsfromnid(op, nid)
+ siz++;
+ }
+ ct->cta_argv[siz] = NULL;
++ ct->ct_type = CTRL_ARGS;
+
+ if (nid)
+ ctlfree(nid);
+@@ -712,6 +730,7 @@ gen_argsfromstr(op, str, flag)
+ }
+ }
+ ct->cta_argv[ct->cta_argc] = NULL;
++ ct->ct_type = CTRL_ARGS;
+
+ return ct;
+ }
diff -Nrbuw graphics/magicpoint/patches/patch-bd
graphics/magicpoint.egs/patches/patch-bd
--- graphics/magicpoint/patches/patch-bd 1969-12-31 18:00:00.000000000
-0600
+++ graphics/magicpoint.egs/patches/patch-bd 2008-04-28 22:59:05.000000000
-0500
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- draw.c.orig 2008-01-24 09:43:17.000000000 -0600
++++ draw.c
+@@ -5471,12 +5471,12 @@ xft_setfont(xfontarg, csize, registry)
+ XFT_FAMILY, XftTypeString, font,
+ XFT_ENCODING, XftTypeString, registry,
+ XFT_STYLE, XftTypeString, style,
+- XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
++ XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL);
+ } else {
+ xftfont = XftFontOpen(display, screen,
+ XFT_FAMILY, XftTypeString, font,
+ XFT_ENCODING, XftTypeString, registry,
+- XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
++ XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL);
+ }
+ if (xftfont == 0) {
+ free(xfont);
Home |
Main Index |
Thread Index |
Old Index