From 61a3e2d1e80434520cdd9979a3d34306786cc6f9 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 19 Feb 2016 12:14:46 +0000 Subject: utils/m-tx: Change directory name git-svn-id: svn://tug.org/texlive/trunk@39779 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/m-tx/Makefile.am | 2 +- Build/source/utils/m-tx/Makefile.in | 2 +- Build/source/utils/m-tx/mtx-PATCHES/ChangeLog | 27 ++++++++++++++++++++++ Build/source/utils/m-tx/mtx-PATCHES/TL-Changes | 13 +++++++++++ .../utils/m-tx/mtx-PATCHES/patch-01-write-bin | 12 ++++++++++ .../source/utils/m-tx/mtx-PATCHES/patch-02-malloc | 12 ++++++++++ .../utils/m-tx/mtx-PATCHES/patch-03-different-size | 16 +++++++++++++ Build/source/utils/m-tx/mtx-src-PATCHES/ChangeLog | 27 ---------------------- Build/source/utils/m-tx/mtx-src-PATCHES/TL-Changes | 13 ----------- .../utils/m-tx/mtx-src-PATCHES/patch-01-write-bin | 12 ---------- .../utils/m-tx/mtx-src-PATCHES/patch-02-malloc | 12 ---------- .../m-tx/mtx-src-PATCHES/patch-03-different-size | 16 ------------- 12 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 Build/source/utils/m-tx/mtx-PATCHES/ChangeLog create mode 100644 Build/source/utils/m-tx/mtx-PATCHES/TL-Changes create mode 100644 Build/source/utils/m-tx/mtx-PATCHES/patch-01-write-bin create mode 100644 Build/source/utils/m-tx/mtx-PATCHES/patch-02-malloc create mode 100644 Build/source/utils/m-tx/mtx-PATCHES/patch-03-different-size delete mode 100644 Build/source/utils/m-tx/mtx-src-PATCHES/ChangeLog delete mode 100644 Build/source/utils/m-tx/mtx-src-PATCHES/TL-Changes delete mode 100644 Build/source/utils/m-tx/mtx-src-PATCHES/patch-01-write-bin delete mode 100644 Build/source/utils/m-tx/mtx-src-PATCHES/patch-02-malloc delete mode 100644 Build/source/utils/m-tx/mtx-src-PATCHES/patch-03-different-size (limited to 'Build/source/utils') diff --git a/Build/source/utils/m-tx/Makefile.am b/Build/source/utils/m-tx/Makefile.am index f0e04273159..18e5137fdf0 100644 --- a/Build/source/utils/m-tx/Makefile.am +++ b/Build/source/utils/m-tx/Makefile.am @@ -6,7 +6,7 @@ ## We want to re-distribute the whole original mtx source tree. EXTRA_DIST = $(MTX_TREE) ## Patches applied to the original source tree -EXTRA_DIST += $(MTX_TREE)-PATCHES +EXTRA_DIST += mtx-PATCHES # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/utils/m-tx/Makefile.in b/Build/source/utils/m-tx/Makefile.in index 46c3b3758e3..03d62529b0b 100644 --- a/Build/source/utils/m-tx/Makefile.in +++ b/Build/source/utils/m-tx/Makefile.in @@ -494,7 +494,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(MTX_TREE) $(MTX_TREE)-PATCHES $(TESTS) tests/mozart.mtx \ +EXTRA_DIST = $(MTX_TREE) mtx-PATCHES $(TESTS) tests/mozart.mtx \ tests/mozart.pmx NEVER_DIST = `find . $(NEVER_NAMES)` diff --git a/Build/source/utils/m-tx/mtx-PATCHES/ChangeLog b/Build/source/utils/m-tx/mtx-PATCHES/ChangeLog new file mode 100644 index 00000000000..0f2b678a6c1 --- /dev/null +++ b/Build/source/utils/m-tx/mtx-PATCHES/ChangeLog @@ -0,0 +1,27 @@ +2016-02-10 Akira Kakuto + + * patch-01-write-bin, patch-02-malloc, patch-03-different-size: + Update for 0.62. + +2015-12-17 Akira Kakuto + + * patch-01-write-bin, patch-02-malloc, patch-03-different-size: + Update for 0.61. + +2013-04-10 Peter Breitenlohner + + * patch-03-different-size: Avoid 'cast to pointer from integer of + different size' when sizeof(int) is less than sizeof(void *). + +2012-10-04 Peter Breitenlohner + + * patch-02-malloc (new): Check value returned by malloc(), i.e., + undo action of sed from Makefile.orig. Do not use libp2c.a. + +2012-05-16 Peter Breitenlohner + + * patch-01-write-bin (new): Use binary mode for output files. + From Akira Kakuto (W32TeX). + +Copyright (C) 2012 Peter Breitenlohner +You may freely use, modify and/or distribute this file. diff --git a/Build/source/utils/m-tx/mtx-PATCHES/TL-Changes b/Build/source/utils/m-tx/mtx-PATCHES/TL-Changes new file mode 100644 index 00000000000..49723579796 --- /dev/null +++ b/Build/source/utils/m-tx/mtx-PATCHES/TL-Changes @@ -0,0 +1,13 @@ +Changes applied to the mtx-0.62 tree as obtained from: + http://www.ctan.org/tex-archive/support/m-tx/ + +Remove: + Makefile.in + aclocal.m4 + configure + depcomp + install-sh + missing + +Move to top directory: + tests/* diff --git a/Build/source/utils/m-tx/mtx-PATCHES/patch-01-write-bin b/Build/source/utils/m-tx/mtx-PATCHES/patch-01-write-bin new file mode 100644 index 00000000000..0c85cedf4f8 --- /dev/null +++ b/Build/source/utils/m-tx/mtx-PATCHES/patch-01-write-bin @@ -0,0 +1,12 @@ +diff -ur mtx-0.62.orig/globals.c mtx-0.62/globals.c +--- mtx-0.62.orig/globals.c Tue Feb 09 05:51:40 2016 ++++ mtx-0.62/globals.c Thu Feb 11 01:50:54 2016 +@@ -223,7 +223,7 @@ + if (outfile != NULL) + fclose(outfile); + outfile = NULL; +- outfile = fopen(outfile_NAME, "w"); ++ outfile = fopen(outfile_NAME, "wb"); + if (outfile == NULL) + _EscIO2(FileNotFound, outfile_NAME); + fclose(outfile); diff --git a/Build/source/utils/m-tx/mtx-PATCHES/patch-02-malloc b/Build/source/utils/m-tx/mtx-PATCHES/patch-02-malloc new file mode 100644 index 00000000000..178d04ee483 --- /dev/null +++ b/Build/source/utils/m-tx/mtx-PATCHES/patch-02-malloc @@ -0,0 +1,12 @@ +diff -ur mtx-0.62.orig/multfile.c mtx-0.62/multfile.c +--- mtx-0.62.orig/multfile.c Tue Feb 09 05:52:29 2016 ++++ mtx-0.62/multfile.c Thu Feb 11 01:52:08 2016 +@@ -61,7 +61,7 @@ + printf("===! Ignoring recursive include of file %s\n", filename); + return; + } +- newnode = malloc(sizeof(filenode)); ++ newnode = Malloc(sizeof(filenode)); + newnode->actualfile = NULL; + strcpy(newnode->name, filename); + newnode->prev = current; diff --git a/Build/source/utils/m-tx/mtx-PATCHES/patch-03-different-size b/Build/source/utils/m-tx/mtx-PATCHES/patch-03-different-size new file mode 100644 index 00000000000..d51fd15b774 --- /dev/null +++ b/Build/source/utils/m-tx/mtx-PATCHES/patch-03-different-size @@ -0,0 +1,16 @@ +diff -ur mtx-0.62.orig/libp2c/p2c.h mtx-0.62/libp2c/p2c.h +--- mtx-0.62.orig/libp2c/p2c.h Tue Feb 09 05:23:09 2016 ++++ mtx-0.62/libp2c/p2c.h Thu Feb 11 01:54:30 2016 +@@ -428,10 +428,10 @@ + + /* Memory allocation */ + #ifdef __GCC__ +-# define Malloc(n) (malloc(n) ?: (Anyptr)_OutMem()) ++# define Malloc(n) (malloc(n) ?: (Anyptr)(size_t)_OutMem()) + #else + extern Anyptr __MallocTemp__; +-# define Malloc(n) ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)_OutMem()) ++# define Malloc(n) ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)(size_t)_OutMem()) + #endif + #define FreeR(p) (free((Anyptr)(p))) /* used if arg is an rvalue */ + #define Free(p) (free((Anyptr)(p)), (p)=NULL) diff --git a/Build/source/utils/m-tx/mtx-src-PATCHES/ChangeLog b/Build/source/utils/m-tx/mtx-src-PATCHES/ChangeLog deleted file mode 100644 index 0f2b678a6c1..00000000000 --- a/Build/source/utils/m-tx/mtx-src-PATCHES/ChangeLog +++ /dev/null @@ -1,27 +0,0 @@ -2016-02-10 Akira Kakuto - - * patch-01-write-bin, patch-02-malloc, patch-03-different-size: - Update for 0.62. - -2015-12-17 Akira Kakuto - - * patch-01-write-bin, patch-02-malloc, patch-03-different-size: - Update for 0.61. - -2013-04-10 Peter Breitenlohner - - * patch-03-different-size: Avoid 'cast to pointer from integer of - different size' when sizeof(int) is less than sizeof(void *). - -2012-10-04 Peter Breitenlohner - - * patch-02-malloc (new): Check value returned by malloc(), i.e., - undo action of sed from Makefile.orig. Do not use libp2c.a. - -2012-05-16 Peter Breitenlohner - - * patch-01-write-bin (new): Use binary mode for output files. - From Akira Kakuto (W32TeX). - -Copyright (C) 2012 Peter Breitenlohner -You may freely use, modify and/or distribute this file. diff --git a/Build/source/utils/m-tx/mtx-src-PATCHES/TL-Changes b/Build/source/utils/m-tx/mtx-src-PATCHES/TL-Changes deleted file mode 100644 index 49723579796..00000000000 --- a/Build/source/utils/m-tx/mtx-src-PATCHES/TL-Changes +++ /dev/null @@ -1,13 +0,0 @@ -Changes applied to the mtx-0.62 tree as obtained from: - http://www.ctan.org/tex-archive/support/m-tx/ - -Remove: - Makefile.in - aclocal.m4 - configure - depcomp - install-sh - missing - -Move to top directory: - tests/* diff --git a/Build/source/utils/m-tx/mtx-src-PATCHES/patch-01-write-bin b/Build/source/utils/m-tx/mtx-src-PATCHES/patch-01-write-bin deleted file mode 100644 index 0c85cedf4f8..00000000000 --- a/Build/source/utils/m-tx/mtx-src-PATCHES/patch-01-write-bin +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur mtx-0.62.orig/globals.c mtx-0.62/globals.c ---- mtx-0.62.orig/globals.c Tue Feb 09 05:51:40 2016 -+++ mtx-0.62/globals.c Thu Feb 11 01:50:54 2016 -@@ -223,7 +223,7 @@ - if (outfile != NULL) - fclose(outfile); - outfile = NULL; -- outfile = fopen(outfile_NAME, "w"); -+ outfile = fopen(outfile_NAME, "wb"); - if (outfile == NULL) - _EscIO2(FileNotFound, outfile_NAME); - fclose(outfile); diff --git a/Build/source/utils/m-tx/mtx-src-PATCHES/patch-02-malloc b/Build/source/utils/m-tx/mtx-src-PATCHES/patch-02-malloc deleted file mode 100644 index 178d04ee483..00000000000 --- a/Build/source/utils/m-tx/mtx-src-PATCHES/patch-02-malloc +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur mtx-0.62.orig/multfile.c mtx-0.62/multfile.c ---- mtx-0.62.orig/multfile.c Tue Feb 09 05:52:29 2016 -+++ mtx-0.62/multfile.c Thu Feb 11 01:52:08 2016 -@@ -61,7 +61,7 @@ - printf("===! Ignoring recursive include of file %s\n", filename); - return; - } -- newnode = malloc(sizeof(filenode)); -+ newnode = Malloc(sizeof(filenode)); - newnode->actualfile = NULL; - strcpy(newnode->name, filename); - newnode->prev = current; diff --git a/Build/source/utils/m-tx/mtx-src-PATCHES/patch-03-different-size b/Build/source/utils/m-tx/mtx-src-PATCHES/patch-03-different-size deleted file mode 100644 index d51fd15b774..00000000000 --- a/Build/source/utils/m-tx/mtx-src-PATCHES/patch-03-different-size +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur mtx-0.62.orig/libp2c/p2c.h mtx-0.62/libp2c/p2c.h ---- mtx-0.62.orig/libp2c/p2c.h Tue Feb 09 05:23:09 2016 -+++ mtx-0.62/libp2c/p2c.h Thu Feb 11 01:54:30 2016 -@@ -428,10 +428,10 @@ - - /* Memory allocation */ - #ifdef __GCC__ --# define Malloc(n) (malloc(n) ?: (Anyptr)_OutMem()) -+# define Malloc(n) (malloc(n) ?: (Anyptr)(size_t)_OutMem()) - #else - extern Anyptr __MallocTemp__; --# define Malloc(n) ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)_OutMem()) -+# define Malloc(n) ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)(size_t)_OutMem()) - #endif - #define FreeR(p) (free((Anyptr)(p))) /* used if arg is an rvalue */ - #define Free(p) (free((Anyptr)(p)), (p)=NULL) -- cgit v1.2.3