ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81955 from r-ryantm/auto-update/poppler-glib

Browse Source
This commit is contained in:
Jan Tojnar 2020-04-17 18:38:20 +02:00 committed by GitHub
commit 42f2d370a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkgs/applications/office/scribus/unstable.nix
View File

@ -44,28 +44,40 @@ mkDerivation rec {
};
patches = [
# Poppler patches from
# https://github.com/scribusproject/scribus/commits/master/scribus/plugins/import/pdf
# fix build with Poppler 0.82
(
fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
}
)
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
})
# fix build with Poppler 0.83
(
fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
}
)
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
})
# fix build with Poppler 0.84
# TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version
(
fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch";
sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y";
}
)
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch";
sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y";
})
# Formating changes needed for the Poppler 0.86 patch to apply
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch";
sha256 = "qwmVAZVYCijLNMVGwnOLJE8223vcRwPWfEvNKiDjw5o=";
})
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch";
sha256 = "sha256-OY+EIiGBTg2aIAmZOnkI8DPZVZYqFZAKnD7ychge1Dw=";
includes = [ "scribus/plugins/import/pdf/*" ];
})
# fix build with Poppler 0.86
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch";
sha256 = "51z+BYKhbH8a9dFph8X60NGpiogSb+5tOhW2d+m/X9M=";
})
];
enableParallelBuilding = true;

6
pkgs/development/libraries/poppler/default.nix
View File

@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
version = "0.85.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
version = "0.87.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "0jyr036scdly13hx5dxmsqp2p3jifc29h2by51msw0ih6bmpbj1b";
sha256 = "b2ArnCTC0FeAvpPnMGIBAS5BRZ8om4J5onp5QxrUFQ4=";
};
outputs = [ "out" "dev" ];
@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ];
maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members;
};
}

23
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -26,10 +26,7 @@ let
sha256 = "1dfps39q6bdr1zsbp9p74mvalmy3bycihv19sb9c6kg30kprz8nj";
};
patches = [
];
postPatch = let
prePatch = let
# The source compatible with Poppler ${popplerVersion} not yet available in TeXLive ${year}
# so we need to use files introduced in https://www.tug.org/svn/texlive?view=revision&revision=52959
popplerVersion = "0.83.0";
@ -68,11 +65,19 @@ 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}
'';
patches = [
# poppler 0.84 compat fixups, use 0.83 files otherwise
./poppler84.patch
(fetchpatch {
name = "texlive-poppler-0.86.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin&id=60244e41bb6f1501e8ed1fc9e6b7ba8d3f283398";
sha256 = "0pdvhaqc3zgz7hp0x3a4qs0nh26fkvgmr6w1cjljqhp1nyiw2f1l";
})
];
# remove when removing synctex-missing-header.patch
preAutoreconf = "pushd texk/web2c";
postAutoreconf = "popd";
@ -108,7 +113,7 @@ core = stdenv.mkDerivation rec {
pname = "texlive-bin";
inherit version;
inherit (common) src patches postPatch preAutoreconf postAutoreconf;
inherit (common) src patches prePatch preAutoreconf postAutoreconf;
outputs = [ "out" "doc" ];
@ -201,7 +206,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
pname = "texlive-core-big.bin";
inherit version;
inherit (common) src patches postPatch preAutoreconf postAutoreconf;
inherit (common) src patches prePatch preAutoreconf postAutoreconf;
hardeningDisable = [ "format" ];