From patchwork Wed Jul 26 06:09:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 52188 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 DDD7327BBEA; Wed, 26 Jul 2023 07:11:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A7FA227BBE2 for ; Wed, 26 Jul 2023 07:11:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOXjt-0007Zb-85; Wed, 26 Jul 2023 02:11:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOXjr-0007ZO-Dy for guix-patches@gnu.org; Wed, 26 Jul 2023 02:11:11 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qOXji-0001eL-AW for guix-patches@gnu.org; Wed, 26 Jul 2023 02:11:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qOXji-0002Jn-6K for guix-patches@gnu.org; Wed, 26 Jul 2023 02:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64867] [PATCH] gnu: inkscape: Update to 1.2.2 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 06:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64867 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64867@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16903518188854 (code B ref -1); Wed, 26 Jul 2023 06:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jul 2023 06:10:18 +0000 Received: from localhost ([127.0.0.1]:47441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOXj0-0002Ij-07 for submit@debbugs.gnu.org; Wed, 26 Jul 2023 02:10:18 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOXiy-0002IW-OI for submit@debbugs.gnu.org; Wed, 26 Jul 2023 02:10:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOXiq-0007Jj-E2 for guix-patches@gnu.org; Wed, 26 Jul 2023 02:10:08 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qOXik-0001Cg-7X for guix-patches@gnu.org; Wed, 26 Jul 2023 02:10:05 -0400 Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-55b22f82ac8so411281a12.1 for ; Tue, 25 Jul 2023 23:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690351798; x=1690956598; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=I6Yxxm0oPryPyraoSIecSoHFE0bILKcJJuVZ46SFHCY=; b=RdrA5erzCNKHnEIG96WgXubVFu7RIcGlGDSZExvBgLp9qmbmmESqvuIMsOLPsB8hlF b7BbU7zICavtguOpHqKocxgDR9/H1yhwtqoIutkFDmgCeVHOtcXyu//TWFo4vEe4PUnE 19hTdzxJjm8s/9Tw5IDDVGoaZGngANH3XvMSNhrjOK44DRz7Er1y8rd7iobldobk1qQz m4W6x0TmURRd0d4ghnOE+f3riGgvpf6hrS/0u7UCQJ8qtvYhfxR0EZqFjqQdGDbiaMoc EgYlrcFjGL0++chnDcd8eTuei+O4ooacMyTn6brVqA4vj6DpsOgPHC6Ahb30Yz49nhtd OfwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690351798; x=1690956598; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=I6Yxxm0oPryPyraoSIecSoHFE0bILKcJJuVZ46SFHCY=; b=BaDKZz202DVOVdLaGqKMPr6PE6WTCC2Eb6t7LrJZWJCLSnnTtbGJxp6i2UmfVvPIeF 45E2ozDH+dTYSGUFrqn5DRaKn66A9an3TgWonlUqhTf3RkfwnBrwsa0KlxoA2MyhveM+ TAv1Sact4fsG5xQr6uFPv4CmiOSDMRf3bKrR3niq64b5/RCzhM16UGnunGI14+Flmnql xrXRmBoUDc/GwBsoybcqdGFlYw58HrQj65U28b6udSuplHKOnectEVttee8qmXlQ3bJK ixGrU65+IFgg/GH6PGRvUKD09c92HDyG+eJLKwzJinIlNSyUoXYxwomiNYT5EEdrTdCY ivWA== X-Gm-Message-State: ABy/qLZI1XwzCfNteK37BN3LZ8ihsCLA14PqjDqVwk3WT7e3+y7pq4bp ZM+gXFytosHBtQnH5snbHNxH2yCV0R7Pmw== X-Google-Smtp-Source: APBJJlEW2dHxBoDTP+iuLU7u+fLENL1c3aeWZHVSQO1KKYfVE3AzaqfYfBLbrMDBI2dtmpL9m1i1LA== X-Received: by 2002:a17:90a:e015:b0:268:266a:1ab with SMTP id u21-20020a17090ae01500b00268266a01abmr1635506pjy.5.1690351797953; Tue, 25 Jul 2023 23:09:57 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id c14-20020a17090a020e00b0026358dfd2a3sm580833pjc.24.2023.07.25.23.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 23:09:57 -0700 (PDT) From: Andy Tai Date: Tue, 25 Jul 2023 23:09:53 -0700 Message-ID: <87c693cd5cce2aaf8143d1c402edab25f98a05a7.1690351754.git.atai@atai.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=lichengtai@gmail.com; helo=mail-pg1-x52d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/inkscape.scm (inkscape): Update to 1.2.2 --- gnu/packages/inkscape.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) base-commit: 76e041f9eef85bb039c5251d3350c62ee2066883 diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index aa2c6419a0..41fdbf22d0 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -50,6 +50,7 @@ (define-module (gnu packages inkscape) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages readline) #:use-module (gnu packages xml) #:use-module (gnu packages ghostscript) #:use-module (gnu packages fontutils) @@ -286,7 +287,7 @@ (define-public inkscape (package (inherit inkscape/stable) (name "inkscape") - (version "1.2.1") + (version "1.2.2") (source (origin (inherit (package-source inkscape/stable)) @@ -294,13 +295,18 @@ (define-public inkscape (uri (string-append "https://media.inkscape.org/dl/" "resources/file/" "inkscape-" version ".tar.xz")) + (patches (list )) (sha256 - (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")))) + (base32 "1i55x0zbmwgvcl8fai9m3zy7rpc0rwfk1vs8wqsib8n00c6zvix0")))) (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments inkscape/stable) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'fix-unaliased-2geom-reference + (lambda _ + (substitute* (find-files "." "CMakeLists.txt") + (("2Geom::2geom") "2geom")))) (replace 'wrap-program ;; Ensure Python is available at runtime. (lambda* (#:key outputs #:allow-other-keys) @@ -313,5 +319,7 @@ (define-public inkscape `("GDK_PIXBUF_MODULE_FILE" = (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))) (inputs (modify-inputs (package-inputs inkscape/stable) - (append python-cssselect))) ;to render qrcode + (append gspell gtksourceview-4 lib2geom + python-cssselect ;to render qrcode + readline ))) (properties (alist-delete 'hidden? (package-properties inkscape/stable)))))