From e83c42c0a658c102840a295de2cdd8dc96e325b8942bdc8cb48182df6df12035 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 19 Apr 2018 09:07:47 +0000 Subject: [PATCH] Add temporary patch source-lcdf-typetools.dif for boo#1087075 OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=285 --- source-lcdf-typetools.dif | 20 ++++++++++++++++++++ texlive.changes | 5 +++++ texlive.spec | 5 ++++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 source-lcdf-typetools.dif diff --git a/source-lcdf-typetools.dif b/source-lcdf-typetools.dif new file mode 100644 index 0000000..6dd7e83 --- /dev/null +++ b/source-lcdf-typetools.dif @@ -0,0 +1,20 @@ +--- lcdf-typetools/lcdf-typetools-src/libefont/t1rw.cc ++++ lcdf-typetools/lcdf-typetools-src/libefont/t1rw.cc 2018-02-22 22:32:26.288398000 +0000 +@@ -117,7 +117,7 @@ inline int + Type1Reader::eexec(int c) + { + unsigned char answer = (unsigned char)(c ^ (_r >> 8)); +- _r = (((unsigned char)c + _r) * t1C1 + t1C2) & 0xFFFF; ++ _r = (((unsigned char)c + _r) * (uint32_t) t1C1 + t1C2) & 0xFFFF; + return answer; + } + +@@ -439,7 +439,7 @@ inline unsigned char + Type1Writer::eexec(int p) + { + unsigned char c = ((unsigned char)p ^ (_r >> 8)) & 0xFF; +- _r = ((c + _r) * t1C1 + t1C2) & 0xFFFF; ++ _r = ((c + _r) * (uint32_t) t1C1 + t1C2) & 0xFFFF; + return c; + } + diff --git a/texlive.changes b/texlive.changes index cb9001c..894f49a 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 19 09:05:23 UTC 2018 - werner@suse.de + +- Add patch source-lcdf-typetools.dif to help gcc8 (boo#1087075) + ------------------------------------------------------------------- Mon Apr 9 10:57:54 UTC 2018 - idonmez@suse.com diff --git a/texlive.spec b/texlive.spec index b290cdf..d330ba8 100644 --- a/texlive.spec +++ b/texlive.spec @@ -19,7 +19,7 @@ %define texlive_version 2017 %define texlive_previous 2016 %define texlive_release 20170520 -%define texlive_noarch 136 +%define texlive_noarch 137 %define texlive_source texlive-20170520-source %define __perl_requires %{nil} @@ -251,6 +251,8 @@ Patch13: source-x11r7.dif # PATCH-EXTEND-UPSTREAM source-maxpath.dif Patch14: source-maxpath.dif Patch15: source-overflow.dif +# PATCH-FIX-UPSTREAM source-lcdf-typetools.dif +Patch16: source-lcdf-typetools.dif Patch17: source-64.dif Patch18: source-a2ping.dif Patch19: source-dvipng.dif @@ -3411,6 +3413,7 @@ This package is required by the package texlive-biber-bin. %patch13 -p0 -b .x11r7 %patch14 -p0 -b .maxpath %patch15 -p0 -b .overflow +%patch16 -p0 -b .lcdf %patch17 -p0 -b .64 %patch18 -p0 -b .a2p %patch19 -p0 -b .dvipng