diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2007-10-15 18:20:14 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2007-10-15 18:20:14 +0000 |
| commit | e0b2bf78ff3568522198537c6a84c263dd215e28 (patch) | |
| tree | fef4860cd93c825ddb95e2803152c671928f489b /app-text/xdvipdfmx/files | |
| parent | Cosmetic changes, since upstream has started using sane naming of tar files. (diff) | |
| download | gentoo-2-e0b2bf78ff3568522198537c6a84c263dd215e28.tar.gz gentoo-2-e0b2bf78ff3568522198537c6a84c263dd215e28.tar.bz2 gentoo-2-e0b2bf78ff3568522198537c6a84c263dd215e28.zip | |
version bump, plus backport a patch from upstream to avoid segfaults with
recents freetype-2, bug #185358
(Portage version: 2.1.3.13)
Diffstat (limited to 'app-text/xdvipdfmx/files')
| -rw-r--r-- | app-text/xdvipdfmx/files/digest-xdvipdfmx-0.4 | 3 | ||||
| -rw-r--r-- | app-text/xdvipdfmx/files/xdvipdfmx-0.4-ft2-internals.patch | 58 |
2 files changed, 61 insertions, 0 deletions
diff --git a/app-text/xdvipdfmx/files/digest-xdvipdfmx-0.4 b/app-text/xdvipdfmx/files/digest-xdvipdfmx-0.4 new file mode 100644 index 000000000000..d80c8a38de90 --- /dev/null +++ b/app-text/xdvipdfmx/files/digest-xdvipdfmx-0.4 @@ -0,0 +1,3 @@ +MD5 2bb9d65f2406a112fa53dbd0697d93ad xdvipdfmx-0.4.tar.gz 1193326 +RMD160 93a442abd84eb9913c3801652c72e355609383c6 xdvipdfmx-0.4.tar.gz 1193326 +SHA256 8b81986489e8dba5931b99e467775a103ea4dfcceebc77964d21f12edb0026cf xdvipdfmx-0.4.tar.gz 1193326 diff --git a/app-text/xdvipdfmx/files/xdvipdfmx-0.4-ft2-internals.patch b/app-text/xdvipdfmx/files/xdvipdfmx-0.4-ft2-internals.patch new file mode 100644 index 000000000000..84f7d5664c1d --- /dev/null +++ b/app-text/xdvipdfmx/files/xdvipdfmx-0.4-ft2-internals.patch @@ -0,0 +1,58 @@ +Index: src/dvi.c +=================================================================== +--- src/dvi.c (revision 92) ++++ src/dvi.c (revision 93) +@@ -1901,6 +1901,9 @@ + } + } + ++/* globals initialized by fontmap.c when it opens freetype */ ++extern FT_Int ft_major, ft_minor, ft_patch; ++ + static void + do_glyph_array (int yLocsPresent) + { +@@ -1938,8 +1941,10 @@ + glyph_id = get_buffered_unsigned_pair(); /* freetype glyph index */ + if (glyph_id < font->ft_face->num_glyphs) { + if (font->glyph_widths[glyph_id] == 0xffff) { +- if (FT_IS_SFNT(font->ft_face)) { +- /* CFF driver of freetype does not set vertical metrics correctly, ++ if (FT_IS_SFNT(font->ft_face) ++ && ((ft_major < 2) || ((ft_major == 2) && (ft_minor < 2)))) { ++ /* prior to version 2.2.0, ++ CFF driver of freetype does not set vertical metrics correctly, + so we'll read the metrics directly */ + TT_HoriHeader *dir_hea; /* vhea structure is identical */ + dir_hea = FT_Get_Sfnt_Table(font->ft_face, (font->layout_dir == 0) +Index: src/fontmap.c +=================================================================== +--- src/fontmap.c (revision 92) ++++ src/fontmap.c (revision 93) +@@ -1070,6 +1070,10 @@ + return error; + } + ++FT_Int ft_major; /* global so that dvi.c can check the version */ ++FT_Int ft_minor; ++FT_Int ft_patch; ++ + int + pdf_load_native_font (const char *ps_name, + const char *fam_name, const char *sty_name, +@@ -1085,6 +1089,7 @@ + WARN("FreeType initialization failed."); + return error; + } ++ FT_Library_Version(ftLib, &ft_major, &ft_minor, &ft_patch); + sInitialized = 1; + } + +@@ -1139,6 +1144,7 @@ + WARN("FreeType initialization failed."); + return error; + } ++ FT_Library_Version(ftLib, &ft_major, &ft_minor, &ft_patch); + sInitialized = 1; + } + |