diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
commit | 6f32add9a75efb180e462ffbdb0b080bc88088e3 (patch) | |
tree | 0fc7af36e22fc0dc7c1dc8aacabf6fe117e881da /x11-fonts/fontconfig/files/patch-fc-git | |
parent | - Add USE_XORG= x11 (diff) |
The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for
FreeBSD. The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ . On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media. Work
is also underway to tie webkit more closely into GNOME. As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.
This release would not have been possible without the contributions and
testing efforts of the following people:
Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon
Diffstat (limited to 'x11-fonts/fontconfig/files/patch-fc-git')
-rw-r--r-- | x11-fonts/fontconfig/files/patch-fc-git | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/x11-fonts/fontconfig/files/patch-fc-git b/x11-fonts/fontconfig/files/patch-fc-git deleted file mode 100644 index d0be05b24e8a..000000000000 --- a/x11-fonts/fontconfig/files/patch-fc-git +++ /dev/null @@ -1,80 +0,0 @@ ---- src/fcfreetype.c.orig Sat Apr 14 01:46:21 2007 -+++ src/fcfreetype.c Sat Apr 14 01:48:33 2007 -@@ -2413,6 +2413,19 @@ FcGlyphNameToUcs4 (FcChar8 *name) - } - - /* -+* Work around a bug in some FreeType versions which fail -+* to correctly bounds check glyph name buffers and overwrite -+* the stack. As Postscript names have a limit of 127 characters, -+* this should be sufficient. -+*/ -+ -+#if FC_GLYPHNAME_MAXLEN < 127 -+# define FC_GLYPHNAME_BUFLEN 127 -+#else -+# define FC_GLYPHNAME_BUFLEN FC_GLYPHNAME_MAXLEN -+#endif -+ -+/* - * Search through a font for a glyph by name. This is - * currently a linear search as there doesn't appear to be - * any defined order within the font -@@ -2421,11 +2434,11 @@ static FT_UInt - FcFreeTypeGlyphNameIndex (FT_Face face, const FcChar8 *name) - { - FT_UInt gindex; -- FcChar8 name_buf[FC_GLYPHNAME_MAXLEN + 2]; -+ FcChar8 name_buf[FC_GLYPHNAME_BUFLEN + 2]; - - for (gindex = 0; gindex < (FT_UInt) face->num_glyphs; gindex++) - { -- if (FT_Get_Glyph_Name (face, gindex, name_buf, FC_GLYPHNAME_MAXLEN+1) == 0) -+ if (FT_Get_Glyph_Name (face, gindex, name_buf, FC_GLYPHNAME_BUFLEN+1) == 0) - if (!strcmp ((char *) name, (char *) name_buf)) - return gindex; - } -@@ -2715,11 +2728,11 @@ FcFreeTypeCharSetAndSpacing (FT_Face fac - */ - if (FcFreeTypeUseNames (face)) - { -- FcChar8 name_buf[FC_GLYPHNAME_MAXLEN + 2]; -+ FcChar8 name_buf[FC_GLYPHNAME_BUFLEN + 2]; - - for (glyph = 0; glyph < (FT_UInt) face->num_glyphs; glyph++) - { -- if (FT_Get_Glyph_Name (face, glyph, name_buf, FC_GLYPHNAME_MAXLEN+1) == 0) -+ if (FT_Get_Glyph_Name (face, glyph, name_buf, FC_GLYPHNAME_BUFLEN+1) == 0) - { - ucs4 = FcGlyphNameToUcs4 (name_buf); - if (ucs4 != 0xffff && ---- fc-glyphname/fc-glyphname.c.orig Sat Apr 14 01:49:42 2007 -+++ fc-glyphname/fc-glyphname.c Sat Apr 14 01:49:55 2007 -@@ -206,7 +206,7 @@ insert (FcGlyphName *gn, FcGlyphName **t - i = (int) (h % hash); - while (table[i]) - { -- if (!r) r = (int) (h % rehash); -+ if (!r) r = (int) (h % rehash + 1); - i += r; - if (i >= hash) - i -= hash; ---- src/fcpat.c.orig Sat Apr 14 01:51:00 2007 -+++ src/fcpat.c Sat Apr 14 01:52:23 2007 -@@ -925,10 +925,13 @@ FcPatternDuplicate (const FcPattern *ori - for (i = 0; i < orig->num; i++) - { - for (l = FcPatternEltValues(e + i); l; l = FcValueListNext(l)) -- if (!FcPatternObjectAdd (new, e[i].object, -- FcValueCanonicalize(&l->value), -- FcTrue)) -+ { -+ if (!FcPatternObjectAddWithBinding (new, e[i].object, -+ FcValueCanonicalize(&l->value), -+ l->binding, -+ FcTrue)) - goto bail1; -+ } - } - - return new; |