@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch
1+{ stdenv, fetchurl, fetchpatch, patchutils
22, texlive
33, zlib, libiconv, libpng, libX11
44, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
@@ -27,27 +27,47 @@ let
2727 };
2828
2929 patches = [
30− ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast (stdenv.lib.getVersion poppler) "0.76") [
31− (fetchpatch {
32− name = "pdftex-poppler0.76.patch";
33− url = "https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk/pdftex-poppler0.76.patch?id=8cb784073cfd2299a6c301ce7bb0d89126a47f4e";
34− sha256 = "04x7myzysranddzjifxhahl7gjy407zkiyzfs5l9cbwzp6pqh7gh";
35−
36− includes = [
37− "texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc"
38− "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc"
39− ];
40− })
4130 ];
4231
4332 postPatch = let
44− popplerSuffix = if (stdenv.lib.versionAtLeast (stdenv.lib.getVersion poppler) "0.76") then "-poppler0.76.0" else "-poppler0.72.0";
33+ # The source compatible with Poppler ${popplerVersion} not yet available in TeXLive ${year}
34+ # so we need to use files introduced in https://www.tug.org/svn/texlive?view=revision&revision=52959
35+ popplerVersion = "0.83.0";
36+ pdftoepdf = let
37+ revert-pdfmajorversion = fetchpatch {
38+ name = "pdftoepdf-revert-pdfmajorversion.patch";
39+ url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc?view=patch&r1=52953&r2=52952&pathrev=52953";
40+ sha256 = "19jiv5xbvnfdk8lj6yd6mdxgs8f313a4dwg8svjj90dd35kjcfh8";
41+ revert = true;
42+ postFetch = ''
43+ # The default file, changed by this patch, contains a branch for vendored Poppler
44+ # The version-specific file replaces the section with an error, so we need to drop that part from the patch.
45+ # Fortunately, there is not anything else in the patch after #else.
46+ sed '/ #else/q' $out > "$tmpfile"
47+ ${patchutils}/bin/recountdiff "$tmpfile" > "$out"
48+ '';
49+ };
50+ in fetchurl {
51+ name = "pdftoepdf-poppler${popplerVersion}.cc";
52+ url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co";
53+ sha256 = "0pngvw1jgnm4cqskrzf5a3z8rj4ssl10007n3wbblj50hvvzjph3";
54+ postFetch = ''
55+ # The trunk added some extra arguments to certain functions so we need to revert that
56+ # https://www.tug.org/svn/texlive?view=revision&revision=52953
57+ patch $out < ${revert-pdfmajorversion}
58+ '';
59+ };
60+ pdftosrc = fetchurl {
61+ name = "pdftosrc-poppler${popplerVersion}.cc";
62+ url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co";
63+ sha256 = "0iq2cmwvf2lxy32sygrafwqgcwvvbdnvxm5l3mrg9cb2a1g06380";
64+ };
4565 in ''
4666 for i in texk/kpathsea/mktex*; do
4767 sed -i '/^mydir=/d' "$i"
4868 done
49− cp -pv texk/web2c/pdftexdir/pdftoepdf{${popplerSuffix},}.cc
50− cp -pv texk/web2c/pdftexdir/pdftosrc{${popplerSuffix},}.cc
69+ cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc
70+ cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc
5171 '';
5272
5373 # remove when removing synctex-missing-header.patch