From 7e87b948b477d0887b61ed54e2ba9ba3aa77da7c Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Tue, 25 Jun 2019 20:14:18 +0200 Subject: libre/texlive-bin: updated to 2019.51075 --- libre/texlive-bin/pdftex-poppler0.76.patch | 94 ++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 12 deletions(-) (limited to 'libre/texlive-bin/pdftex-poppler0.76.patch') diff --git a/libre/texlive-bin/pdftex-poppler0.76.patch b/libre/texlive-bin/pdftex-poppler0.76.patch index 3997cd5c2..784fe0c93 100644 --- a/libre/texlive-bin/pdftex-poppler0.76.patch +++ b/libre/texlive-bin/pdftex-poppler0.76.patch @@ -1,15 +1,74 @@ -commit 67290f70d8143b18f24ffd6a1827def9bdc21108 +commit 473d82b2e33621d51f5c961baf8b42cdb4c955eb Author: Akira Kakuto -Date: Thu Dec 6 23:31:33 2018 +0000 +Date: Fri May 3 04:05:07 2019 +0000 - support system poppler 0.72.0 + support system poppler 0.76.[01] - git-svn-id: svn://tug.org/texlive/trunk/Build/source@49336 c570f23f-e606-0410-a88d-b1316a301751 - + git-svn-id: svn://tug.org/texlive/trunk/Build/source@50960 c570f23f-e606-0410-a88d-b1316a301751 +diff --git a/texk/web2c/pdftexdir/ChangeLog b/texk/web2c/pdftexdir/ChangeLog +index 8af394342..0a43b927c 100644 +--- a/texk/web2c/pdftexdir/ChangeLog ++++ b/texk/web2c/pdftexdir/ChangeLog +@@ -1,3 +1,8 @@ ++2019-05-03 Akira Kakuto ++ ++ * pdftosrc-poppler0.76.0.cc, pdftoepdf-poppler0.76.0.cc: ++ Added to support system poppler 0.76.[01]. ++ + 2019-04-07 Karl Berry + + * TeX Live 2019. +diff --git a/texk/web2c/pdftexdir/NEWS b/texk/web2c/pdftexdir/NEWS +index c21898395..ddc933be4 100644 +--- a/texk/web2c/pdftexdir/NEWS ++++ b/texk/web2c/pdftexdir/NEWS +@@ -28,13 +28,15 @@ pdfTeX 3.14159265-2.6-1.40.19 (TeX Live 2018) (April 14, 2018) + Provide new files: + pdftosrc-newpoppler.cc for poppler-0.59.0 upto poppler-0.70.1. + pdftosrc-poppler0.71.0 for poppler-0.71.0. +- pdftosrc-poppler0.72.0 for poppler-0.72.0 and newer. ++ pdftosrc-poppler0.72.0 for poppler-0.72.0 upto poppler-0.75.0. ++ pdftosrc-poppler0.76.0 for poppler-0.76.0 and newer. + pdftoepdf-poppler0.68.0.cc for poppler-0.59.0 upto poppler-0.68.0. + pdftoepdf-poppler0.69.0.cc for poppler-0.69.0. + pdftoepdf-poppler0.70.0.cc for poppler-0.70.0 and poppler-0.70.1. + pdftoepdf-poppler0.71.0.cc for poppler-0.71.0. + pdftoepdf-poppler0.72.0.cc for poppler-0.72.0 upto poppler-0.74.0. +- pdftoepdf-poppler0.75.0.cc for poppler-0.75.0 and newer. ++ pdftoepdf-poppler0.75.0.cc for poppler-0.75.0. ++ pdftoepdf-poppler0.76.0.cc for poppler-0.76.0 and newer. + Note that pdftosrc-*.cc and pdftoepdf-*.cc should be + renamed as pdftosrc.cc, and pdftoepdf.cc, respectively, before + compilation. +diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc +index 630d3366d..6617cfe8b 100644 +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc +@@ -23,6 +23,7 @@ https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk + by Arch Linux. A little modifications are made to avoid a crash for + some kind of pdf images, such as figure_missing.pdf in gnuplot. + The poppler should be 0.72.0 or newer versions. ++It is tested upto the poppler 0.74.0. + POPPLER_VERSION should be defined. + */ + +diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc +index 13c3bd5ef..30f8fed58 100644 +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc +@@ -22,7 +22,7 @@ This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at + https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk + by Arch Linux. A little modifications are made to avoid a crash for + some kind of pdf images, such as figure_missing.pdf in gnuplot. +-The poppler should be 0.75.0 or newer versions. ++The poppler should be 0.75.0. + POPPLER_VERSION should be defined. + */ + diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc new file mode 100644 -index 000000000..630d3366d +index 000000000..e7614aa5c --- /dev/null +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc @@ -0,0 +1,1113 @@ @@ -37,7 +96,7 @@ index 000000000..630d3366d +https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk +by Arch Linux. A little modifications are made to avoid a crash for +some kind of pdf images, such as figure_missing.pdf in gnuplot. -+The poppler should be 0.72.0 or newer versions. ++The poppler should be 0.76.0 or newer versions. +POPPLER_VERSION should be defined. +*/ + @@ -880,7 +939,7 @@ index 000000000..630d3366d + pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) epdf_selected_page); + } + if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_INFODICT) == 0) { -+ info = pdf_doc->doc->getDocInfoNF(); ++ info = pdf_doc->doc->getDocInfoNF().copy(); + if (info.isRef()) { + // the info dict must be indirect (PDF Ref p. 61) + pdf_printf("/%s.InfoDict ", pdfkeyprefix); @@ -1126,12 +1185,24 @@ index 000000000..630d3366d + delete globalParams; + } +} +diff --git a/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc b/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc +index d4e247ef6..34bad9ccf 100644 +--- a/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc ++++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc +@@ -21,6 +21,7 @@ with this program. If not, see . + This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at + https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk + by Arch Linux. The poppler should be 0.72.0 or newer versions. ++It is tested upto the poppler 0.75.0. + POPPLER_VERSION should be defined. + */ + diff --git a/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc b/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc new file mode 100644 -index 000000000..6089e68d9 +index 000000000..3599b5318 --- /dev/null +++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc -@@ -0,0 +1,207 @@ +@@ -0,0 +1,206 @@ +/* +Copyright 1996-2017 Han The Thanh, + @@ -1154,7 +1225,7 @@ index 000000000..6089e68d9 +/* +This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at +https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk -+by Arch Linux. The poppler should be 0.72.0 or newer versions. ++by Arch Linux. The poppler should be 0.76.0 or newer versions. +POPPLER_VERSION should be defined. +*/ + @@ -1308,7 +1379,6 @@ index 000000000..6089e68d9 + // 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, str, false); + for (n = 0; n < nObjects; ++n) { + obj1 = parser->getObj(); -- cgit v1.2.3