aballier 17/06/20 13:04:41 Modified: series Added: 080_all_pdftoepdf-c++11.patch Log: add clangfix to tl patchset, by Fabian Groffen
Revision Changes Path 1.3 src/patchsets/texlive/2017/texlive-core/series file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2017/texlive-core/series?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2017/texlive-core/series?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2017/texlive-core/series?r1=1.2&r2=1.3 Index: series =================================================================== RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2017/texlive-core/series,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- series 9 Jun 2017 12:53:27 -0000 1.2 +++ series 20 Jun 2017 13:04:41 -0000 1.3 @@ -5,3 +5,4 @@ 050_all_latex2man_predictable_tmp.patch 060_all_luatex_zlib.patch 070_all_luatex_ggc7_align.patch +080_all_pdftoepdf-c++11.patch 1.1 src/patchsets/texlive/2017/texlive-core/080_all_pdftoepdf-c++11.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2017/texlive-core/080_all_pdftoepdf-c++11.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2017/texlive-core/080_all_pdftoepdf-c++11.patch?rev=1.1&content-type=text/plain Index: 080_all_pdftoepdf-c++11.patch =================================================================== pdftoepdf.w: work around generation removing too much whitespace The error observed with Clang 3.9.1 (x86_64-apple-darwin16.6.0) is texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w:74:34: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] snprintf(ck,PDF_CHECKSUM_SIZE,"%"PRIu64"_%"PRIu64,(uint64_t)size,(uint64... ^ Adding newlines does the trick, because the generation keeps them, and the compiler as suck sees whitespace between the literal and identifier. This is of course a kludge, the original code is correct, the generator should probably be fixed. Index: texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w =================================================================== --- texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w +++ texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w @@ -71,7 +71,11 @@ static char *get_file_checksum(const cha ck = (char *) malloc(PDF_CHECKSUM_SIZE); if (ck == NULL) formatted_error("pdf inclusion","out of memory while processing '%s'", a); - snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) size,(uint64_t) mtime); + snprintf(ck, PDF_CHECKSUM_SIZE, "%" +PRIu64 + "_%" +PRIu64 +, (uint64_t) size,(uint64_t) mtime); } else { switch (fe) { case FE_FAIL:
