From: Marius Bakke <mbakke@fastmail.com>
To: "Boris A. Dekshteyn" <boris.dekshteyn@gmail.com>,
41176-done@debbugs.gnu.org
Cc: "Boris A. Dekshteyn" <boris.dekshteyn@gmail.com>
Subject: bug#41176: [PATCH] gnu: scribus: Fix build against poppler-0.86
Date: Sun, 10 May 2020 23:01:58 +0200 [thread overview]
Message-ID: <87lflz1p2x.fsf@devup.no> (raw)
In-Reply-To: <20200510153555.22994-1-boris.dekshteyn@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]
"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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
prev parent reply other threads:[~2020-05-10 21:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-10 15:35 [bug#41176] [PATCH] gnu: scribus: Fix build against poppler-0.86 Boris A. Dekshteyn
2020-05-10 21:01 ` Marius Bakke [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lflz1p2x.fsf@devup.no \
--to=mbakke@fastmail.com \
--cc=41176-done@debbugs.gnu.org \
--cc=boris.dekshteyn@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).