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

Accepting request 732257 from home:mgorse:branches:Publishing:TeXLive

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/732257
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=329
This commit is contained in:
Dr. Werner Fink 2019-09-23 07:53:56 +00:00 committed by Git OBS Bridge
parent 588e077edd
commit 63b01720a0
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source-poppler0.79.0.patch
View File

@ -35,10 +35,10 @@ index 78fc2dd..682bcdf 100644
for (n = 0; n < nObjects; ++n) { for (n = 0; n < nObjects; ++n) {
obj1 = parser->getObj(); obj1 = parser->getObj();
obj2 = 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 index 13c3bd5..ea78179 100644
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.79.0.cc --- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.79.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, @@ -760,8 +760,8 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
LinkDest *link = pdf_doc->doc->findDest(&name); LinkDest *link = pdf_doc->doc->findDest(&name);
if (link == 0 || !link->isOk()) if (link == 0 || !link->isOk())

8
texlive.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 20 20:12:25 UTC 2019 - Michael Gorse <mgorse@suse.com>
- 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 <jslaby@suse.com> Thu Aug 8 10:27:36 UTC 2019 - Jiri Slaby <jslaby@suse.com>

8
texlive.spec
View File

@ -3664,9 +3664,12 @@ popd
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.69.0}}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.69.0}}%{!?pkg_vcmp:0}
%patch57 -p1 -b .popplerdict %patch57 -p1 -b .popplerdict
%endif %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} %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 %endif
if pkg-config --atleast-version=0.59 poppler if pkg-config --atleast-version=0.59 poppler
@ -3685,7 +3688,6 @@ then
test -e "$old" && mv -fv $old $old.oldpoppler || : test -e "$old" && mv -fv $old $old.oldpoppler || :
mv -fv $cc $old mv -fv $cc $old
done done
pver=$(pkg-config --modversion poppler)
for cc in $(find -name "*-poppler${pver}.cc") for cc in $(find -name "*-poppler${pver}.cc")
do do
test -e "$cc" || continue test -e "$cc" || continue