diff options
| author | marcus <marcus@FreeBSD.org> | 2003-04-25 22:55:39 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-04-25 22:55:39 +0800 |
| commit | 2735f444bd37a936bb93fa52cedb3db51ab5de1d (patch) | |
| tree | f880ea8f8375eb6f6a575205c6c4424657010049 | |
| parent | d455c5bbe05ecefd13f60a3c5c38705913f75fe4 (diff) | |
| download | freebsd-ports-gnome-2735f444bd37a936bb93fa52cedb3db51ab5de1d.tar.gz freebsd-ports-gnome-2735f444bd37a936bb93fa52cedb3db51ab5de1d.tar.zst freebsd-ports-gnome-2735f444bd37a936bb93fa52cedb3db51ab5de1d.zip | |
Add a patch to fix PCF glyph problems.
Obtained from: Xft CVS
| -rw-r--r-- | x11-fonts/Xft/Makefile | 2 | ||||
| -rw-r--r-- | x11-fonts/Xft/files/patch-xftfreetype.c | 36 | ||||
| -rw-r--r-- | x11-fonts/libXft/Makefile | 2 | ||||
| -rw-r--r-- | x11-fonts/libXft/files/patch-xftfreetype.c | 36 |
4 files changed, 74 insertions, 2 deletions
diff --git a/x11-fonts/Xft/Makefile b/x11-fonts/Xft/Makefile index d84dff6988eb..fe1bc43c6dae 100644 --- a/x11-fonts/Xft/Makefile +++ b/x11-fonts/Xft/Makefile @@ -7,7 +7,7 @@ PORTNAME= Xft PORTVERSION= 2.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/fontconfig/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} diff --git a/x11-fonts/Xft/files/patch-xftfreetype.c b/x11-fonts/Xft/files/patch-xftfreetype.c new file mode 100644 index 000000000000..20526f36b8c9 --- /dev/null +++ b/x11-fonts/Xft/files/patch-xftfreetype.c @@ -0,0 +1,36 @@ +--- xftfreetype.c 2003/04/17 04:29:24 1.31 ++++ xftfreetype.c 2003/04/24 16:14:58 1.32 +@@ -638,6 +638,7 @@ + int alloc_size; + int ascent, descent, height; + int i; ++ int num_glyphs; + + if (!info) + return 0; +@@ -769,8 +770,13 @@ + rehash_value = 0; + } + ++ /* ++ * Sometimes the glyphs are numbered 1..n, other times 0..n-1, ++ * accept either numbering scheme by making room in the table ++ */ ++ num_glyphs = face->num_glyphs + 1; + alloc_size = (sizeof (XftFontInt) + +- face->num_glyphs * sizeof (XftGlyph *) + ++ num_glyphs * sizeof (XftGlyph *) + + hash_value * sizeof (XftUcsHash)); + font = malloc (alloc_size); + +@@ -867,8 +873,8 @@ + * Per glyph information + */ + font->glyphs = (XftGlyph **) (font + 1); +- memset (font->glyphs, '\0', face->num_glyphs * sizeof (XftGlyph *)); +- font->num_glyphs = face->num_glyphs; ++ memset (font->glyphs, '\0', num_glyphs * sizeof (XftGlyph *)); ++ font->num_glyphs = num_glyphs; + /* + * Unicode hash table information + */ diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile index d84dff6988eb..fe1bc43c6dae 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -7,7 +7,7 @@ PORTNAME= Xft PORTVERSION= 2.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/fontconfig/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} diff --git a/x11-fonts/libXft/files/patch-xftfreetype.c b/x11-fonts/libXft/files/patch-xftfreetype.c new file mode 100644 index 000000000000..20526f36b8c9 --- /dev/null +++ b/x11-fonts/libXft/files/patch-xftfreetype.c @@ -0,0 +1,36 @@ +--- xftfreetype.c 2003/04/17 04:29:24 1.31 ++++ xftfreetype.c 2003/04/24 16:14:58 1.32 +@@ -638,6 +638,7 @@ + int alloc_size; + int ascent, descent, height; + int i; ++ int num_glyphs; + + if (!info) + return 0; +@@ -769,8 +770,13 @@ + rehash_value = 0; + } + ++ /* ++ * Sometimes the glyphs are numbered 1..n, other times 0..n-1, ++ * accept either numbering scheme by making room in the table ++ */ ++ num_glyphs = face->num_glyphs + 1; + alloc_size = (sizeof (XftFontInt) + +- face->num_glyphs * sizeof (XftGlyph *) + ++ num_glyphs * sizeof (XftGlyph *) + + hash_value * sizeof (XftUcsHash)); + font = malloc (alloc_size); + +@@ -867,8 +873,8 @@ + * Per glyph information + */ + font->glyphs = (XftGlyph **) (font + 1); +- memset (font->glyphs, '\0', face->num_glyphs * sizeof (XftGlyph *)); +- font->num_glyphs = face->num_glyphs; ++ memset (font->glyphs, '\0', num_glyphs * sizeof (XftGlyph *)); ++ font->num_glyphs = num_glyphs; + /* + * Unicode hash table information + */ |