Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (05e12a444bbfa62c06f5d8eb128881866392e066)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (05e12a444bbfa62c06f5d8eb128881866392e066)
  • Date: Tue, 21 Jul 2009 15:54:10 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

latex/tetex/HISTORY | 6 ++++
latex/tetex/PRE_BUILD | 5 ++-
latex/tetex/glibc-2.10.1.patch | 60
+++++++++++++++++++++++++++++++++++++++++
3 files changed, 70 insertions(+), 1 deletion(-)

New commits:
commit 05e12a444bbfa62c06f5d8eb128881866392e066
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

tetex: tangleboot.p fix from
http://tutimura.ath.cx/ptetex/?%C6%B0%BA%EE%CA%F3%B9%F0%2F134
Fixes Bug #15261

diff --git a/latex/tetex/HISTORY b/latex/tetex/HISTORY
index 7d527cf..24e2601 100644
--- a/latex/tetex/HISTORY
+++ b/latex/tetex/HISTORY
@@ -1,3 +1,9 @@
+2009-07-21 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply glibc-2.10.1.patch
+ * glibc-2.10.1.patch: tangleboot.p fix from
+ http://tutimura.ath.cx/ptetex/?%C6%B0%BA%EE%CA%F3%B9%F0%2F134
+ Fixes Bug #15261
+
2009-01-26 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* BUILD: Added --without-xdvik to build without libxp
diff --git a/latex/tetex/PRE_BUILD b/latex/tetex/PRE_BUILD
index 2b49460..bf1c0a3 100755
--- a/latex/tetex/PRE_BUILD
+++ b/latex/tetex/PRE_BUILD
@@ -3,4 +3,7 @@ default_pre_build &&
if [ "$CSTEX" = "y" ]; then
cd $SOURCE_DIRECTORY/texk/web2c &&
unpack_file 2
-fi
+fi &&
+
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
diff --git a/latex/tetex/glibc-2.10.1.patch b/latex/tetex/glibc-2.10.1.patch
new file mode 100644
index 0000000..e845d1b
--- /dev/null
+++ b/latex/tetex/glibc-2.10.1.patch
@@ -0,0 +1,60 @@
+# tangleboot.p fix from
http://tutimura.ath.cx/ptetex/?%C6%B0%BA%EE%CA%F3%B9%F0%2F134
+diff -Naur tetex-src-3.0.orig/texk/dvipsk/afm2tfm.c
tetex-src-3.0/texk/dvipsk/afm2tfm.c
+--- tetex-src-3.0.orig/texk/dvipsk/afm2tfm.c 2009-07-21 05:59:32.635014710
-0700
++++ tetex-src-3.0/texk/dvipsk/afm2tfm.c 2009-07-21 13:37:27.978595399
-0700
+@@ -257,7 +257,7 @@
+ }
+
+ int
+-getline P1H(void) {
++tetex_getline P1H(void) {
+ register char *p ;
+ register int c ;
+
+@@ -606,7 +606,7 @@
+ ai = newchar() ;
+ ai->adobenum = -1 ;
+ ai->adobename = "||" ; /* boundary character name */
+- while (getline()) {
++ while (tetex_getline()) {
+ switch(interest(paramstring())) {
+ case FontName:
+ fontname = paramnewstring() ;
+@@ -1882,7 +1882,7 @@
+
+ while (1) {
+ while (param == 0 || *param == 0) {
+- if (getline() == 0)
++ if (tetex_getline() == 0)
+ error("! premature end in encoding file") ;
+ for (p=buffer; *p; p++)
+ if (*p == '%') {
+@@ -1973,7 +1973,7 @@
+ p = gettoken() ;
+ if (strcmp(p, "]"))
+ error("! token 258 in encoding must be make-array (])") ;
+- while (getline()) {
++ while (tetex_getline()) {
+ for (p=buffer; *p; p++)
+ if (*p == '%') {
+ if (ignoreligkern == 0)
+diff -Naur tetex-src-3.0.orig/texk/web2c/cpascal.h
tetex-src-3.0/texk/web2c/cpascal.h
+--- tetex-src-3.0.orig/texk/web2c/cpascal.h 2009-07-21 05:59:32.663015345
-0700
++++ tetex-src-3.0/texk/web2c/cpascal.h 2009-07-21 13:28:29.754590069 -0700
+@@ -241,6 +241,16 @@
+ #define getname vms_getname
+ #endif
+
++
++/* Apparently POSIX 2008 has getline and glibc 2.9.90 exports it.
++ * tangle, weave, et al. use that symbol; try to define it away so
++ * something that a standard won't usurp.
++ * From http://tutimura.ath.cx/ptetex/?%C6%B0%BA%EE%CA%F3%B9%F0%2F134 */
++#ifdef getline
++#undef getline
++#endif
++#define getline web2c_getline
++
+ /* Declarations for the routines we provide ourselves in lib/. */
+
+ extern string basenamechangesuffix
P3H(const_string,const_string,const_string);



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (05e12a444bbfa62c06f5d8eb128881866392e066), Eric Sandall, 07/21/2009

Archive powered by MHonArc 2.6.24.

Top of Page