diff options
author | TBK <tbk@jjtc.eu> | 2020-03-02 22:20:45 +0100 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2020-03-03 02:25:50 -0300 |
commit | ea50f2c839f76332357ee94e36e88082197bfdb1 (patch) | |
tree | b6494888b2207a45a59d48d3f3aafc30ef4649e4 /community/texlive | |
parent | 1643cb7078f412daec4bc4ac8a9f2652fe52c203 (diff) | |
download | aports-ea50f2c839f76332357ee94e36e88082197bfdb1.tar.bz2 aports-ea50f2c839f76332357ee94e36e88082197bfdb1.tar.xz |
community/texlive: add poppler patches
Diffstat (limited to 'community/texlive')
-rw-r--r-- | community/texlive/APKBUILD | 18 | ||||
-rw-r--r-- | community/texlive/poppler-084.patch | 42 | ||||
-rw-r--r-- | community/texlive/poppler-086.patch (renamed from community/texlive/poppler-076.patch) | 109 |
3 files changed, 61 insertions, 108 deletions
diff --git a/community/texlive/APKBUILD b/community/texlive/APKBUILD index a59ce5d0c0..e1b99b7ffa 100644 --- a/community/texlive/APKBUILD +++ b/community/texlive/APKBUILD @@ -4,15 +4,13 @@ pkgname=texlive pkgver=20190410 pkgrel=7 pkgdesc="Comprehensive TeX document production system" -url="http://tug.org/texlive/" +url="https://tug.org/texlive/" arch="all" license="GPL" depends="perl texmf-dist>=2018.50036" -depends_dev="" makedepends="freetype-dev libpng-dev poppler-dev icu-dev harfbuzz-dev cairo-dev pixman-dev zziplib-dev libpaper-dev graphite2-dev libxmu-dev fontconfig-dev libxaw-dev motif-dev" -install="" triggers="$pkgname.trigger=/usr/share/texmf-dist" subpackages=" $pkgname-static @@ -24,11 +22,14 @@ subpackages=" $pkgname-xetex:xetex $pkgname-luatex:lua " +# Source for poppler patches - https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk source=" ftp://ftp.tug.org/texlive/historic/${pkgver:0:4}/texlive-$pkgver-source.tar.xz - poppler-076.patch + poppler-084.patch + poppler-086.patch " -builddir="$srcdir"/texlive-${pkgver}-source + +builddir="$srcdir"/texlive-$pkgver-source options="!check" # No unit tests provided _luatex="dvilualatex dviluatex lualollipop lualatex" @@ -39,7 +40,7 @@ _xetex="xelatex xelollipop" _dvi="afm2tfm bbox dvigif dvipng dvips epsffit extractres includeres ps2eps psbook psjoin psnup psresize psselect pstops" # Each poppler version recently broke the API, so special treatment is required -_poppler_ver=0.76.0 +_poppler_ver=0.86.0 prepare() { default_prepare @@ -164,7 +165,7 @@ dvi() { install -d -m 0755 "$subpkgdir"/usr/bin for tool in $_dvi; do - mv "${pkgdir}/usr/bin/${tool}" "${subpkgdir}/usr/bin/" + mv "$pkgdir/usr/bin/$tool" "$subpkgdir/usr/bin/" done } @@ -219,4 +220,5 @@ xdvi() { } sha512sums="7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e texlive-20190410-source.tar.xz -46d7423bd3de21cf94a041bbffb93bdd071e1eb78a36e047909c943aeaf4bfa2832d3c2c353cc208daad501eb7d08f850dd0873a2f5135a3d0938e141f2e4baf poppler-076.patch" +7fe31112bb860c742289a465e7eb4ba8672261ca022fb377cfdbcbd00d7bb39ac744144505ce73bcefa07656cd3f470aa0e3bda05b5018accbd1549f2a974b20 poppler-084.patch +87673c5ce942059adb75b6d47af605dc9d6e29080268e2557ec63f2292f639dd60c2539c649ae9b0137f379c37b5adffb3695055317710477866946c238ab5d5 poppler-086.patch" diff --git a/community/texlive/poppler-084.patch b/community/texlive/poppler-084.patch new file mode 100644 index 0000000000..5466b26b91 --- /dev/null +++ b/community/texlive/poppler-084.patch @@ -0,0 +1,42 @@ +From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada <zlogene@gentoo.org> +Date: Tue, 31 Dec 2019 11:29:30 +0300 +Subject: [PATCH] poppler-0.84 compat + +Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html + +Signed-off-by: Mikle Kolyada <zlogene@gentoo.org> +--- + texk/web2c/pdftexdir/utils.c | 1 - + texk/web2c/xetexdir/XeTeX_ext.c | 3 +++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c +index c93a8781..6f866e76 100644 +--- a/texk/web2c/pdftexdir/utils.c ++++ b/texk/web2c/pdftexdir/utils.c +@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. + #include "ptexlib.h" + #include <png.h> + #ifdef POPPLER_VERSION +-#include <poppler-config.h> + #define xpdfVersion POPPLER_VERSION + #define xpdfString "poppler" + #else +diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c +index 4968ee41..0aee4ee3 100644 +--- a/texk/web2c/xetexdir/XeTeX_ext.c ++++ b/texk/web2c/xetexdir/XeTeX_ext.c +@@ -38,7 +38,10 @@ authorization from the copyright holders. + + #include <w2c/config.h> + ++#ifndef POPPLER_VERSION + #include <poppler-config.h> ++#endif ++ + #include <png.h> + #include <zlib.h> + #include <graphite2/Font.h> +-- +2.24.1 diff --git a/community/texlive/poppler-076.patch b/community/texlive/poppler-086.patch index cc2f016994..9a66b7b6a8 100644 --- a/community/texlive/poppler-076.patch +++ b/community/texlive/poppler-086.patch @@ -1,77 +1,6 @@ -commit 473d82b2e33621d51f5c961baf8b42cdb4c955eb -Author: Akira Kakuto <kakuto@fuk.kindai.ac.jp> -Date: Fri May 3 04:05:07 2019 +0000 - - support system poppler 0.76.[01] - - 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 <kakuto@w32tex.org> -+ -+ * pdftosrc-poppler0.76.0.cc, pdftoepdf-poppler0.76.0.cc: -+ Added to support system poppler 0.76.[01]. -+ - 2019-04-07 Karl Berry <karl@freefriends.org> - - * 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..e7614aa5c --- /dev/null -+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc -@@ -0,0 +1,1113 @@ ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.86.0.cc +@@ -0,0 +1,1110 @@ +/* +Copyright 1996-2017 Han The Thanh, <thanh@pdftex.org> + @@ -96,7 +25,7 @@ index 000000000..e7614aa5c +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.76.0 or newer versions. ++The poppler should be 0.86.0 or newer versions. +POPPLER_VERSION should be defined. +*/ + @@ -797,7 +726,7 @@ index 000000000..e7614aa5c +#endif + // initialize + if (!isInit) { -+ globalParams = new GlobalParams(); ++ globalParams.reset(new GlobalParams()); + globalParams->setErrQuiet(false); + isInit = true; + } @@ -831,7 +760,7 @@ index 000000000..e7614aa5c + if (page_name) { + // get page by name + GString name(page_name); -+ LinkDest *link = pdf_doc->doc->findDest(&name); ++ const std::unique_ptr<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(); @@ -839,7 +768,6 @@ index 000000000..e7614aa5c + if (page_num == 0) + pdftex_fail("PDF inclusion: destination is not a page <%s>", + page_name); -+ delete link; + } else { + // get page by number + if (page_num <= 0 || page_num > epdf_num_pages) @@ -1181,28 +1109,11 @@ index 000000000..e7614aa5c + n = p->next; + delete_document(p); + } -+ // see above for globalParams -+ 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 <http://www.gnu.org/licenses/>. - 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..3599b5318 --- /dev/null -+++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc -@@ -0,0 +1,206 @@ ++++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.86.0.cc +@@ -0,0 +1,205 @@ +/* +Copyright 1996-2017 Han The Thanh, <thanh@pdftex.org> + @@ -1284,7 +1195,7 @@ index 000000000..3599b5318 + exit(1); + } + fileName = new GString(argv[1]); -+ globalParams = new GlobalParams(); ++ globalParams.reset(new GlobalParams()); + doc = new PDFDoc(fileName); + if (!doc->isOk()) { + fprintf(stderr, "Invalid PDF file\n"); @@ -1305,7 +1216,7 @@ index 000000000..3599b5318 + if (objnum == 0) { + srcStream = catalogDict.dictLookup("SourceObject"); + static char const_SourceFile[] = "SourceFile"; -+ if (!srcStream.isStream(const_SourceFile)) { ++ if (!srcStream.isDict(const_SourceFile)) { + fprintf(stderr, "No SourceObject found\n"); + exit(1); + } @@ -1407,6 +1318,4 @@ index 000000000..3599b5318 + fprintf(stderr, "Cross-reference table extracted to %s\n", outname); + fclose(outfile); + delete doc; -+ delete globalParams; +} - |