public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scribusUnstable: 1.5.5 -> 1.5.6.1

Browse Source
This commit is contained in:
Justin Humm 2020-11-11 11:39:49 +01:00 committed by erictapen
parent 0a5ed777f0
commit b605b989c5
1 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
, podofo , podofo
, poppler , poppler
, poppler_data , poppler_data
, python2 , python3
, qtbase , qtbase
, qtimageformats , qtimageformats
, qttools , qttools
@ -26,7 +26,7 @@
}: }:
let let
pythonEnv = python2.withPackages ( pythonEnv = python3.withPackages (
ps: [ ps: [
ps.pillow ps.pillow
ps.tkinter ps.tkinter
@ -36,50 +36,13 @@ in
mkDerivation rec { mkDerivation rec {
pname = "scribus"; pname = "scribus";
version = "1.5.5"; version = "1.5.6.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
sha256 = "0w9zzsiaq3f7vpxybk01c9z2b4qqg67mzpyfb2gjchz8dhdb423r"; sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s=";
}; };
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";
})
# fix build with Poppler 0.83
(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";
})
# Formating changes needed for the Poppler 0.86 patch to apply
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch";
sha256 = "16n3wch2mkabgkb06iywggdkckr4idrw4in56k5jh2jqjl0ra2db";
})
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch";
sha256 = "0g6l3qc75wiykh59059ajraxjczh11wkm68942d0skl144i893rr";
includes = [ "scribus/plugins/import/pdf/*" ];
})
# fix build with Poppler 0.86
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch";
sha256 = "1lszpzlpgdhm79nywvqji25aklfhzb2qfsfiyld7yv51h82zwp77";
})
];
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ nativeBuildInputs = [