diff --git a/source-poppler0.79.0.patch b/source-poppler0.79.0.patch new file mode 100644 index 0000000..76bd5a2 --- /dev/null +++ b/source-poppler0.79.0.patch @@ -0,0 +1,55 @@ +From 3c5802812e0ae918ba5979e6a16abe39d0e2d7bf Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Thu, 8 Aug 2019 11:42:38 +0200 +Subject: [PATCH] poppler 0.79 + +--- + texk/web2c/pdftexdir/pdftosrc-newpoppler.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc +index 78fc2dd..682bcdf 100644 +--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc ++++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc +@@ -157,12 +157,11 @@ int main(int argc, char *argv[]) + (e->type == xrefEntryFree ? "f" : "n")); + else { // e->offset is the object number of the object stream + Stream *str; +- Lexer *lexer; + Parser *parser; + Object objStr, obj1, obj2; + int nObjects, first, n; + int localOffset = 0; +- Guint firstOffset; ++ unsigned int firstOffset; + + objStr = xref->fetch(e->offset, 0); + assert(objStr.isStream()); +@@ -175,8 +174,7 @@ int main(int argc, char *argv[]) + // parse the header: object numbers and offsets + objStr.streamReset(); + str = new EmbedStream(objStr.getStream(), Object(objNull), true, first); +- lexer = new Lexer(xref, str); +- parser = new Parser(xref, lexer, false); ++ parser = new Parser(xref, str, false); + for (n = 0; n < nObjects; ++n) { + obj1 = parser->getObj(); + obj2 = parser->getObj(); +diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.79.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.79.0.cc +index 13c3bd5..ea78179 100644 +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.79.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.79.0.cc +@@ -760,8 +760,8 @@ read_pdf_info(char *image_name, char *page_name, int page_num, + LinkDest *link = pdf_doc->doc->findDest(&name); + if (link == 0 || !link->isOk()) + pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); +- Ref ref = link->getPageRef(); +- page_num = pdf_doc->doc->getCatalog()->findPage(ref.num, ref.gen); ++ const Ref ref = link->getPageRef(); ++ page_num = pdf_doc->doc->getCatalog()->findPage(ref); + if (page_num == 0) + pdftex_fail("PDF inclusion: destination is not a page <%s>", + page_name); +-- +2.21.0 + diff --git a/texlive.changes b/texlive.changes index 306b401..4b90840 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 8 10:27:36 UTC 2019 - Jiri Slaby + +- source-poppler0.79.0.patch: fix build with poppler 0.79 + ------------------------------------------------------------------- Thu Jul 4 06:35:49 UTC 2019 - Dr. Werner Fink diff --git a/texlive.spec b/texlive.spec index bdc4f94..8775f4d 100644 --- a/texlive.spec +++ b/texlive.spec @@ -271,6 +271,8 @@ Patch55: source-fix-bool-poppler.patch Patch56: source-poppler-use-std_string.patch # PATCH-FIX-SUSE Fix leaking string copy Patch57: source-poppler-fix-dict-memleak.patch +# PATCH-FIX-TEXLIVE +Patch58: source-poppler0.79.0.patch Prefix: %{_bindir} Provides: pdfjam = %{version} Obsoletes: pdfjam < %{version} @@ -3662,6 +3664,10 @@ popd %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.69.0}}%{!?pkg_vcmp:0} %patch57 -p1 -b .popplerdict %endif +cp ./texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ./texk/web2c/pdftexdir/pdftoepdf-poppler0.79.0.cc +%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.73.0}}%{!?pkg_vcmp:0} +%patch58 -p1 -b .poppler79 +%endif if pkg-config --atleast-version=0.59 poppler then