Thu Jan 6 18:01:21 2011 UTC ()
add a patch from upstream to fix a bug which made that fontconfig
support could not be switched off once enabled
(could make a difference for gnuplot but I couldn't find a testcase yet)


(drochner)
diff -r1.85 -r1.86 pkgsrc/graphics/gd/Makefile
diff -r1.31 -r1.32 pkgsrc/graphics/gd/distinfo
diff -r1.8 -r1.9 pkgsrc/graphics/gd/patches/patch-ab
cvs diff -r1.85 -r1.86 pkgsrc/graphics/gd/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gd/Makefile 2010/12/23 11:44:37 1.85
+++ pkgsrc/graphics/gd/Makefile 2011/01/06 18:01:21 1.86
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.85 2010/12/23 11:44:37 dsainty Exp $ 1# $NetBSD: Makefile,v 1.86 2011/01/06 18:01:21 drochner Exp $
2 2
3DISTNAME= gd-2.0.35 3DISTNAME= gd-2.0.35
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://www.libgd.org/releases/ 6MASTER_SITES= http://www.libgd.org/releases/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10HOMEPAGE= http://www.libgd.org/ 10HOMEPAGE= http://www.libgd.org/
11COMMENT= Graphics library for the dynamic creation of images 11COMMENT= Graphics library for the dynamic creation of images
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15.include "options.mk" 15.include "options.mk"
16 16
17# fails in test not finding libgd.a 17# fails in test not finding libgd.a
cvs diff -r1.31 -r1.32 pkgsrc/graphics/gd/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gd/distinfo 2009/10/22 15:20:53 1.31
+++ pkgsrc/graphics/gd/distinfo 2011/01/06 18:01:21 1.32
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.31 2009/10/22 15:20:53 taca Exp $ 1$NetBSD: distinfo,v 1.32 2011/01/06 18:01:21 drochner Exp $
2 2
3SHA1 (gd-2.0.35.tar.bz2) = ccf34a610abff2dbf133a20c4d2a4aa94939018a 3SHA1 (gd-2.0.35.tar.bz2) = ccf34a610abff2dbf133a20c4d2a4aa94939018a
4RMD160 (gd-2.0.35.tar.bz2) = f452a2c333b2ba9b7b4c143983ec2af18a335516 4RMD160 (gd-2.0.35.tar.bz2) = f452a2c333b2ba9b7b4c143983ec2af18a335516
5Size (gd-2.0.35.tar.bz2) = 1212730 bytes 5Size (gd-2.0.35.tar.bz2) = 1212730 bytes
6SHA1 (patch-aa) = 726107579811ce1f33b00bd4dbf13040c48120bb 6SHA1 (patch-aa) = 726107579811ce1f33b00bd4dbf13040c48120bb
7SHA1 (patch-ab) = 082f5baa2c147fb62381c21ecb3ce11a1891a2aa 7SHA1 (patch-ab) = 70bfe427ae1ace5a17090dd158a64addb8d7b964
8SHA1 (patch-ac) = d166ed4d0a3510c610e8aa233d312e15d96f4667 8SHA1 (patch-ac) = d166ed4d0a3510c610e8aa233d312e15d96f4667
9SHA1 (patch-ad) = 27631984f613c4c1c6f57cea23c36ae7d48271ac 9SHA1 (patch-ad) = 27631984f613c4c1c6f57cea23c36ae7d48271ac
cvs diff -r1.8 -r1.9 pkgsrc/graphics/gd/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/gd/patches/Attic/patch-ab 2005/06/06 18:38:08 1.8
+++ pkgsrc/graphics/gd/patches/Attic/patch-ab 2011/01/06 18:01:21 1.9
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ab,v 1.8 2005/06/06 18:38:08 minskim Exp $ 1$NetBSD: patch-ab,v 1.9 2011/01/06 18:01:21 drochner Exp $
2 2
3--- gdft.c.orig 2004-11-02 15:00:48.000000000 -0600 3--- gdft.c.orig 2007-04-19 12:54:56.000000000 +0000
4+++ gdft.c 4+++ gdft.c
5@@ -25,6 +25,261 @@ 5@@ -25,6 +25,261 @@
6 #define R_OK 04 /* Needed in Windows */ 6 #define R_OK 04 /* Needed in Windows */
7 #endif 7 #endif
8  8
9+struct entities_s entities[] = { 9+struct entities_s entities[] = {
10+ {"AElig", 198}, 10+ {"AElig", 198},
11+ {"Aacute", 193}, 11+ {"Aacute", 193},
12+ {"Acirc", 194}, 12+ {"Acirc", 194},
13+ {"Agrave", 192}, 13+ {"Agrave", 192},
14+ {"Alpha", 913}, 14+ {"Alpha", 913},
15+ {"Aring", 197}, 15+ {"Aring", 197},
16+ {"Atilde", 195}, 16+ {"Atilde", 195},
@@ -254,13 +254,22 @@ $NetBSD: patch-ab,v 1.8 2005/06/06 18:38 @@ -254,13 +254,22 @@ $NetBSD: patch-ab,v 1.8 2005/06/06 18:38
254+ {"weierp", 8472}, 254+ {"weierp", 8472},
255+ {"xi", 958}, 255+ {"xi", 958},
256+ {"yacute", 253}, 256+ {"yacute", 253},
257+ {"yen", 165}, 257+ {"yen", 165},
258+ {"yuml", 255}, 258+ {"yuml", 255},
259+ {"zeta", 950}, 259+ {"zeta", 950},
260+ {"zwj", 8205}, 260+ {"zwj", 8205},
261+ {"zwnj", 8204}, 261+ {"zwnj", 8204},
262+}; 262+};
263+ 263+
264 /* number of antialised colors for indexed bitmaps */ 264 /* number of antialised colors for indexed bitmaps */
265 #define NUMCOLORS 8 265 #define NUMCOLORS 8
266  266
 267@@ -1659,7 +1914,7 @@ static char * font_path(char **fontpath,
 268 BGD_DECLARE(int) gdFTUseFontConfig(int flag)
 269 {
 270 #ifdef HAVE_LIBFONTCONFIG
 271- fontConfigFlag = 1;
 272+ fontConfigFlag = flag;
 273 return 1;
 274 #else
 275 return 0;