diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-17 18:38:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-17 18:38:20 +0200 |
commit | 42f2d370a53de7e4e72e1f8bb1e77300f4547be1 (patch) | |
tree | 137b215b47db0a6d9a7b757f2d9040610404266f /pkgs/applications/office | |
parent | 8afc0daa2982cb7f3732bd357ccdc9dcc0367d89 (diff) | |
parent | 9a4ee0c6331cc7d865bfc598f8bcf1eb31899ab1 (diff) |
Merge pull request #81955 from r-ryantm/auto-update/poppler-glib
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/scribus/unstable.nix | 48 |
1 files changed, 30 insertions, 18 deletions
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index faff45c8884a7..d6084c0f37e7c 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -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; |