Ticket #30745: texlive-bin.3.patch

files/patch-texk_xdvipdfmx_src_cidtype2.c.diff

@@ +1 @@
+--- texk/xdvipdfmx/src/cidtype2.c       2010-03-30 02:14:53.000000000 +0200
++++ texk/xdvipdfmx/src/cidtype2.c       2011-08-15 19:34:36.000000000 +0200
+@@ -559,7 +559,7 @@
+       ERROR("Invalid TTC index in %s.", font->ident);
+     break;
+   case SFNT_TYPE_TRUETYPE:
+-#ifndef XETEX_MAC
++#ifndef XETEX
+     if (font->options->index > 0)
+       ERROR("Found TrueType font file while expecting TTC file (%s).", font->ident);
+ #endif
+@@ -962,7 +962,7 @@
+     offset = ttc_read_offset(sfont, opt->index);
+     break;
+   case SFNT_TYPE_TRUETYPE:
+-#ifdef XETEX_MAC /* disable the index check here because of how .dfonts are handled */
++#ifdef XETEX /* disable the index check here because of how .dfonts are handled */
+     offset = 0;
+ #else
+     if (opt->index > 0) {

Portfile

@@ -6 +6 @@
 
 name            texlive-bin
 version         2011
+revision        1
 
 categories      tex
 maintainers     dports
@@ -65 +66 @@
                 patch-texk_texlive_context_mtxrun.diff \
                 patch-texk_texlive_linked_scripts_Makefile.in.diff \
                 patch-texk_xdvik_xdvi-sh.in.diff \
+                patch-texk_xdvipdfmx_src_cidtype2.c.diff \
                 patch-utils_chktex_Makefile.in.diff
     
 
@@ -100 +102 @@
         reinplace "s|kpse_cv_have_Carbon=yes|kpse_cv_have_Carbon=no|" ${worksrcpath}/texk/xdv2pdf/configure
     }
     
-    # Do the same for xdvipdfmx regardless of whether +atsui is set,
-    # because it will want to use deprecated fontconfig APIs that are
-    # only available if fontconfig is compiled with
-    # --with-old-mac-fonts
+    # Force xdvipdfmx to use multi-platform freetype API as freetype is not
+    # compiled with --with-old-mac-fonts. A patch helps xdvipdfmx accept dfont
+    # files that freetype can handle.
     reinplace "s|kpse_cv_have_ApplicationServices=yes|kpse_cv_have_ApplicationServices=no|" ${worksrcpath}/texk/xdvipdfmx/configure
 }