diff --git a/source-configure.dif b/source-configure.dif index 334cb50..da00919 100644 --- a/source-configure.dif +++ b/source-configure.dif @@ -93,3 +93,25 @@ ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/ ## configure options and TL libraries required for gsftopk # Check whether --enable-gsftopk was given. +--- texk/dvipdfm-x/configure.ac ++++ texk/dvipdfm-x/configure.ac 2014-01-13 11:10:27.000000000 +0000 +@@ -6,7 +6,7 @@ dnl This file is free software; the co + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + dnl +-AC_INIT([dvipdfm-x], [20130405], [tex-k@tug.org]) ++AC_INIT([dvipdfmx], [20130405], [tex-k@tug.org]) + AC_PREREQ([2.65]) + AC_CONFIG_SRCDIR([src/dvipdfmx.c]) + AC_CONFIG_AUX_DIR([../../build-aux]) +--- texk/dvipdfm-x/configure ++++ texk/dvipdfm-x/configure 2014-01-13 11:11:08.000000000 +0000 +@@ -7883,7 +7883,7 @@ fi + + + # Define the identity of the package. +- PACKAGE='dvipdfm-x' ++ PACKAGE='dvipdfmx' + VERSION='20130405' + + diff --git a/source-dvipdfmx.dif b/source-dvipdfmx.dif new file mode 100644 index 0000000..e184911 --- /dev/null +++ b/source-dvipdfmx.dif @@ -0,0 +1,52 @@ +--- texk/dvipdfm-x/src/dpxcrypt.c ++++ texk/dvipdfm-x/src/dpxcrypt.c 2014-01-13 11:02:13.742235821 +0000 +@@ -289,7 +289,7 @@ void MD5_final (unsigned char *outbuf, M + #define X(a) do { *p++ = hd->a; *p++ = hd->a >> 8; \ + *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while (0) + #else /* little endian */ +-#define X(a) do { *(unsigned long *)p = (*hd).a ; p += 4; } while (0) ++#define X(a) do { *(uint32_t *)p = (*hd).a ; p += sizeof(uint32_t); } while (0) + #endif + X(A); + X(B); +--- texk/dvipdfm-x/src/dpxcrypt.h ++++ texk/dvipdfm-x/src/dpxcrypt.h 2014-01-13 11:02:13.658236115 +0000 +@@ -24,10 +24,11 @@ + #define _DPXCRYPT_H_ + + #include ++#include + + /* libgcrypt md5 */ + typedef struct { +- unsigned long A,B,C,D; /* chaining variables */ ++ uint32_t A,B,C,D; /* chaining variables */ + unsigned long nblocks; + unsigned char buf[64]; + int count; +--- texk/dvipdfm-x/xsrc/dpxcrypt.c ++++ texk/dvipdfm-x/xsrc/dpxcrypt.c 2014-01-13 11:02:33.490235748 +0000 +@@ -289,7 +289,7 @@ void MD5_final (unsigned char *outbuf, M + #define X(a) do { *p++ = hd->a; *p++ = hd->a >> 8; \ + *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while (0) + #else /* little endian */ +-#define X(a) do { *(unsigned long *)p = (*hd).a ; p += 4; } while (0) ++#define X(a) do { *(uint32_t *)p = (*hd).a ; p += sizeof(uint32_t); } while (0) + #endif + X(A); + X(B); +--- texk/dvipdfm-x/xsrc/dpxcrypt.h ++++ texk/dvipdfm-x/xsrc/dpxcrypt.h 2014-01-13 11:02:33.406235303 +0000 +@@ -24,10 +24,11 @@ + #define _DPXCRYPT_H_ + + #include ++#include + + /* libgcrypt md5 */ + typedef struct { +- unsigned long A,B,C,D; /* chaining variables */ ++ uint32_t A,B,C,D; /* chaining variables */ + unsigned long nblocks; + unsigned char buf[64]; + int count; diff --git a/texlive.changes b/texlive.changes index b699940..7321705 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jan 13 11:15:56 UTC 2014 - werner@suse.de + +- Add upstream patch source-dvipdfmx.dif + to avoid trouble with big endian +- Extend patch source-configure.dif to change package name for + dvipdfmx (bnc#858412) + ------------------------------------------------------------------- Fri Dec 20 08:40:42 UTC 2013 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index d0b85d9..24306b1 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1,7 +1,7 @@ # # spec file for package texlive # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -220,6 +220,8 @@ Patch19: source-dvipng.dif Patch20: source-asymptote.dif # PATCH-FIX-UPSTREAM xdvi -sourceposition exits with Fatal error Patch21: source-bnc856363.dif +# PATCH-FIX-UPSTREAM Do not be fooled on big endian and +Patch22: source-dvipdfmx.dif # PATCH-FIX-UPSTREAM build with perl 5.18.0 Patch40: biber-dev.patch # PATCH-EXTEND-UPSTREAM Use always system CA certificates @@ -2279,6 +2281,7 @@ This package is required by the package texlive-biber-bin. %patch19 -p0 -b .dvipng %patch20 -p0 -b .asymptote %patch21 -p0 -b .bnc856363 +%patch22 -p0 -b .be %patch0 %if %{with buildbiber} pushd ../biblatex-biber-*