diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-22 01:22:48 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-22 01:22:48 +0000 |
commit | 2d797f8874641cb61d643a03bb396e432cdeee3a (patch) | |
tree | 036ff20e1a8306048ab7c98789d072b3c10caa17 /x11-fonts/fontconfig | |
parent | * Update to 0.13.94 (diff) |
Update to 2.2.0, the fontastic-everything-finally-works release.
Notes
Notes:
svn path=/head/; revision=79430
Diffstat (limited to 'x11-fonts/fontconfig')
-rw-r--r-- | x11-fonts/fontconfig/Makefile | 3 | ||||
-rw-r--r-- | x11-fonts/fontconfig/distinfo | 2 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/patch-src_fccfg.c | 22 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/patch-src_fcfreetype.c | 46 |
4 files changed, 2 insertions, 71 deletions
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index b717bf2445b4..4fce4aee2478 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -6,8 +6,7 @@ # PORTNAME= fontconfig -PORTVERSION= 2.1.94 -PORTREVISION= 1 +PORTVERSION= 2.2.0 CATEGORIES= x11-fonts MASTER_SITES= http://www.fontconfig.org/release/ \ http://nexp.cs.pdx.edu/fontconfig/release/ diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo index 508b2ff145ba..3620d318965e 100644 --- a/x11-fonts/fontconfig/distinfo +++ b/x11-fonts/fontconfig/distinfo @@ -1 +1 @@ -MD5 (fontconfig-2.1.94.tar.gz) = f8941aa333e418aa99a6fa4813f333d3 +MD5 (fontconfig-2.2.0.tar.gz) = cf0ce6c87e5d6362e9ebc8d94a45fdc4 diff --git a/x11-fonts/fontconfig/files/patch-src_fccfg.c b/x11-fonts/fontconfig/files/patch-src_fccfg.c deleted file mode 100644 index 27defad82071..000000000000 --- a/x11-fonts/fontconfig/files/patch-src_fccfg.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/fccfg.c.orig Mon Mar 31 15:11:28 2003 -+++ src/fccfg.c Mon Mar 31 15:12:06 2003 -@@ -1265,8 +1265,8 @@ - return FcConfigSubstituteWithPat (config, p, 0, kind); - } - --#ifndef FONTCONFIG_PATH --#define FONTCONFIG_PATH "/etc/fonts" -+#ifndef CONFDIR -+#define CONFDIR "/etc/fonts" - #endif - - #ifndef FONTCONFIG_FILE -@@ -1343,7 +1343,7 @@ - } - } - -- dir = (FcChar8 *) FONTCONFIG_PATH; -+ dir = (FcChar8 *) CONFDIR; - path[i] = malloc (strlen ((char *) dir) + 1); - if (!path[i]) - goto bail1; diff --git a/x11-fonts/fontconfig/files/patch-src_fcfreetype.c b/x11-fonts/fontconfig/files/patch-src_fcfreetype.c deleted file mode 100644 index e28b4f4dc0fc..000000000000 --- a/x11-fonts/fontconfig/files/patch-src_fcfreetype.c +++ /dev/null @@ -1,46 +0,0 @@ ---- src/fcfreetype.c 2003/04/16 18:08:47 1.23 -+++ src/fcfreetype.c 2003/04/18 15:56:05 1.25 -@@ -55,9 +55,15 @@ - #include <freetype/ttnameid.h> - #include <freetype/t1tables.h> - --#if (FREETYPE_MINOR > 1 || (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 3)) -+#if (FREETYPE_MINOR > 1 || (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 4)) - #include <freetype/ftbdf.h> -+#include <freetype/ftmodule.h> - #define USE_FTBDF -+#define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \ -+ (f)->driver->root.clazz->get_interface) -+#define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \ -+ FT_Get_BDF_Property(f,n,p) : \ -+ FT_Err_Invalid_Argument) - #endif - - -@@ -781,7 +787,7 @@ - { - int rc; - BDF_PropertyRec prop; -- rc = FT_Get_BDF_Property(face, "FOUNDRY", &prop); -+ rc = MY_Get_BDF_Property(face, "FOUNDRY", &prop); - if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_ATOM) - foundry = prop.u.atom; - } -@@ -789,7 +795,7 @@ - if (width == -1) - { - BDF_PropertyRec prop; -- if (FT_Get_BDF_Property(face, "RELATIVE_SETWIDTH", &prop) == 0 && -+ if (MY_Get_BDF_Property(face, "RELATIVE_SETWIDTH", &prop) == 0 && - (prop.type == BDF_PROPERTY_TYPE_INTEGER || - prop.type == BDF_PROPERTY_TYPE_CARDINAL)) - { -@@ -811,7 +817,7 @@ - case 9: width = FC_WIDTH_ULTRAEXPANDED; break; - } - } -- else if (FT_Get_BDF_Property (face, "SETWIDTH_NAME", &prop) == 0 && -+ else if (MY_Get_BDF_Property (face, "SETWIDTH_NAME", &prop) == 0 && - prop.type == BDF_PROPERTY_TYPE_ATOM) - { - static struct { |