summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfmx
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-07-20 07:00:05 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-07-20 07:00:05 +0000
commit89755f7344de571c4b1b7c68e90de39363a4d1ff (patch)
treed735587f7030f0536272048df7a4b53cefc133a4 /Build/source/texk/dvipdfmx
parent713aef9b071ca2b5dd68d014e99897f0e5e2036c (diff)
libs/t1lib + texk/ps2pkm: bug fix and update
git-svn-id: svn://tug.org/texlive/trunk@23187 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx')
-rw-r--r--Build/source/texk/dvipdfmx/ChangeLog6
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.in2
-rw-r--r--Build/source/texk/dvipdfmx/config.h.in9
-rwxr-xr-xBuild/source/texk/dvipdfmx/configure96
-rw-r--r--Build/source/texk/dvipdfmx/configure.ac5
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog7
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn129
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t32
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in1
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c10
-rw-r--r--Build/source/texk/dvipdfmx/version.ac11
11 files changed, 291 insertions, 17 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 3092a4de721..1c7656257fe 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * version.ac: New file defining the dvipdfmx version.
+ * configure.ac: Adapt. (AC_TYPE_UINT32_T) Portability fix for AIX.
+ * dpxcrypt.c: Use headers as in configure test for uint32_t.
+
2011-06-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* dpxfile.c (exec_spawn): Do not quote execvp() arguments.
diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in
index 30ba81bad8d..a172349f1d2 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -65,7 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-libs.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
- $(top_srcdir)/../../m4/lt~obsolete.m4 \
+ $(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
diff --git a/Build/source/texk/dvipdfmx/config.h.in b/Build/source/texk/dvipdfmx/config.h.in
index 04308cf405c..0a7d84f2ff1 100644
--- a/Build/source/texk/dvipdfmx/config.h.in
+++ b/Build/source/texk/dvipdfmx/config.h.in
@@ -244,6 +244,11 @@
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+#undef _UINT32_T
+
/* Define to 0x200406L if your libkpathsea supports enc formats. */
#undef __TDS_VERSION__
@@ -258,3 +263,7 @@
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+#undef uint32_t
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure
index 0e902573f26..d18b2ae8f08 100755
--- a/Build/source/texk/dvipdfmx/configure
+++ b/Build/source/texk/dvipdfmx/configure
@@ -2028,6 +2028,59 @@ $as_echo "$ac_res" >&6; }
} # ac_fn_c_check_decl
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ # Order is important - never check a type that is potentially smaller
+ # than half of the expected target width.
+ for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+ 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ case $ac_type in #(
+ uint$2_t) :
+ eval "$3=yes" ;; #(
+ *) :
+ eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+ break
+fi
+ done
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_uintX_t
+
# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
# --------------------------------------------
# Tries to find the compile-time value of EXPR in a program that includes
@@ -12700,39 +12753,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
if ${kpse_cv_warning_cflags+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "x$enable_compiler_warnings" = xno; then
+ if test "x$GCC" = xyes; then
kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+ case `$CC -dumpversion` in #(
3.4.* | 4.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
*) :
;;
esac
-case `$CC -dumpversion` in #(
+ case `$CC -dumpversion` in #(
3.[234].* | 4.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
*) :
;;
esac
-if test "x$enable_compiler_warnings" != xmin; then
- kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
- if test "x$enable_compiler_warnings" != xyes; then
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
- case `$CC -dumpversion` in #(
+ if test "x$enable_compiler_warnings" != xmin; then
+ kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+ if test "x$enable_compiler_warnings" != xyes; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+ case `$CC -dumpversion` in #(
3.4.* | 4.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
*) :
;;
esac
- if test "x$enable_compiler_warnings" != xmax; then
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+ if test "x$enable_compiler_warnings" != xmax; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+ fi
fi
fi
fi
+elif test "x$enable_compiler_warnings" = xno; then
+ kpse_cv_warning_cflags=
else
kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
fi
@@ -13278,6 +13334,20 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
+ no|yes) ;; #(
+ *)
+
+$as_echo "#define _UINT32_T 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint32_t $ac_cv_c_uint32_t
+_ACEOF
+;;
+ esac
+
ac_fn_c_check_decl "$LINENO" "timezone" "ac_cv_have_decl_timezone" "#include <time.h>
"
diff --git a/Build/source/texk/dvipdfmx/configure.ac b/Build/source/texk/dvipdfmx/configure.ac
index 296d81c4e23..52e0374ca95 100644
--- a/Build/source/texk/dvipdfmx/configure.ac
+++ b/Build/source/texk/dvipdfmx/configure.ac
@@ -1,12 +1,12 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-m4_define([dvipdfmx_version], [20110311])[]dnl using unmodified dvipdfmx source tree
+m4_include([version.ac])[] dnl define dvipdfmx_version
AC_INIT([dvipdfmx], dvipdfmx_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([dvipdfmx-]dvipdfmx_version[/src/dvipdfmx.c])
@@ -30,6 +30,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
AC_STRUCT_TM
AC_STRUCT_TIMEZONE
AC_C_BIGENDIAN
+AC_TYPE_UINT32_T
AC_CHECK_DECL([timezone],
[AC_DEFINE([HAVE_TIMEZONE], 1,
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
index 837aa9d0cc8..63c9fbefd97 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-02-exec_spawn (new): Bug fix for exec_spawn() from
+ Akira Kakuto <kakuto@fuk.kindai.ac.jp> and Peter Breitenlohner.
+
+ * patch-03-uint32_t (new): Portability fix (for AIX).
+
2011-05-31 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-01-manpage: Adapted to modified extractbb manpage.
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn
new file mode 100644
index 00000000000..e49c44b0ef4
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn
@@ -0,0 +1,129 @@
+diff -ur dvipdfmx-20110311.orig/src/dpxfile.c dvipdfmx-20110311/src/dpxfile.c
+--- dvipdfmx-20110311.orig/src/dpxfile.c 2011-03-11 04:10:51.000000000 +0100
++++ dvipdfmx-20110311/src/dpxfile.c 2011-06-06 09:50:11.000000000 +0200
+@@ -154,10 +154,14 @@
+ {
+ char **cmdv, **qv;
+ char *p, *pp;
+- char buf[512];
+- int i, ret;
++ char buf[1024];
++ int i, ret = -1;
+
+- if (!cmd || !*cmd)
++ if (!cmd)
++ return -1;
++ while (*cmd == ' ' || *cmd == '\t')
++ cmd++;
++ if (*cmd == '\0')
+ return -1;
+ i = 0;
+ p = cmd;
+@@ -166,19 +170,16 @@
+ i++;
+ p++;
+ }
+- cmdv = (char **) xmalloc (sizeof (char *) * (i+2));
++ cmdv = xcalloc (i + 2, sizeof (char *));
+ p = cmd;
+ qv = cmdv;
+- while (*p == ' ' || *p == '\t')
+- p++;
+ while (*p) {
+ pp = buf;
+ if (*p == '"') {
+ p++;
+ while (*p != '"') {
+ if (*p == '\0') {
+- free (cmdv);
+- return -1;
++ goto done;
+ }
+ *pp++ = *p++;
+ }
+@@ -187,40 +188,41 @@
+ p++;
+ while (*p != '\'') {
+ if (*p == '\0') {
+- free (cmdv);
+- return -1;
++ goto done;
+ }
+ *pp++ = *p++;
+ }
+ p++;
+ } else {
+- while (*p != ' ' && *p != '\t' && *p)
+-#ifdef WIN32
++ while (*p != ' ' && *p != '\t' && *p) {
+ if (*p == '\'') {
+- *pp++ = '\"';
++ p++;
++ while (*p != '\'') {
++ if (*p == '\0') {
++ goto done;
++ }
++ *pp++ = *p++;
++ }
+ p++;
+ } else {
+ *pp++ = *p++;
+ }
+-#else
+- *pp++ = *p++;
+-#endif
++ }
+ }
+ *pp = '\0';
+- if ((pp = strchr (buf, ' ')) || (pp = strchr (buf, '\t'))) {
+ #ifdef WIN32
++ if (strchr (buf, ' ') || strchr (buf, '\t'))
+ *qv = concat3 ("\"", buf, "\"");
+-#else
+- *qv = concat3 ("'", buf, "'");
++ else
+ #endif
+- } else {
+- *qv = concat (buf, "");
+- }
++ *qv = xstrdup (buf);
++/*
++ fprintf(stderr,"\n%s", *qv);
++*/
+ while (*p == ' ' || *p == '\t')
+ p++;
+ qv++;
+ }
+- *qv = NULL;
+ #ifdef WIN32
+ ret = spawnvp (_P_WAIT, *cmdv, (const char* const*) cmdv);
+ #else
+@@ -229,7 +231,7 @@
+ ret = -1;
+ else if (i == 0) {
+ if (execvp (*cmdv, cmdv))
+- ret = -1;
++ _exit (-1);
+ } else {
+ if (wait (&ret) == i) {
+ ret = (WIFEXITED (ret) ? WEXITSTATUS (ret) : -1);
+@@ -238,14 +240,13 @@
+ }
+ }
+ #endif
++done:
+ qv = cmdv;
+- if (qv) {
+- while (*qv) {
+- free (*qv);
+- qv++;
+- }
+- free (cmdv);
++ while (*qv) {
++ free (*qv);
++ qv++;
+ }
++ free (cmdv);
+ return ret;
+ }
+
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t
new file mode 100644
index 00000000000..0827d040027
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t
@@ -0,0 +1,32 @@
+diff -ur dvipdfmx-20110311.orig/configure.in dvipdfmx-20110311/configure.in
+--- dvipdfmx-20110311.orig/configure.in 2011-03-11 04:14:28.000000000 +0100
++++ dvipdfmx-20110311/configure.in 2011-07-13 10:10:18.000000000 +0200
+@@ -95,6 +95,7 @@
+ AC_STRUCT_TM
+ AC_STRUCT_TIMEZONE
+ AC_C_BIGENDIAN
++AC_TYPE_UINT32_T
+
+ AC_CHECK_SIZEOF(char)
+ AC_CHECK_SIZEOF(short)
+diff -ur dvipdfmx-20110311.orig/src/dpxcrypt.c dvipdfmx-20110311/src/dpxcrypt.c
+--- dvipdfmx-20110311.orig/src/dpxcrypt.c 2011-03-11 04:12:23.000000000 +0100
++++ dvipdfmx-20110311/src/dpxcrypt.c 2011-06-15 19:16:14.000000000 +0200
+@@ -24,8 +24,16 @@
+ #include "config.h"
+ #endif
+
+-#include <stdint.h>
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
+ #include <string.h>
++#ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++#endif
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
+
+ #include "dpxcrypt.h"
+
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in
index 5cf4542d705..6b91ec6c025 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in
@@ -95,6 +95,7 @@ AC_TYPE_SIZE_T
AC_STRUCT_TM
AC_STRUCT_TIMEZONE
AC_C_BIGENDIAN
+AC_TYPE_UINT32_T
AC_CHECK_SIZEOF(char)
AC_CHECK_SIZEOF(short)
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c
index 4bad1620485..b58829db9e4 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c
@@ -24,8 +24,16 @@
#include "config.h"
#endif
-#include <stdint.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#include <string.h>
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
#include "dpxcrypt.h"
diff --git a/Build/source/texk/dvipdfmx/version.ac b/Build/source/texk/dvipdfmx/version.ac
new file mode 100644
index 00000000000..8ae01365ae5
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/version.ac
@@ -0,0 +1,11 @@
+dnl
+dnl Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl This file is free software; the copyright holder
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl --------------------------------------------------------
+dnl
+dnl m4-include this file to define the current dvipdfmx version
+m4_define([dvipdfmx_version], [20110311])