rpms/texlive
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import texlive-20180414-20.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-12-09 08:17:36 +00:00 committed by Stepan Oksanichenko
parent 97abd2292c
commit f972d1f5d4
4 changed files with 155488 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.texlive.metadata
View File

@ -356,10 +356,10 @@ c8dc5278bc3236d67392cc48d57dbd418ad7b65e SOURCES/lualatex-math.doc.tar.xz
66db9d59cee313f1d9a5a12ed49e0ff7352524ef SOURCES/lualatex-math.tar.xz
3eb41f1bdcd85b4f9e343a3f3f768f9cfc2e990d SOURCES/lualibs.doc.tar.xz
aa647be6d40cb4f8a205e6a0d4c72e59f7d3dec7 SOURCES/lualibs.source.tar.xz
6dee23b12f227a53ddb27510891d6ea7a759bc64 SOURCES/lualibs.tar.xz
26edaa475405e2b0d8bb40784f5f61bfb11e7d00 SOURCES/lualibs.tar.xz
40de22da707ad55182a2c7b31857fa22a9089366 SOURCES/luaotfload.doc.tar.xz
db45b9d60c1dea91d9504643aa3756d0f335391b SOURCES/luaotfload.source.tar.xz
86e081e21c3820e180eb868ee4de71c5ac6e3c84 SOURCES/luaotfload.tar.xz
bc32d9e53b120f39a2e33f80a0b0eef677d47180 SOURCES/luaotfload.tar.xz
9e0a8234fa33130033471c70ffde9bc9bc43ac97 SOURCES/luatex.doc.tar.xz
25e59d11497fb0edefa29160004212f4d12bd832 SOURCES/luatex.tar.xz
766ea89503ff3dbc6acc845b98cc40b56435d3da SOURCES/luatex85.doc.tar.xz

225
SOURCES/texlive-20180414-poppler-0.63.patch
View File

@ -1,225 +0,0 @@
From b14146667f4cd6cbc5d5821c88e47096df3c78b5 Mon Sep 17 00:00:00 2001
From: Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Date: Sat, 28 Apr 2018 07:36:22 +0000
Subject: support poppler-0.64.0
git-svn-id: svn://tug.org/texlive/trunk@47470 c570f23f-e606-0410-a88d-b1316a301751
---
Build/source/texk/web2c/luatexdir/image/pdftoepdf.w | 4 ++--
Build/source/texk/web2c/luatexdir/lua/lepdflib.cc | 4 ++--
Build/source/texk/web2c/pdftexdir/ChangeLog | 5 +++++
Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc | 14 +++++++-------
Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc | 2 +-
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.w b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.w
index 7ba2973..d697959 100644
--- Build/source/texk/web2c/luatexdir/image/pdftoepdf.w
+++ Build/source/texk/web2c/luatexdir/image/pdftoepdf.w
@@ -472,10 +472,10 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj)
break;
*/
case objString:
- copyString(pdf, obj->getString());
+ copyString(pdf, (GooString *)obj->getString());
break;
case objName:
- copyName(pdf, obj->getName());
+ copyName(pdf, (char *)obj->getName());
break;
case objNull:
pdf_add_null(pdf);
diff --git a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
index a16bf3b..32bcdab 100644
--- Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
+++ Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -674,7 +674,7 @@ static int m_##in##_##function(lua_State * L) \
uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
if (uin->pd != NULL && uin->pd->pc != uin->pc) \
pdfdoc_changed_error(L); \
- gs = ((in *) uin->d)->function(); \
+ gs = (GooString *)((in *) uin->d)->function(); \
if (gs != NULL) \
lua_pushlstring(L, gs->getCString(), gs->getLength()); \
else \
@@ -1813,7 +1813,7 @@ static int m_Object_getString(lua_State * L)
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
if (((Object *) uin->d)->isString()) {
- gs = ((Object *) uin->d)->getString();
+ gs = (GooString *)((Object *) uin->d)->getString();
lua_pushlstring(L, gs->getCString(), gs->getLength());
} else
lua_pushnil(L);
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index c022bc2..f4af035 100644
--- Build/source/texk/web2c/pdftexdir/ChangeLog
+++ Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * pdftoepdf-newpoppler.cc, pdftosrc-newpoppler.cc:
+ Support poppler 0.64.0.
+
2018-04-14 Karl Berry <karl@tug.org>
* TeX Live 2018 release, pdftex 1.40.19.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
index 10fea29..750579d 100644
--- Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
+++ Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
@@ -290,7 +290,7 @@ static void copyName(char *s)
static void copyDictEntry(Object * obj, int i)
{
Object obj1;
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
obj1 = obj->dictGetValNF(i);
copyObject(&obj1);
@@ -355,7 +355,7 @@ static void copyProcSet(Object * obj)
if (!procset.isName())
pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
procset.getTypeName());
- copyName(procset.getName());
+ copyName((char *)procset.getName());
pdf_puts(" ");
}
pdf_puts("]\n");
@@ -418,7 +418,7 @@ static void copyFont(char *tag, Object * fontRef)
&& fontdescRef.isRef()
&& fontdesc.isDict()
&& embeddableFont(&fontdesc)
- && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
+ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
// round /StemV value, since the PDF input is a float
// (see Font Descriptors in PDF reference), but we only store an
// integer, since we don't want to change the struct.
@@ -427,7 +427,7 @@ static void copyFont(char *tag, Object * fontRef)
charset = fontdesc.dictLookup("CharSet");
if (!charset.isNull() &&
charset.isString() && is_subsetable(fontmap))
- epdf_mark_glyphs(fd, charset.getString()->getCString());
+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
else
embed_whole_font(fd);
addFontDesc(fontdescRef.getRef(), fd);
@@ -456,7 +456,7 @@ static void copyFontResources(Object * obj)
if (fontRef.isRef())
copyFont(obj->dictGetKey(i), &fontRef);
else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
copyObject(&fontRef);
}
@@ -565,7 +565,7 @@ static void copyObject(Object * obj)
} else if (obj->isNum()) {
pdf_printf("%s", convertNumToPDF(obj->getNum()));
} else if (obj->isString()) {
- s = obj->getString();
+ s = (GooString *)obj->getString();
p = s->getCString();
l = s->getLength();
if (strlen(p) == (unsigned int) l) {
@@ -589,7 +589,7 @@ static void copyObject(Object * obj)
pdf_puts(">");
}
} else if (obj->isName()) {
- copyName(obj->getName());
+ copyName((char *)obj->getName());
} else if (obj->isNull()) {
pdf_puts("null");
} else if (obj->isArray()) {
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
index 4e2bcad..0db154b 100644
--- Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "No SourceName found\n");
exit(1);
}
- outname = srcName.getString()->getCString();
+ outname = (char *)srcName.getString()->getCString();
// We cannot free srcName, as objname shares its string.
// srcName.free();
} else if (objnum > 0) {
--- Build/source/texk/web2c/pdftexdir/pdftosrc.cc
+++ Build/source/texk/web2c/pdftexdir/pdftosrc.cc
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "No SourceName found\n");
exit(1);
}
- outname = srcName.getString()->getCString();
+ outname = (char *)srcName.getString()->getCString();
// We cannot free srcName, as objname shares its string.
// srcName.free();
} else if (objnum > 0) {
--- Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -290,7 +290,7 @@ static void copyName(char *s)
static void copyDictEntry(Object * obj, int i)
{
Object obj1;
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
obj1 = obj->dictGetValNF(i);
copyObject(&obj1);
@@ -355,7 +355,7 @@ static void copyProcSet(Object * obj)
if (!procset.isName())
pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
procset.getTypeName());
- copyName(procset.getName());
+ copyName((char *)procset.getName());
pdf_puts(" ");
}
pdf_puts("]\n");
@@ -418,7 +418,7 @@ static void copyFont(char *tag, Object * fontRef)
&& fontdescRef.isRef()
&& fontdesc.isDict()
&& embeddableFont(&fontdesc)
- && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
+ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
// round /StemV value, since the PDF input is a float
// (see Font Descriptors in PDF reference), but we only store an
// integer, since we don't want to change the struct.
@@ -427,7 +427,7 @@ static void copyFont(char *tag, Object * fontRef)
charset = fontdesc.dictLookup("CharSet");
if (!charset.isNull() &&
charset.isString() && is_subsetable(fontmap))
- epdf_mark_glyphs(fd, charset.getString()->getCString());
+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
else
embed_whole_font(fd);
addFontDesc(fontdescRef.getRef(), fd);
@@ -456,7 +456,7 @@ static void copyFontResources(Object * obj)
if (fontRef.isRef())
copyFont(obj->dictGetKey(i), &fontRef);
else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
copyObject(&fontRef);
}
@@ -565,7 +565,7 @@ static void copyObject(Object * obj)
} else if (obj->isNum()) {
pdf_printf("%s", convertNumToPDF(obj->getNum()));
} else if (obj->isString()) {
- s = obj->getString();
+ s = (GooString *)obj->getString();
p = s->getCString();
l = s->getLength();
if (strlen(p) == (unsigned int) l) {
@@ -589,7 +589,7 @@ static void copyObject(Object * obj)
pdf_puts(">");
}
} else if (obj->isName()) {
- copyName(obj->getName());
+ copyName((char *)obj->getName());
} else if (obj->isNull()) {
pdf_puts("null");
} else if (obj->isArray()) {
--
cgit v1.1

155471
SOURCES/texlive-20180414-poppler-20.11.0-luatex.patch Normal file
View File

File diff suppressed because it is too large Load Diff

24
SPECS/texlive.spec
View File

@ -15,7 +15,7 @@
Name: texlive
Version: %{source_date}
Release: 19%{?dist}
Release: 20%{?dist}
Epoch: %{tl_epoch}
Summary: TeX formatting system
Group: Applications/Publishing
@ -864,8 +864,6 @@ Patch7: texlive-20180414-new-poppler.patch
Patch8: texlive-20180414-xml.patch
# python3 support and mangling shebang
Patch9: texlive-2017-python3.patch
# fix for poppler-0.63
Patch10: texlive-20180414-poppler-0.63.patch
# annocheck distro flag failures
Patch11: texlive-20180414-annocheck.patch
# CVE-2018-17407
@ -875,6 +873,8 @@ Patch13: texlive-20180414-covscan.patch
# Since we need to include tlmgr.pl for texconfig
# lets try to keep people from shooting themselves with it
Patch14: texlive-20180414-tlmgr-ignore-warning.patch
# fix for poppler-20.11.0
Patch15: texlive-20180414-poppler-20.11.0-luatex.patch
%description
The TeX Live software distribution offers a complete TeX system for a
@ -23782,11 +23782,13 @@ xz -dc %{SOURCE0} | tar x
%patch5 -p0
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
%patch7 -p1 -b .newpoppler
%patch10 -p1 -b .poppler-0.63.0
%endif
%patch11 -p1 -b .annocheck
%patch12 -p1
%patch13 -p1
pushd source
%patch15 -p1
popd
# Setup copies of the licenses
for l in `unxz -c %{SOURCE2} | tar t`; do
ln -s %{_texdir}/licenses/$l $l
@ -23799,7 +23801,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11 -fno-strict-aliasing -Werror=format-s
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
export LDFLAGS="%{build_ldflags}"
%endif
cd source
cd source/texk/web2c/
autoreconf -vfi
cd ../..
PREF=`pwd`/inst
mkdir -p work
cd work
@ -24602,10 +24606,9 @@ chmod 644 %{buildroot}%{_texdir}/texmf-dist/doc/xelatex/xepersian/*.py
# fix mangling shebang in scrips
pushd %{buildroot}%{_texdir}/texmf-dist/
sed -i '1d' scripts/latex2man/latex2man
for f in oberdiek/pdfatfi.pl luaotfload/mkimport \
luaotfload/mktests luaotfload/luaotfload-tool.lua \
luaotfload/mkstatus luaotfload/mkglyphlist \
luaotfload/mkcharacters tex4ht/mk4ht.pl epstopdf/epstopdf.pl \
for f in oberdiek/pdfatfi.pl \
luaotfload/luaotfload-tool.lua \
tex4ht/mk4ht.pl epstopdf/epstopdf.pl \
texlive/mktexlsr.pl texlive/rungs.tlu \
texlive/updmap.pl texlive/test-tlpdb.tlu texlive/texconf.tlu \
texlive/fmtutil.pl ; do
@ -27185,6 +27188,9 @@ fi
%doc %{_texdir}/texmf-dist/doc/context/
%changelog
* Mon Nov 09 2020 Than Ngo <than@redhat.com> - 7:20180414-20
- Resolves: #1889802, adapted texlive for poppler-20.10.0
* Thu Jul 23 2020 Than Ngo <than@redhat.com> - 7:20180414-19
- Related: #1829136, add missing mtxrun for tlmgr