From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id eLBmL0dsuF78DAAA0tVLHw (envelope-from ) for ; Sun, 10 May 2020 21:04:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id AIf9G1VsuF7uCAAA1q6Kng (envelope-from ) for ; Sun, 10 May 2020 21:04:21 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1B529940C73 for ; Sun, 10 May 2020 21:04:19 +0000 (UTC) Received: from localhost ([::1]:54956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXt7S-0003Qs-GD for larch@yhetil.org; Sun, 10 May 2020 17:04:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXt6E-0001Pz-TH for guix-patches@gnu.org; Sun, 10 May 2020 17:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXt6E-0001ev-IL for guix-patches@gnu.org; Sun, 10 May 2020 17:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jXt6E-00011A-G1 for guix-patches@gnu.org; Sun, 10 May 2020 17:03:02 -0400 Subject: bug#41176: [PATCH] gnu: scribus: Fix build against poppler-0.86 Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 10 May 2020 21:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 41176 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Boris A. Dekshteyn" , 41176-done@debbugs.gnu.org Cc: "Boris A. Dekshteyn" Mail-Followup-To: 41176@debbugs.gnu.org, mbakke@fastmail.com, boris.dekshteyn@gmail.com Received: via spool by 41176-done@debbugs.gnu.org id=D41176.15891445353851 (code D ref 41176); Sun, 10 May 2020 21:03:02 +0000 Received: (at 41176-done) by debbugs.gnu.org; 10 May 2020 21:02:15 +0000 Received: from localhost ([127.0.0.1]:50571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXt5P-0000zy-UM for submit@debbugs.gnu.org; Sun, 10 May 2020 17:02:15 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:43065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXt5K-0000zF-P3 for 41176-done@debbugs.gnu.org; Sun, 10 May 2020 17:02:10 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id D941A49A; Sun, 10 May 2020 17:02:00 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 10 May 2020 17:02:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=QOQ/qI/Y4RTou1x0Alx2TDOTu1 nhqKJGyHqZYRo9C1Y=; b=cwO0JLSXa10qjYGFfyBAxnUamhl2Zp8MviD1vdc3SA z1VfXEPw0JNf7PtfWCNmuRMXMkMkqxo/ocZkAwqWTkF2nxKm2s9pr7IeBHIvqB3l LrNUFXC/rD7RlMZM+h6fo/BMlL06dADMnBxB9WUgKEoS2+5qCJsu1JfdYi93DlUC 1fIX4GRTzExGh4jenHk+y5YVBWh7DdKS/uHmCoda5p+M7OosE346Mz+VQnak/OmT c99vpqtRr7+l942brARN80xXLFaJb4gBlqOIylhdGGDLYIJqxnDhlOt7HHzAAHEr 5qAhJHdBVFUeTWWQw4oveRbKON501chh60iz6yjkSx4g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=QOQ/qI /Y4RTou1x0Alx2TDOTu1nhqKJGyHqZYRo9C1Y=; b=etGbmGu3UBd/U2Itcix/rw dmO4bjUy8yYGHl1LcC445QNNd1dbqqNDFf3P86Q60YBgZD7oA1BPjV5VyE5UU68r uJnpcw2AVb3j6akUgWMqzAzAa+p0jQlmaNJXFBpRyMdjVu3ul7DH7VIE50o68UCr 7hc47nx4GPc82Fej/LjEVCqJyYm25LDEsEOk71TDObohTSOXjCgbJLAUJDnPHsCi aqLvJAlyG5PvkJTcn7AZ99WZPGuZ8C8nIZYO4EwCEv1swPQ61KLvBMnewsT9cdk8 ZQj9bRtOHXQrKDpWYspFo++sJd8JfRwN+DJsbDtjqVg7Ut9B6kQND2a/6OOm1KEQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrkeekgdduheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrg htthgvrhhnpedtvdeffeejteffhfdtgeduveejkeetieetuefhvdevkeekvdetueetkeef leehtdenucffohhmrghinhepghgvnhhtohhordhorhhgnecukfhppeekgedrvddtvddrie ekrdejheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhm pehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id F00053066270; Sun, 10 May 2020 17:01:59 -0400 (EDT) From: Marius Bakke In-Reply-To: <20200510153555.22994-1-boris.dekshteyn@gmail.com> References: <20200510153555.22994-1-boris.dekshteyn@gmail.com> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Sun, 10 May 2020 23:01:58 +0200 Message-ID: <87lflz1p2x.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: -2.01 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=fastmail.com header.s=fm2 header.b=cwO0JLSX; dkim=fail (rsa verify failed) header.d=messagingengine.com header.s=fm2 header.b=etGbmGu3; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fastmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [-2.01 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.53919285313476]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.51.188.0/24:c]; R_DKIM_REJECT(1.00)[fastmail.com:s=fm2,messagingengine.com:s=fm2]; DWL_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; FREEMAIL_FROM(0.00)[fastmail.com]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.08), country: US(-0.00), ip: 209.51.188.17(-0.54)]; DKIM_TRACE(0.00)[fastmail.com:-,messagingengine.com:-]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; SIGNED_PGP(-2.00)[]; FREEMAIL_TO(0.00)[gmail.com,debbugs.gnu.org]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:209.51.188.0/24, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[mbakke@fastmail.com,guix-patches-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; URIBL_BLOCKED(0.00)[libertysurf.fr:email,scribus.info:email]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[209.51.188.17:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.51.188.17:from]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_COUNT_SEVEN(0.00)[10]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[fastmail.com : SPF not aligned (relaxed),none] X-TUID: MsqdhQXi/X7I --=-=-= Content-Type: text/plain "Boris A. Dekshteyn" 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 > and Jean Ghali , 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl64a8YACgkQoqBt8qM6 VPp9rwf/bT75pU3Sgq61x4ItWW2gmie6k9SEz/D6sB/ddPekgNbkc65QadzO9Pa1 SA3fCvbuVgaakiLtareAa/ar55cEuzhfqZioda54iqF/WSyF9kiCB+w/crytMXC3 rvUmlav0i4HqbqWfCufP6D/PAj29OPuQVCdy2TUY55WJcdoTyFc4jeio78CFlWyH qcF6UawXKWOI5tsCJIU1TKElB1PbYhgy4c6AxctuvZB/hbBMDhGpXCRnqqK87xuy 74JRNhi+SRUxyhiFBOj8vijUk/5M/jWHzSFZXUZGWqKTuxoBhWH9pOXhvhPWDyzp jj1CWDhoN1gJVVwtem8TO/FAy7T6Nw== =7sW6 -----END PGP SIGNATURE----- --=-=-=--