diff --git a/source-poppler0.79.0.patch b/source-poppler0.79.0.patch index 76bd5a2..faf4f4d 100644 --- a/source-poppler0.79.0.patch +++ b/source-poppler0.79.0.patch @@ -35,10 +35,10 @@ index 78fc2dd..682bcdf 100644 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 +diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc index 13c3bd5..ea78179 100644 ---- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.79.0.cc -+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.79.0.cc +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.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()) diff --git a/texlive.changes b/texlive.changes index 4b90840..bf95f38 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 20 20:12:25 UTC 2019 - Michael Gorse + +- Ensure that pdftoepdf-poppler-0.75.0.cc is used for any version + of poppler >= 0.79.0. Fixes the build with 0.80.0. +- Update source-poppler0.79.0.patch, since we now patch before + copying. + ------------------------------------------------------------------- Thu Aug 8 10:27:36 UTC 2019 - Jiri Slaby diff --git a/texlive.spec b/texlive.spec index 8775f4d..914cd95 100644 --- a/texlive.spec +++ b/texlive.spec @@ -3664,9 +3664,12 @@ 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 +%patch58 -p1 -b .poppler75 +%endif +pver=$(pkg-config --modversion poppler) +%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.79.0}}%{!?pkg_vcmp:0} +cp ./texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ./texk/web2c/pdftexdir/pdftoepdf-poppler${pver}.cc %endif if pkg-config --atleast-version=0.59 poppler @@ -3685,7 +3688,6 @@ then test -e "$old" && mv -fv $old $old.oldpoppler || : mv -fv $cc $old done - pver=$(pkg-config --modversion poppler) for cc in $(find -name "*-poppler${pver}.cc") do test -e "$cc" || continue