version bump, plus backport a patch from upstream to avoid segfaults with

  recents freetype-2, bug #185358
(Portage version: 2.1.3.13)

4 files changed, 107 insertions, 1 deletions

diff --git a/app-text/xdvipdfmx/ChangeLog b/app-text/xdvipdfmx/ChangeLog
index d4e8ad0dc571..10e82d9d0874 100644
--- a/app-text/xdvipdfmx/ChangeLog
+++ b/app-text/xdvipdfmx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/xdvipdfmx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvipdfmx/ChangeLog,v 1.17 2007/05/20 08:41:45 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvipdfmx/ChangeLog,v 1.18 2007/10/15 18:20:14 aballier Exp $
+
+*xdvipdfmx-0.4 (15 Oct 2007)
+
+  15 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/xdvipdfmx-0.4-ft2-internals.patch, +xdvipdfmx-0.4.ebuild:
+  version bump, plus backport a patch from upstream to avoid segfaults with
+  recents freetype-2, bug #185358
 
   20 May 2007; Christian Faulhammer <opfer@gentoo.org> xdvipdfmx-0.3.ebuild:
   stable amd64, bug 176895
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;
+   }
+ 
diff --git a/app-text/xdvipdfmx/xdvipdfmx-0.4.ebuild b/app-text/xdvipdfmx/xdvipdfmx-0.4.ebuild
new file mode 100644
index 000000000000..9df70f557dc5
--- /dev/null
+++ b/app-text/xdvipdfmx/xdvipdfmx-0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvipdfmx/xdvipdfmx-0.4.ebuild,v 1.1 2007/10/15 18:20:14 aballier Exp $
+
+inherit eutils
+
+DESCRIPTION="Extended xdvi for use with XeTeX and other unicode TeXs."
+HOMEPAGE="http://scripts.sil.org/svn-view/xdvipdfmx/"
+SRC_URI="http://scripts.sil.org/svn-view/xdvipdfmx/TAGS/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/freetype-2.0 virtual/latex-base"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-ft2-internals.patch"
+}
+
+src_compile() {
+	chmod +x configure
+#	sh ./configure --prefix=/usr \
+	econf \
+		--with-ft2lib=/usr/lib/libfreetype.so \
+		--with-ft2include=/usr/include/freetype2 || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc README COPYING doc/tug2003.pdf doc/CJK-CID.txt doc/images/dvipdfm-cjk.png doc/images/dvipdfmx-logo.png doc/images/rightarrow.png doc/images/right_triangle.png doc/images/dvipdfmx.png TODO BUGS AUTHORS
+}