"Boris A. Dekshteyn" <boris.dekshteyn@gmail.com> writes:

> * gnu/packages/scribus.scm (scribus): Fix build against poppler-0.86
> * gnu/packages/patches/scribus-1.5.5-poppler-0.86-build-fix.patch: New file
> * gnu/local.mk (dist_patch_DATA): Add new patch

Thanks!

> The original series of patches authored by Craig Bradney <mrb@scribus.info>
> and Jean Ghali <jghali@libertysurf.fr>, taken from
> https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/scribus/files

I took this comment and added it to the top of the patch file ...

> +++ b/gnu/packages/patches/scribus-1.5.5-poppler-0.86-build-fix.patch
> @@ -0,0 +1,651 @@
> + scribus/plugins/import/pdf/importpdf.cpp     |  73 +++++++-
> + scribus/plugins/import/pdf/importpdf.h       |   1 +
> + scribus/plugins/import/pdf/importpdfconfig.h |  12 ++
> + scribus/plugins/import/pdf/slaoutput.cpp     | 170 +++++++++++++++++--
> + scribus/plugins/import/pdf/slaoutput.h       |  15 +-
> + 5 files changed, 251 insertions(+), 20 deletions(-)

... here, and also removed the unnecessary diffstat and index lines.

I also adjusted the commit message slightly to adhere to the
Guix-flavored GNU ChangeLog style.

Pushed as 38b46a3e32c6827bc7255a9027c9e77d3becdff0.