head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.122 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.120 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.118 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.116 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.114 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.112 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.110 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.108 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.106 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.104 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.102 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.100 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.98 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.96 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.94 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.92 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.90 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.88 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.86 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.84 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.82 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.80 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.78 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.74 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.54 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.76 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.72 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.70 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.68 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.66 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.64 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.62 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.60 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.58 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.56 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.52 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.50 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.48 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.46 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.44 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.42 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.40 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.38 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.36 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.34 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.32 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.30 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.28 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.26 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.24 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.22 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.20 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.18 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.16 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.14 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.12 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.10 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.8 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.6 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.4 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.2 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.3.0.22 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.20 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.18 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.16 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.14 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.12 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.10 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.8 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.6 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.4 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.2 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.2.0.28 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.26 pkgsrc-2008Q1:1.2.0.24 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.22 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.20 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.18 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.16 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.14 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2011.02.25.17.02.53; author wiz; state Exp; branches; next 1.3; 1.3 date 2008.09.10.13.32.47; author taca; state Exp; branches; next 1.2; 1.2 date 2005.04.07.23.11.57; author hira; state Exp; branches; next 1.1; 1.1 date 2004.01.12.15.19.28; author wennmach; state Exp; branches; next ; desc @@ 1.4 log @Convert to use imlib2, based on Debian patches. Set LICENSE. Bump PKGREVISION. @ text @$NetBSD: patch-ae,v 1.3 2008/09/10 13:32:47 taca Exp $ --- draw.c.orig 2008-01-24 15:43:17.000000000 +0000 +++ draw.c @@@@ -31,7 +31,7 @@@@ #include "mgp.h" #ifdef USE_IMLIB -#include +#include #endif /* state associated with the window - how should we treat this? */ @@@@ -83,8 +83,8 @@@@ static int obj_new_xfont __P((struct ren u_int, char *)); static int obj_new_image __P((struct render_state *, int, int, Image *, int, int)); #ifdef USE_IMLIB -ImlibImage *search_imdata __P((char *)); -static int obj_new_image2 __P((struct render_state *, int, int, Image *, int, int, ImlibImage *, int)); +Imlib_Image *search_imdata __P((char *)); +static int obj_new_image2 __P((struct render_state *, int, int, Image *, int, int, Imlib_Image *, int)); #endif static int obj_new_icon __P((struct render_state *, int, int, u_int, u_int, u_long, u_int, XPoint *)); static Pixel obj_image_color __P((Image *, Image *, Pixel, int *)); @@@@ -168,7 +168,7 @@@@ static void regist_zimage_position __P(( static void clear_zimage __P((int)); static void clear_region __P((int, int, int, int)); #define ZIMAGENUM 100 -static ImlibImage *zimage[ZIMAGENUM]; +static Imlib_Image *zimage[ZIMAGENUM]; static int zonzoom[ZIMAGENUM]; static int zpage[ZIMAGENUM]; static int zx[ZIMAGENUM]; @@@@ -1819,7 +1819,7 @@@@ obj_new_image2(state, x, y, image, xzoom int x, y; Image *image; int xzoom, yzoom; - ImlibImage *imimage; + Imlib_Image *imimage; int zoomonclk; { struct render_object *obj; @@@@ -3212,7 +3212,7 @@@@ image_load(state, filename, numcolor, xi static char backfile[MAXPATHLEN]; static int backzoom, backnumcolor, backx, backy; #ifdef USE_IMLIB - ImlibImage *imimage; + Imlib_Image *imimage; #endif if (!caching){ @@@@ -5243,7 +5243,7 @@@@ xft_draw_fragment(state, p, len, registr 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 @@@@ -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); @ 1.3 log @Update magicpoint to 1.13a. * Fix build error with xft2 option and graphics/freetype-lib package is installed. Shoud be fix PR pkg/32656. * Refering PR pkg/38552 adpot some of patches. * Move PKG_OPTIONS related item to options.mk. * More pkgsrc clean up. * Try to reduce compile warnings. What's new in 1.13a? * m17n library support enhancement * MacOS support enhancement * add new environment variable MGPRC for the path of the .mgprc file. * add "psfont" directive to specify the font used by mgp2ps * add -g option for mgp2ps to allow users to adjust line distanc * add -zoomonclk option for newimage * allow to handle gif format images by default * many bug fixes Dedication Magicpoint 1.13a is dedicated to the memory of Dr. Jun-ichiro "itojun" Hagino, who was known for his enormous contribution to the Internet and the Open Source Software community. He was the developer of Magicpoint from its infancy. Magicpoint could not exist without his devoted work. What's new in 1.12a? * add %tsystem directive which might be more stable than %xsystem * add -rotate option for newimage * allow to use non-ASCI filename in slides (use -U to enable this feature) * many bug fixes @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- draw.c.orig 2008-01-25 00:43:17.000000000 +0900 d5 47 @ 1.2 log @ Use size_t for the third and fifth arguments of the iconv(3). Fix core dump on amd64. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2004/01/12 15:19:28 wennmach Exp $ d3 3 a5 9 --- 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"}; d14 15 a28 11 @@@@ -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; } @ 1.1 log @Apply several bugfixes: 1. fix ifdef symbol in parse.c XFT2 -> USE_XFT2 2. fix codeset names for iconv_open(3) in draw.c Two codeset names of `UTF8' and `iso2022jp' don't work on NetBSD. 3. fix comparison bug in draw.c A integer value should not be compared with a iconv_t variable directly. 4. fix PR pkg/24030 Fixes provided by Kouichirou Hiratsuka in PR pkg/24053. Closes PR pkg/24053 and PR pkg/24030. @ text @d1 1 a1 1 $NetBSD$ d4 2 a5 2 +++ draw.c 2003-11-25 08:03:15.000000000 +0900 @@@@ -4498,7 +4498,7 @@@@ d14 6 @