forked from pool/texlive
12bf1e4d3f
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=312
259 lines
8.2 KiB
Plaintext
259 lines
8.2 KiB
Plaintext
---
|
|
libs/gmp/Makefile.in | 2 +-
|
|
libs/icu/icu-src/source/i18n/decNumber.h | 22 +++++++++++++---------
|
|
libs/lua52/Makefile.in | 4 ++--
|
|
libs/lua53/Makefile.in | 4 ++--
|
|
libs/mpfr/Makefile.in | 2 +-
|
|
libs/teckit/TECkit-src/source/Compiler.cpp | 17 ++++++++++-------
|
|
texk/makeindexk/genind.h | 16 +++++++++++++++-
|
|
texk/makeindexk/mkind.h | 20 +++++++++++++++++---
|
|
texk/makeindexk/scanid.h | 16 +++++++++++++++-
|
|
texk/makeindexk/scanst.h | 16 +++++++++++++++-
|
|
10 files changed, 93 insertions(+), 32 deletions(-)
|
|
|
|
--- libs/gmp/Makefile.in
|
|
+++ libs/gmp/Makefile.in 2016-06-07 13:29:33.925651292 +0000
|
|
@@ -480,7 +480,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
|
am__v_lt_0 = --silent
|
|
am__v_lt_1 =
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
|
|
AM_V_CC = $(am__v_CC_@AM_V@)
|
|
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
|
|
am__v_CC_0 = @echo " CC " $@;
|
|
--- libs/icu/icu-src/source/i18n/decNumber.h
|
|
+++ libs/icu/icu-src/source/i18n/decNumber.h 2016-06-07 13:29:33.925651292 +0000
|
|
@@ -56,26 +56,30 @@
|
|
/* For ICU, use one digit per byte, to make it easier to emulate the
|
|
* old DigitList interface on top of a decNumber
|
|
*/
|
|
- #define DECDPUN 1 /* DECimal Digits Per UNit [must be >0 */
|
|
+ #define DECDPUN 3 /* DECimal Digits Per UNit [must be >0 */
|
|
/* and <10; 3 or powers of 2 are best]. */
|
|
|
|
- /* DECNUMDIGITS is the default number of digits that can be held in */
|
|
- /* the structure. If undefined, 1 is assumed and it is assumed */
|
|
- /* that the structure will be immediately followed by extra space, */
|
|
- /* as required. DECNUMDIGITS is always >0. */
|
|
- #if !defined(DECNUMDIGITS)
|
|
- #define DECNUMDIGITS 1
|
|
- #endif
|
|
-
|
|
/* The size (integer data type) of each unit is determined by the */
|
|
/* number of digits it will hold. */
|
|
#if DECDPUN<=2
|
|
#define decNumberUnit uint8_t
|
|
+ #define DECNUMDIGITS 3
|
|
#elif DECDPUN<=4
|
|
#define decNumberUnit uint16_t
|
|
+ #define DECNUMDIGITS 2
|
|
#else
|
|
#define decNumberUnit uint32_t
|
|
+ #define DECNUMDIGITS 1
|
|
#endif
|
|
+
|
|
+ /* DECNUMDIGITS is the default number of digits that can be held in */
|
|
+ /* the structure. If undefined, 1 is assumed and it is assumed */
|
|
+ /* that the structure will be immediately followed by extra space, */
|
|
+ /* as required. DECNUMDIGITS is always >0. */
|
|
+ #if !defined(DECNUMDIGITS)
|
|
+ #define DECNUMDIGITS 1
|
|
+ #endif
|
|
+
|
|
/* The number of units needed is ceil(DECNUMDIGITS/DECDPUN) */
|
|
#define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
|
|
|
|
--- libs/lua53/Makefile.in
|
|
+++ libs/lua53/Makefile.in 2016-06-07 13:29:33.925651292 +0000
|
|
@@ -238,11 +238,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b
|
|
@LUA53_TREE@/src/$(DEPDIR)/lzio.Plo
|
|
am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
|
|
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
|
- $(AM_CFLAGS) $(CFLAGS)
|
|
+ $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
|
|
AM_V_CC = $(am__v_CC_@AM_V@)
|
|
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
|
|
am__v_CC_0 = @echo " CC " $@;
|
|
--- libs/mpfr/Makefile.in
|
|
+++ libs/mpfr/Makefile.in 2016-06-07 13:29:33.925651292 +0000
|
|
@@ -337,7 +337,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
|
am__v_lt_0 = --silent
|
|
am__v_lt_1 =
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
|
|
AM_V_CC = $(am__v_CC_@AM_V@)
|
|
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
|
|
am__v_CC_0 = @echo " CC " $@;
|
|
--- libs/teckit/TECkit-src/source/Compiler.cpp
|
|
+++ libs/teckit/TECkit-src/source/Compiler.cpp 2016-06-07 13:29:51.653318024 +0000
|
|
@@ -1449,13 +1449,16 @@ Compiler::Compiler(const char* txt, UInt
|
|
if (dest != 0) {
|
|
int result = compress2(dest + 8, &destLen, compiledTable, compiledSize, Z_BEST_COMPRESSION);
|
|
if (result == Z_OK) {
|
|
- destLen += 8;
|
|
- dest = (Byte*)realloc(dest, destLen); // shrink dest to fit
|
|
- WRITE(((FileHeader*)dest)->type, kMagicNumberCmp);
|
|
- WRITE(((FileHeader*)dest)->version, compiledSize);
|
|
- free(compiledTable);
|
|
- compiledTable = dest;
|
|
- compiledSize = destLen;
|
|
+ if ((dest = (Byte*)realloc(dest, destLen+8)) != NULL) {
|
|
+ destLen += 8;
|
|
+ WRITE(((FileHeader*)dest)->type, kMagicNumberCmp);
|
|
+ WRITE(((FileHeader*)dest)->version, compiledSize);
|
|
+ free(compiledTable);
|
|
+ compiledTable = dest;
|
|
+ compiledSize = destLen;
|
|
+ }
|
|
+ else
|
|
+ free(dest);
|
|
}
|
|
else
|
|
free(dest);
|
|
--- texk/makeindexk/genind.h
|
|
+++ texk/makeindexk/genind.h 2016-06-07 13:29:37.209589558 +0000
|
|
@@ -25,6 +25,20 @@
|
|
*
|
|
*/
|
|
|
|
+#ifndef __has_idx_printf
|
|
+#define __has_idx_printf
|
|
+#include <stdarg.h>
|
|
+static __inline__ int idx_printf(FILE *stream, const char *format, ...)
|
|
+{
|
|
+ int ret;
|
|
+ va_list ap;
|
|
+ va_start(ap, format);
|
|
+ ret = vfprintf(stream, format, ap);
|
|
+ va_end(ap);
|
|
+ return ret;
|
|
+}
|
|
+#endif
|
|
+
|
|
#define IND_ERROR(F) { \
|
|
if (idx_dot) { \
|
|
fprintf(ilg_fp, "\n"); \
|
|
@@ -45,7 +59,7 @@
|
|
fprintf(ilg_fp, \
|
|
"## Warning (input = %s, line = %d; output = %s, line = %d):\n -- ", \
|
|
curr->fn, curr->lc, ind_fn, ind_lc+1); \
|
|
- fprintf(ilg_fp, F, D); \
|
|
+ idx_printf(ilg_fp, F, D); \
|
|
ind_ec++; \
|
|
}
|
|
|
|
--- texk/makeindexk/mkind.h
|
|
+++ texk/makeindexk/mkind.h 2016-06-07 13:29:37.209589558 +0000
|
|
@@ -244,6 +244,20 @@ extern int mk_getc (FILE *str);
|
|
#define STREQ(A, B) (strcmp(A, B) == 0)
|
|
#define STRNEQ(A, B) (strcmp(A, B) != 0)
|
|
|
|
+#ifndef __has_idx_printf
|
|
+#define __has_idx_printf
|
|
+#include <stdarg.h>
|
|
+static __inline__ int idx_printf(FILE *stream, const char *format, ...)
|
|
+{
|
|
+ int ret;
|
|
+ va_list ap;
|
|
+ va_start(ap, format);
|
|
+ ret = vfprintf(stream, format, ap);
|
|
+ va_end(ap);
|
|
+ return ret;
|
|
+}
|
|
+#endif
|
|
+
|
|
#define MESSAGE(F) { \
|
|
if (verbose) \
|
|
fprintf(stderr, F); \
|
|
@@ -252,8 +266,8 @@ extern int mk_getc (FILE *str);
|
|
|
|
#define MESSAGE1(F, S) { \
|
|
if (verbose) \
|
|
- fprintf(stderr, F, S); \
|
|
- fprintf(ilg_fp, F, S); \
|
|
+ idx_printf(stderr, F, S); \
|
|
+ idx_printf(ilg_fp, F, S); \
|
|
}
|
|
|
|
#if USE_KPATHSEA /* kpathsea defines a different FATAL */
|
|
@@ -271,7 +285,7 @@ extern int mk_getc (FILE *str);
|
|
#endif
|
|
|
|
#define FATAL1(F, S) { \
|
|
- fprintf(stderr, F, S); \
|
|
+ idx_printf(stderr, F, S); \
|
|
fprintf(stderr, USAGE, pgm_fn); \
|
|
EXIT(1); \
|
|
}
|
|
--- texk/makeindexk/scanid.h
|
|
+++ texk/makeindexk/scanid.h 2016-06-07 13:29:37.209589558 +0000
|
|
@@ -112,6 +112,20 @@
|
|
idx_ec++; \
|
|
}
|
|
|
|
+#ifndef __has_idx_printf
|
|
+#define __has_idx_printf
|
|
+#include <stdarg.h>
|
|
+static __inline__ int idx_printf(FILE *stream, const char *format, ...)
|
|
+{
|
|
+ int ret;
|
|
+ va_list ap;
|
|
+ va_start(ap, format);
|
|
+ ret = vfprintf(stream, format, ap);
|
|
+ va_end(ap);
|
|
+ return ret;
|
|
+}
|
|
+#endif
|
|
+
|
|
#define IDX_ERROR1(F, D) { \
|
|
if (idx_dot) { \
|
|
fprintf(ilg_fp, "\n"); \
|
|
@@ -119,7 +133,7 @@
|
|
} \
|
|
fprintf(ilg_fp, "!! Input index error (file = %s, line = %d):\n -- ", \
|
|
idx_fn, idx_lc); \
|
|
- fprintf(ilg_fp, F, D); \
|
|
+ idx_printf(ilg_fp, F, D); \
|
|
idx_ec++; \
|
|
}
|
|
|
|
--- texk/makeindexk/scanst.h
|
|
+++ texk/makeindexk/scanst.h 2016-06-07 13:29:37.209589558 +0000
|
|
@@ -158,6 +158,20 @@
|
|
put_dot = FALSE; \
|
|
}
|
|
|
|
+#ifndef __has_idx_printf
|
|
+#define __has_idx_printf
|
|
+#include <stdarg.h>
|
|
+static __inline__ int idx_printf(FILE *stream, const char *format, ...)
|
|
+{
|
|
+ int ret;
|
|
+ va_list ap;
|
|
+ va_start(ap, format);
|
|
+ ret = vfprintf(stream, format, ap);
|
|
+ va_end(ap);
|
|
+ return ret;
|
|
+}
|
|
+#endif
|
|
+
|
|
#define STY_ERROR1(F, D) { \
|
|
if (idx_dot) { \
|
|
fprintf(ilg_fp, "\n"); \
|
|
@@ -165,7 +179,7 @@
|
|
} \
|
|
fprintf(ilg_fp, "** Input style error (file = %s, line = %d):\n -- ", \
|
|
sty_fn, sty_lc); \
|
|
- fprintf(ilg_fp, F, D); \
|
|
+ idx_printf(ilg_fp, F, D); \
|
|
sty_ec++; \
|
|
put_dot = FALSE; \
|
|
}
|