git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74558 from r-ryantm/auto-update/poppler-utils

poppler: 0.81.0 -> 0.83.0

commitd2da3202eae6cd6e68e7b85aa04863e98141b9b0 authorJan Tojnar <jtojnar@gmail.com> dateTue 3 Dec 2019, 16:50 (7 years ago) parent946c5fbaf963b7
4 files changed+60−18
pkgs/applications/graphics/inkscape/default.nix+10 pkgs/development/libraries/poppler/default.nix+2−2 pkgs/tools/typesetting/pdf2djvu/default.nix+13−1 pkgs/tools/typesetting/tex/texlive/bin.nix+35−15
pkgs/applications/graphics/inkscape/default.nix+10
@@ -25,6 +25,16 @@ stdenv.mkDerivation rec {
2525 url = "https://gitlab.com/inkscape/inkscape/commit/e831b034746f8dc3c3c1b88372751f6dcb974831.diff";
2626 sha256 = "096rdyi6ppjq1h9jwwsm9hb99nggfrfinik8rm23jkn4h2zl01zf";
2727 })
28+ (fetchpatch {
29+ name = "inkscape-poppler_0_82_compat.patch";
30+ url = "https://gitlab.com/inkscape/inkscape/commit/835b6bb62be565efab986d5a3f30a672ad56c7eb.patch";
31+ sha256 = "02c6sxi2w52b885vr3pgani6kvxp9gdqqk2jgiykkdzv70hhrnm7";
32+ })
33+ (fetchpatch {
34+ name = "inkscape-poppler_0_83_compat.patch";
35+ url = "https://gitlab.com/inkscape/inkscape/commit/b5360a807b12d4e8318475ffd0464b84882788b5.patch";
36+ sha256 = "1p44rr2q2i3zkd1y1j7xgdcbgx8yvlq6hq92im8s0bkjby6p5cpz";
37+ })
2838 ];
2939
3040 # Inkscape hits the ARGMAX when linking on macOS. It appears to be
pkgs/development/libraries/poppler/default.nix+2−2
@@ -12,11 +12,11 @@ let
1212in
1313stdenv.mkDerivation rec {
1414 name = "poppler-${suffix}-${version}";
15− version = "0.81.0"; # beware: updates often break cups-filters build
15+ version = "0.83.0"; # beware: updates often break cups-filters build
1616
1717 src = fetchurl {
1818 url = "${meta.homepage}/poppler-${version}.tar.xz";
19− sha256 = "00pykc7nym3xg0wc60awv0i35zwdfyn0igb6jrnb6rsv0c5h4b91";
19+ sha256 = "16vr1g5qsqwyxfnyikqw37i04x9zpp45far2x90c7qbijw6nap38";
2020 };
2121
2222 outputs = [ "out" "dev" ];
pkgs/tools/typesetting/pdf2djvu/default.nix+13−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
1+{ stdenv, fetchurl, fetchpatch, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
22
33stdenv.mkDerivation rec {
44 version = "0.9.14";
@@ -9,6 +9,18 @@ stdenv.mkDerivation rec {
99 sha256 = "05z2bbg54pfsi668fwcjrcr5iz9llf9gprzdsrn6fw5wjv4876zi";
1010 };
1111
12+ patches = [
13+ # fix build with Poppler 0.83
14+ (fetchpatch {
15+ url = "https://github.com/jwilk/pdf2djvu/commit/0aa17bb79dbcdfc249e4841f5b5398e27cfdfd41.patch";
16+ sha256 = "0mr14nz5w7z4ri2556bxkf3cnn2f7dhwsld7csrh6z5qqb7d5805";
17+ })
18+ (fetchpatch {
19+ url = "https://github.com/jwilk/pdf2djvu/commit/27b9e028091a2f370367e9eaf37b4bb1cde87b62.patch";
20+ sha256 = "03apsg1487jl800q8j70hicvg6xsndd593bg7babm4vgivkxb0da";
21+ })
22+ ];
23+
1224 nativeBuildInputs = [ pkgconfig ];
1325
1426 buildInputs = [ djvulibre poppler fontconfig libjpeg ];
pkgs/tools/typesetting/tex/texlive/bin.nix+35−15
@@ -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