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

  recents freetype-2, bug #185358
Package-Manager: portage-2.1.3.13

5 files changed, 127 insertions, 9 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/Manifest b/app-text/xdvipdfmx/Manifest
index bce1443caf79..ed37e1149d48 100644
--- a/app-text/xdvipdfmx/Manifest
+++ b/app-text/xdvipdfmx/Manifest
@@ -1,15 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xdvipdfmx-0.4-ft2-internals.patch 1889 RMD160 747b1c8e5064420a67822394859bc940999eaca6 SHA1 c41eef49d5b0b1dd3c687a215c854f43318a4644 SHA256 9cb35f585ad90df15931e13c546df1d86ce6f0da89be149aad7da4adcb23a138
+MD5 7b3ed618e68ff477867b968bec0bfd61 files/xdvipdfmx-0.4-ft2-internals.patch 1889
+RMD160 747b1c8e5064420a67822394859bc940999eaca6 files/xdvipdfmx-0.4-ft2-internals.patch 1889
+SHA256 9cb35f585ad90df15931e13c546df1d86ce6f0da89be149aad7da4adcb23a138 files/xdvipdfmx-0.4-ft2-internals.patch 1889
 DIST xdvipdfmx-0.3.tar.gz 1030894 RMD160 6b63c68326e8d4b2f9db0be5be787051608a2511 SHA1 d835c9ae10f4caa2aa9e6feccb5a8e3f3ca17646 SHA256 6d2cd722ee74668f6d64141e3a2554ec5937f9724ad3b8abfd7767e6634c8461
+DIST xdvipdfmx-0.4.tar.gz 1193326 RMD160 93a442abd84eb9913c3801652c72e355609383c6 SHA1 882e3bca93cb85c724e31120228f4413a36b321a SHA256 8b81986489e8dba5931b99e467775a103ea4dfcceebc77964d21f12edb0026cf
 EBUILD xdvipdfmx-0.3.ebuild 1070 RMD160 01a518c063f2c5886b85315d785bc0f932c6f6b4 SHA1 d9333398fe9915a2f9e148c31739f8a0a679cdbd SHA256 d6849f85dc148e5e81a419cf0b8b64b29dc0f6ef5456d65a23575cce2d2dfdeb
 MD5 67e3e0aa09a068f9826b5dd96d49a66a xdvipdfmx-0.3.ebuild 1070
 RMD160 01a518c063f2c5886b85315d785bc0f932c6f6b4 xdvipdfmx-0.3.ebuild 1070
 SHA256 d6849f85dc148e5e81a419cf0b8b64b29dc0f6ef5456d65a23575cce2d2dfdeb xdvipdfmx-0.3.ebuild 1070
-MISC ChangeLog 1964 RMD160 b2b21c20377301d88c80a564b0080852c5e4f1f7 SHA1 b4da8dd407cd5b4959cc212ee7db4e2a2a29bb72 SHA256 c594f5ec17368d2cf5207002719c2c9d855619787f1f7a1cdd43adc87800a78c
-MD5 d0d2680bff6085d2fcb712b337c22cb0 ChangeLog 1964
-RMD160 b2b21c20377301d88c80a564b0080852c5e4f1f7 ChangeLog 1964
-SHA256 c594f5ec17368d2cf5207002719c2c9d855619787f1f7a1cdd43adc87800a78c ChangeLog 1964
+EBUILD xdvipdfmx-0.4.ebuild 1189 RMD160 012eefa226bde88f2eb43652ed2f8670457f6e84 SHA1 e27122162d1585a9f23181155acdc12b3a009cf1 SHA256 a0c9685d54e1f1a870939b363194b277c092348e1d3a893dfbff8fc4c768365c
+MD5 c14e9279a6258275cdff9ae7cdc040d4 xdvipdfmx-0.4.ebuild 1189
+RMD160 012eefa226bde88f2eb43652ed2f8670457f6e84 xdvipdfmx-0.4.ebuild 1189
+SHA256 a0c9685d54e1f1a870939b363194b277c092348e1d3a893dfbff8fc4c768365c xdvipdfmx-0.4.ebuild 1189
+MISC ChangeLog 2227 RMD160 00860a7924ec9eb400330a7304e7bacdf5e8591a SHA1 8a09aab8b243929a695747801f6774f8e49de553 SHA256 2df492925cafca10c47dfed0c2585cb19a651556afe1ea237eac1a78cf69dd79
+MD5 cbadfd8ed858699be52784144abf299f ChangeLog 2227
+RMD160 00860a7924ec9eb400330a7304e7bacdf5e8591a ChangeLog 2227
+SHA256 2df492925cafca10c47dfed0c2585cb19a651556afe1ea237eac1a78cf69dd79 ChangeLog 2227
 MISC metadata.xml 468 RMD160 efa563fc41b6cd157ac770d66242e9e96c62896f SHA1 dfe2e73565d2c9ec829042c7415ae68c6bf5f5a8 SHA256 4cbfffef0263e45fb3e7b84102f286a60e1a2c8f7aa24561fd8766724ea41967
 MD5 440ec3ccb2fda0f3e625a5459d6ab00b metadata.xml 468
 RMD160 efa563fc41b6cd157ac770d66242e9e96c62896f metadata.xml 468
@@ -17,10 +26,13 @@ SHA256 4cbfffef0263e45fb3e7b84102f286a60e1a2c8f7aa24561fd8766724ea41967 metadata
 MD5 ea23fad422faf506ac0fcad6969c9ce7 files/digest-xdvipdfmx-0.3 244
 RMD160 60fe4c1ad80c04e394850d9c4a4f996685ffdd55 files/digest-xdvipdfmx-0.3 244
 SHA256 8c55def92a0c2fa8bdc7335071be3735c77692336ea6ae6feae55ba3f664f796 files/digest-xdvipdfmx-0.3 244
+MD5 838b6e04f26d25c021a1eb7bb4fbd642 files/digest-xdvipdfmx-0.4 244
+RMD160 c693436a387c1c92d03396a6c64b2d7bc6cd47ac files/digest-xdvipdfmx-0.4 244
+SHA256 64a24dc4c20222e196cc373f52bf562dee121e83bbfaea441fbf41e2d0a41488 files/digest-xdvipdfmx-0.4 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGUAnPNQqtfCuFneMRAsH6AJ9sJUe1h4PxB0ojqP75rtossugmmQCfUcbZ
-SYhsaKJE0Dt79rhszZNYqag=
-=YXVv
+iD8DBQFHE6+dvFcC4BYPU0oRAhPjAKCQmQwf13v5i+Bs4GmHTQw66NbRugCgwc0X
+r3SKbPoNM6nCSOI6Bd/TBHk=
+=Jm1s
 -----END PGP SIGNATURE-----
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
+}