diff options
| author | Will Dietz <w@wdtz.org> | 2020-01-21 07:54:37 -0600 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-02-03 09:58:44 -0800 |
| commit | fc7e4c926755f47edcda488eaea0c7fb82ff5af9 (patch) | |
| tree | 36854dfc56a8d37fa4e2cf7fc16f54ab0f60ecbe /pkgs/tools/typesetting | |
| parent | 276e6e607c12a65616e6c52d0bbb4cbe5b5c717e (diff) | |
| download | nixlib-fc7e4c926755f47edcda488eaea0c7fb82ff5af9.tar nixlib-fc7e4c926755f47edcda488eaea0c7fb82ff5af9.tar.gz nixlib-fc7e4c926755f47edcda488eaea0c7fb82ff5af9.tar.bz2 nixlib-fc7e4c926755f47edcda488eaea0c7fb82ff5af9.tar.lz nixlib-fc7e4c926755f47edcda488eaea0c7fb82ff5af9.tar.xz nixlib-fc7e4c926755f47edcda488eaea0c7fb82ff5af9.tar.zst nixlib-fc7e4c926755f47edcda488eaea0c7fb82ff5af9.zip | |
texlive: poppler 0.84 fix, patch from gentoo
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/poppler84.patch | 43 |
2 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 9eaa81e144b6..03394e1eb4c4 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -68,6 +68,9 @@ let done cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc + + # poppler 0.84 compat fixups, use 0.83 files otherwise + patch -p1 -i ${./poppler84.patch} ''; # remove when removing synctex-missing-header.patch diff --git a/pkgs/tools/typesetting/tex/texlive/poppler84.patch b/pkgs/tools/typesetting/tex/texlive/poppler84.patch new file mode 100644 index 000000000000..02dc9e2413d3 --- /dev/null +++ b/pkgs/tools/typesetting/tex/texlive/poppler84.patch @@ -0,0 +1,43 @@ +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 + |