From patchwork Mon Jun 14 13:27:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Boris A. Dekshteyn" X-Patchwork-Id: 30233 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AC72127BC81; Mon, 14 Jun 2021 14:28:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 24F8D27BC78 for ; Mon, 14 Jun 2021 14:28:15 +0100 (BST) Received: from localhost ([::1]:55080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsmdS-00085S-2h for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 09:28:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsmdH-0007zz-8y for guix-patches@gnu.org; Mon, 14 Jun 2021 09:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsmdH-00009h-0f for guix-patches@gnu.org; Mon, 14 Jun 2021 09:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsmdG-00069V-M6 for guix-patches@gnu.org; Mon, 14 Jun 2021 09:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49022] [PATCH 1/2] gnu: inkscape: Update to version 1.1. Resent-From: "Boris A. Dekshteyn" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 13:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49022 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49022@debbugs.gnu.org Cc: "Boris A. Dekshteyn" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162367728123630 (code B ref -1); Mon, 14 Jun 2021 13:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jun 2021 13:28:01 +0000 Received: from localhost ([127.0.0.1]:45335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsmdB-00068w-Ti for submit@debbugs.gnu.org; Mon, 14 Jun 2021 09:28:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:42516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsmdA-00068p-FY for submit@debbugs.gnu.org; Mon, 14 Jun 2021 09:27:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsmdA-0007oi-7h for guix-patches@gnu.org; Mon, 14 Jun 2021 09:27:56 -0400 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]:42982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsmd6-0008Tk-LW for guix-patches@gnu.org; Mon, 14 Jun 2021 09:27:55 -0400 Received: by mail-lf1-x132.google.com with SMTP id j2so20996465lfg.9 for ; Mon, 14 Jun 2021 06:27:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J9dqGViI1YDqa+oi2r9Q+CBQDgMOy5hzzjwjwT+wJnA=; b=esMo97G0jytZAcyv36c6QX9Cq2Vn5iHxwCVavkqkPq7V7h4xLo1+crpvuJC4XVSkT/ a6MlLFxEloEDEBMNPqu+dsccwkMG54OsZruh3dx20J7PkgbuiK8AXRKJQ76MdcyPLBfG 48H847U20RPToNzeEYQ8EamCMp5os5dfznef7YS8WU35OtvQK764yELWW7Z0VSSsAFSc BafrSvM27teVdPq+YOeTn0QtDjRe7PVEU73mBlBZaTgwzicTeg6EaGdAmDpECy70JL7A Ln5iK5wfz3nbNVjlymMtrzDqCwVJveWAvzDVVilfJJlLyjXFxUu4Gsoz7Nb+p7AinqXc ydGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J9dqGViI1YDqa+oi2r9Q+CBQDgMOy5hzzjwjwT+wJnA=; b=lfqsLMLNNBUe5eFT6rFsQ5PQ8t5g+pez9o79jqhGoBvn5y5kivkiHrXipFrvgAlCT0 DGTR3A++i0uo6WygEIvds4LruB+Z0x0H2istztRU9bP5hU1196WyG3lV3MzUnomW5qWn Fel2zg79HbBaEIUq3WfvqIigYDex+zqlUaDAwZXHPeXXDELQtC4CX32G+A+PSCQuNuJ6 CW/0oMdnMX9aQVZBkSbg1nJWAalItYDQXNVaO88/d0bLIh9oNy6QSKW5vVQ99DjzevPK Buifw1hyMFvNFjXqco0h3Sx951IUQ3fFgcV7Sm9PKC57wSehyoWTOJjRWJrYEp7L3h01 VIug== X-Gm-Message-State: AOAM532KE8mS/+t0XNIEAJmw8sbtgO/KIKiQojW3TyF7Bmo2gAH6Nnaj zCjlDkP7dWl7WDu3W6vyIiluqyVGUKNL8Q== X-Google-Smtp-Source: ABdhPJyT3mhFRgUv8Yc1SIli4DyJM+IbBIpHwa9WsOuLkt0NbZSeSg8VnwvY7XkDQ2m75EoFi3HUtA== X-Received: by 2002:ac2:53b8:: with SMTP id j24mr12608133lfh.292.1623677270813; Mon, 14 Jun 2021 06:27:50 -0700 (PDT) Received: from localhost ([2001:470:dd36:0:196f:4874:d486:f103]) by smtp.gmail.com with ESMTPSA id j17sm1802545ljo.74.2021.06.14.06.27.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 06:27:50 -0700 (PDT) From: "Boris A. Dekshteyn" Date: Tue, 15 Jun 2021 01:27:44 +1200 Message-Id: <20210614132744.23856-1-boris.dekshteyn@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::132; envelope-from=boris.dekshteyn@gmail.com; helo=mail-lf1-x132.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/inkscape.scm (inkscape-1.0) Rename to inkscape-1.1. * gnu/packages/inkscape.scm (inkscape-1.1) Update to version 1.1. --- gnu/local.mk | 1 + gnu/packages/inkscape.scm | 9 +++---- .../inkscape-1.1-fix-build-witch-gcc7.5.patch | 24 +++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch diff --git a/gnu/local.mk b/gnu/local.mk index fdbf2272ed..b1c5bebfa8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1241,6 +1241,7 @@ dist_patch_DATA = \ %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ + %D%/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/iputils-libcap-compat.patch \ diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 075f901b2d..46c8c4cc34 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -117,19 +117,20 @@ apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, as the native format.") (license license:gpl2+))) -(define-public inkscape-1.0 +(define-public inkscape-1.1 (package (name "inkscape") - (version "1.0.2") + (version "1.1") (source (origin (method url-fetch) (uri (string-append "https://media.inkscape.org/dl/" "resources/file/" "inkscape-" version ".tar.xz")) + (patches (search-patches "inkscape-1.1-fix-build-witch-gcc7.5.patch")) (sha256 (base32 - "12krl97a00gdcxxibsb7g2lgx5458mhx2437x0hvz350242j6gns")) + "1rlm2wqg8bgdxkdvnadh49wfp0mrbrk7d8n4vdcjyw6z7z7firki")) (modules '((guix build utils) (ice-9 format))) (snippet @@ -188,7 +189,7 @@ endif()~%~%" (string-append "#include " quote (basename source-dir))) ...)))))) - (unbundle ("2geom" "src/2geom" #t) + (unbundle ("2geom" "src/3rdparty/2geom" #t) ;; libcroco cannot be unbundled as it is heavily ;; modified (see: ;; https://gitlab.com/inkscape/inkscape/issues/876#note_276114904). diff --git a/gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch b/gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch new file mode 100644 index 0000000000..bd7b01f856 --- /dev/null +++ b/gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch @@ -0,0 +1,24 @@ +From 0ae15d7e89b984f72780ff7afa8e57dd6ae7765a Mon Sep 17 00:00:00 2001 +From: "Boris A. Dekshteyn" +Date: Mon, 14 Jun 2021 23:52:16 +1200 +Subject: [PATCH] Fix build witch GCC@7.5. + +--- + src/object/sp-use-reference.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/object/sp-use-reference.h b/src/object/sp-use-reference.h +index 5958632059..f07c2a3721 100644 +--- a/src/object/sp-use-reference.h ++++ b/src/object/sp-use-reference.h +@@ -14,6 +14,7 @@ + + #include "sp-item.h" + #include "uri-references.h" ++#include "display/curve.h" + + #include + +-- +2.32.0 +