scribus: 1.7.2 -> 1.7.3
changelog: https://wiki.scribus.net/canvas/ChangeLog Co-authored-by: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
cairo,
|
||||
cmake,
|
||||
cups,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
fontconfig,
|
||||
freetype,
|
||||
@@ -39,11 +40,11 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scribus";
|
||||
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-nY4RzGusLNlsVTnvvXGSIv9/cOHBhZcogNn7MFHhONA=";
|
||||
hash = "sha256-iC7lXKRJfALE4F8wrMaJ6h9IXC6AI8nrKT9RwsW+Bq0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -96,6 +97,32 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "WANT_GRAPHICSMAGICK" true) ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-build-with-poppler-26.05.0.patch";
|
||||
url = "https://github.com/scribusproject/scribus/commit/14a287fc1db2a44abfe1743260554447b31b4adf.patch";
|
||||
hash = "sha256-bhxnyL5zWVCjkfkW67CPykLW/uqDP+n3djnRKGMyhjw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# required for the next patch to apply cleanly
|
||||
url = "https://github.com/scribusproject/scribus/commit/3aed8aa40d01d1affd2b55b107b48878d4b06eab.patch";
|
||||
includes = [ "scribus/plugins/import/pdf/importpdf.cpp" ];
|
||||
hash = "sha256-tiGXGW8CnG0Tj5YaimngelvNvO3CCSa5eXc3bSKJD54=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-build-with-poppler-26.06.0.patch";
|
||||
url = "https://github.com/scribusproject/scribus/commit/2b9405a00a96a09e0183190ddc9f83d44963d4e0.patch";
|
||||
hash = "sha256-4v+Ba+JODwNg4YLmwpFeBfIxk1j+RcZdtznPFeQ+H+w=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# revert non-whitespace changes made by the second patch, i.e.,
|
||||
# https://github.com/scribusproject/scribus/commit/3aed8aa40d01d1affd2b55b107b48878d4b06eab
|
||||
substituteInPlace scribus/plugins/import/pdf/importpdf.cpp \
|
||||
--replace-fail 'QSizeF()' '"Custom"'
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
|
||||
|
||||
Reference in New Issue
Block a user