1 |
aballier 17/06/20 13:04:41 |
2 |
|
3 |
Modified: series |
4 |
Added: 080_all_pdftoepdf-c++11.patch |
5 |
Log: |
6 |
add clangfix to tl patchset, by Fabian Groffen |
7 |
|
8 |
Revision Changes Path |
9 |
1.3 src/patchsets/texlive/2017/texlive-core/series |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2017/texlive-core/series?rev=1.3&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2017/texlive-core/series?rev=1.3&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2017/texlive-core/series?r1=1.2&r2=1.3 |
14 |
|
15 |
Index: series |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2017/texlive-core/series,v |
18 |
retrieving revision 1.2 |
19 |
retrieving revision 1.3 |
20 |
diff -u -r1.2 -r1.3 |
21 |
--- series 9 Jun 2017 12:53:27 -0000 1.2 |
22 |
+++ series 20 Jun 2017 13:04:41 -0000 1.3 |
23 |
@@ -5,3 +5,4 @@ |
24 |
050_all_latex2man_predictable_tmp.patch |
25 |
060_all_luatex_zlib.patch |
26 |
070_all_luatex_ggc7_align.patch |
27 |
+080_all_pdftoepdf-c++11.patch |
28 |
|
29 |
|
30 |
|
31 |
1.1 src/patchsets/texlive/2017/texlive-core/080_all_pdftoepdf-c++11.patch |
32 |
|
33 |
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 |
34 |
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 |
35 |
|
36 |
Index: 080_all_pdftoepdf-c++11.patch |
37 |
=================================================================== |
38 |
pdftoepdf.w: work around generation removing too much whitespace |
39 |
|
40 |
The error observed with Clang 3.9.1 (x86_64-apple-darwin16.6.0) is |
41 |
|
42 |
texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w:74:34: |
43 |
error: |
44 |
invalid suffix on literal; C++11 requires a space between literal and |
45 |
identifier [-Wreserved-user-defined-literal] |
46 |
snprintf(ck,PDF_CHECKSUM_SIZE,"%"PRIu64"_%"PRIu64,(uint64_t)size,(uint64... |
47 |
^ |
48 |
|
49 |
Adding newlines does the trick, because the generation keeps them, and |
50 |
the compiler as suck sees whitespace between the literal and identifier. |
51 |
This is of course a kludge, the original code is correct, the generator |
52 |
should probably be fixed. |
53 |
|
54 |
|
55 |
Index: texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w |
56 |
=================================================================== |
57 |
--- texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w |
58 |
+++ texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w |
59 |
@@ -71,7 +71,11 @@ static char *get_file_checksum(const cha |
60 |
ck = (char *) malloc(PDF_CHECKSUM_SIZE); |
61 |
if (ck == NULL) |
62 |
formatted_error("pdf inclusion","out of memory while processing '%s'", a); |
63 |
- snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) size,(uint64_t) mtime); |
64 |
+ snprintf(ck, PDF_CHECKSUM_SIZE, "%" |
65 |
+PRIu64 |
66 |
+ "_%" |
67 |
+PRIu64 |
68 |
+, (uint64_t) size,(uint64_t) mtime); |
69 |
} else { |
70 |
switch (fe) { |
71 |
case FE_FAIL: |