pool/texlive
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 598470 from Publishing:TeXLive

Browse Source 
- Add patch source-lcdf-typetools.dif to help gcc8 (boo#1087075)

- Update source-poppler-0.59.1.dif to fix compilation with poppler
  0.63. Dict objects are now uncopyable, make a const reference
  instead.

OBS-URL: https://build.opensuse.org/request/show/598470
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2018-04-20 15:25:01 +00:00 committed by Git OBS Bridge
commit dec13799f2
4 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source-lcdf-typetools.dif Normal file
View File

@ -0,0 +1,20 @@
--- texk/lcdf-typetools/lcdf-typetools-src/libefont/t1rw.cc
+++ texk/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;
}

4
source-poppler-0.59.1.dif
View File

@ -200,8 +200,8 @@ Akira
+*/
+// begin modification
+ groupDict = pageDict->lookup("Group");
+ Dict dic1 = page->getGroup();
+ Dict dic2 = groupDict.getDict();
+ const Dict& dic1 = page->getGroup();
+ const Dict& dic2 = groupDict.getDict();
+ // replace dic2 in groupDict with dic1
+ l = dic2.getLength();
+ for (i = 0; i < l; i++) {

12
texlive.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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
- Update source-poppler-0.59.1.dif to fix compilation with poppler
0.63. Dict objects are now uncopyable, make a const reference
instead.
-------------------------------------------------------------------
Thu Mar 15 08:54:09 UTC 2018 - werner@suse.de

5
texlive.spec
View File

@ -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