Merge pull request #101016 from veprbl/pr/texlive_post2020_cleanup

texlive: minor cleanups
This commit is contained in:
Dmitry Kalinkin 2020-10-22 20:04:01 -04:00 committed by GitHub
commit e05f484129
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 68 deletions

View File

@ -2,7 +2,7 @@
, texlive , texlive
, zlib, libiconv, libpng, libX11 , zlib, libiconv, libpng, libX11
, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
, perl, perlPackages, python2Packages, pkgconfig, autoreconfHook , perl, perlPackages, python2Packages, pkgconfig
, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
, cairo, pixman, xorg, clisp, biber, xxHash , cairo, pixman, xorg, clisp, biber, xxHash
, makeWrapper, shortenPerlShebang , makeWrapper, shortenPerlShebang
@ -34,10 +34,6 @@ let
cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc
''; '';
# remove when removing synctex-missing-header.patch
preAutoreconf = "pushd texk/web2c";
postAutoreconf = "popd";
configureFlags = [ configureFlags = [
"--with-banner-add=/NixOS.org" "--with-banner-add=/NixOS.org"
"--disable-missing" "--disable-native-texlive-build" "--disable-missing" "--disable-native-texlive-build"
@ -71,11 +67,11 @@ core = stdenv.mkDerivation rec {
pname = "texlive-bin"; pname = "texlive-bin";
inherit version; inherit version;
inherit (common) src prePatch preAutoreconf postAutoreconf; inherit (common) src prePatch;
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
/*teckit*/ zziplib poppler mpfr gmp /*teckit*/ zziplib poppler mpfr gmp
pixman gd freetype libpng libpaper zlib pixman gd freetype libpng libpaper zlib
@ -161,7 +157,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
pname = "texlive-core-big.bin"; pname = "texlive-core-big.bin";
inherit version; inherit version;
inherit (common) src prePatch preAutoreconf postAutoreconf; inherit (common) src prePatch;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
@ -429,7 +425,7 @@ xdvi = stdenv.mkDerivation {
} # un-indented } # un-indented
// stdenv.lib.optionalAttrs (!stdenv.isDarwin) # see #20062 // stdenv.lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062)
{ {
xindy = stdenv.mkDerivation { xindy = stdenv.mkDerivation {

View File

@ -1,16 +0,0 @@
diff a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
--- a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
+++ b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
@@ -107,8 +107,7 @@ const char *PSInterpreter::PSDEFS =
"dmode sysexec<</Normal 0/Compatible 0/Multiply 1/Screen 2/Overlay 3/SoftLight "
"4/HardLight 5/ColorDodge 6/ColorBurn 7/Darken 8/Lighten 9/Difference 10/Exclus"
"ion 11/Hue 12/Saturation 13/Color 14/Luminosity 15/CompatibleOverprint 16>>exc"
-"h get 1(setblendmode)prcmd}def/@pdfpagecount{GS_PDF_ProcSet begin pdfdict begi"
-"n(r)file pdfopen begin pdfpagecount currentdict pdfclose end end end}def/@pdfp"
-"agebox{GS_PDF_ProcSet begin pdfdict begin(r)file pdfopen begin dup dup 1 lt ex"
-"ch pdfpagecount gt or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse curre"
-"ntdict pdfclose end end end}def DELAYBIND{.bindnow}if ";
+"h get 1(setblendmode)prcmd}def/@pdfpagecount{(r)file runpdfbegin pdfpagecount "
+"runpdfend}def/@pdfpagebox{(r)file runpdfbegin dup dup 1 lt exch pdfpagecount g"
+"t or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse runpdfend}def DELAYBIN"
+"D{.bindnow}if ";

View File

@ -1,43 +0,0 @@
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