[gentoo-commits] gentoo commit in src/patchsets/texlive/2010/texlive-core: 090_all_icu_longflags.patch 090_all_xetex_math.patch 100_all_icu_longflags.patch series

[gentoo-commits] gentoo commit in src/patchsets/texlive/2010/texlive-core: 090_all_icu_longflags.patch 090_all_xetex_math.patch 100_all_icu_longflags.patch series

[Alexis Ballier (aballier)]

aballier    11/07/06 19:58:04

  Modified:             series
  Added:                090_all_xetex_math.patch
                        100_all_icu_longflags.patch
  Removed:              090_all_icu_longflags.patch
  Log:
  lost this patch in the way due to a forgotten commit.......

Revision  Changes    Path
1.8                  src/patchsets/texlive/2010/texlive-core/series

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/series?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/series?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/series?r1=1.7&r2=1.8

Index: series
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2010/texlive-core/series,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- series	18 May 2011 18:14:40 -0000	1.7
+++ series	6 Jul 2011 19:58:04 -0000	1.8
@@ -3,4 +3,5 @@
 050_all_icu_arm.patch
 060_all_pdftex_libpng15.patch
 080_all_a2ping_invocation.patch
-090_all_icu_longflags.patch
+090_all_xetex_math.patch
+100_all_icu_longflags.patch



1.1                  src/patchsets/texlive/2010/texlive-core/090_all_xetex_math.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/090_all_xetex_math.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/090_all_xetex_math.patch?rev=1.1&content-type=text/plain

Index: 090_all_xetex_math.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=356701
http://tug.org/pipermail/xetex/2011-January/019720.html
http://sourceforge.net/tracker/?func=detail&aid=3145819&group_id=194926&atid=951385

---
\documentclass[a4paper,12pt]{article}
\usepackage{fontspec}
\usepackage{unicode-math}
\setmathfont{Asana Math}
\begin{document}
$\frac{2\pi r}{r} = 2\pi$
\end{document
--- 

Index: texlive-20100722-source/texk/web2c/xetexdir/XeTeX_ext.h
===================================================================
--- texlive-20100722-source.orig/texk/web2c/xetexdir/XeTeX_ext.h
+++ texlive-20100722-source/texk/web2c/xetexdir/XeTeX_ext.h
@@ -33,6 +33,7 @@ authorization from the copyright holders
 #ifndef __XETEXEXT_H
 #define __XETEXEXT_H
 
+#include <w2c/c-auto.h>        /* needed for SIZEOF_LONG and NO_DUMP_SHARE */
 /***** copied from TeX/texk/web2c/config.h -- difficult to include in C++ source files ******/
 #ifndef INTEGER_TYPE
 



1.1                  src/patchsets/texlive/2010/texlive-core/100_all_icu_longflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/100_all_icu_longflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/100_all_icu_longflags.patch?rev=1.1&content-type=text/plain

Index: 100_all_icu_longflags.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=349085
https://bugs.gentoo.org/show_bug.cgi?id=326021

Index: texlive-20100722-source/libs/icu/icu-4.4/tools/pkgdata/pkgdata.cpp
===================================================================
--- texlive-20100722-source.orig/libs/icu/icu-4.4/tools/pkgdata/pkgdata.cpp
+++ texlive-20100722-source/libs/icu/icu-4.4/tools/pkgdata/pkgdata.cpp
@@ -561,12 +561,19 @@ static int32_t pkg_executeOptions(UPKGOp
             char gencFilePath[SMALL_BUFFER_MAX_SIZE] = "";
             char version_major[10] = "";
             UBool reverseExt = FALSE;
+            unsigned currentBufferSize = SMALL_BUFFER_MAX_SIZE;
 
             /* Initialize pkgdataFlags */
             pkgDataFlags = (char**)uprv_malloc(sizeof(char*) * PKGDATA_FLAGS_SIZE);
+#ifndef WINDOWS_WITH_MSVC
+            /* If we run out of space, allocate more */
+            do{
+                status = U_ZERO_ERROR;
+#endif
+
             if (pkgDataFlags != NULL) {
                 for (int32_t i = 0; i < PKGDATA_FLAGS_SIZE; i++) {
-                    pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * SMALL_BUFFER_MAX_SIZE);
+                    pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * currentBufferSize);
                     if (pkgDataFlags[i] != NULL) {
                         pkgDataFlags[i][0] = 0;
                     } else {
@@ -592,11 +599,18 @@ static int32_t pkg_executeOptions(UPKGOp
             if(o->verbose) {
               fprintf(stdout, "# Reading options file %s\n", o->options);
             }
-            parseFlagsFile(o->options, pkgDataFlags, SMALL_BUFFER_MAX_SIZE, (int32_t)PKGDATA_FLAGS_SIZE, &status);
+            parseFlagsFile(o->options, pkgDataFlags, currentBufferSize, (int32_t)PKGDATA_FLAGS_SIZE, &status);
+            if (status == U_BUFFER_OVERFLOW_ERROR) {
+                    for (int32_t i = 0; i < PKGDATA_FLAGS_SIZE; i++)
+                            uprv_free(pkgDataFlags[i]);
+                    currentBufferSize *= 2;
+            }
+            else
             if (U_FAILURE(status)) {
                 fprintf(stderr,"Unable to open or read \"%s\" option file. status = %s\n", o->options, u_errorName(status));
                 return -1;
             }
+            } while (status == U_BUFFER_OVERFLOW_ERROR);
 
             /* Get the version major number. */
             if (o->version != NULL) {