From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id iGXHIsQVy2UDJgEA62LTzQ:P1 (envelope-from ) for ; Tue, 13 Feb 2024 08:09:56 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id iGXHIsQVy2UDJgEA62LTzQ (envelope-from ) for ; Tue, 13 Feb 2024 08:09:56 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=CKNqdt7H; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707808196; a=rsa-sha256; cv=none; b=E/t1w7FFbtoGn0QMBvM/jBOEutX634A3RZc+rrxa7/z2Wz/lheTJInOTv2iWculhd/zACM TslcFTMyFTgtINcSUjqJmGowHkqTeHnzVFvRUmCSjXZ8VxIbPoM/lR8TAExqiCGFc8ITLR Dp90TZR+SQeTvNR+HpZmBURGCi7lpNn0NfAz144c5nRDQvS5PdjL1F4325lxeaW9og3EV5 S12H1oo1qBAgQ+1biCzLivb5gsYtwMGONgAzd/fWElMpOlB9pQENfy3LwBWx6dRyvsv1Kg fmxt8glWBBEdx9hAV+QI6EyxqhGQGxmuY33SkE1cDWnJIA+YpZ+pQUO1BWJZXw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=CKNqdt7H; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707808196; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=sr5XwBJYoWvcDH6Nizxehig7QJL/aIvrYF9OZrrWUY4=; b=ZtyuPCOjJg8kQ4CJjlppbQ7B3vJicl7vHv4usdyQj/LBWeFkjZRT7wboOqEhxXVBKIpaM1 cwrUNgcM3JNwLcNrueyORJJgN8IkAGGgcrppIyMMx1K2ZVSwQGXfBQ/eU0Gv5odttyabpl Rs/9Om3oMLIl0vxzhrTY1LbMCMunICdb4zWVZNkVS1uEQrWmSpEfX8M7a9Q8uMwRyzKy8M 80qdD/Ugp2MDC79rrih0tm5OZJAJvJWgVPKKkf/n2v3IgIvADH21MItj32MTPdNh3oIcmE 9NGjWBn8h3CJlKDjh45Dl0jJGO9OCPwjRgwVCXILnnultL2we5W1QJJPkJcqww== 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 01A256D256 for ; Tue, 13 Feb 2024 08:09:55 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZmvL-0007kU-J1; Tue, 13 Feb 2024 02:09:47 -0500 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 1rZmvJ-0007k8-VC for guix-patches@gnu.org; Tue, 13 Feb 2024 02:09:46 -0500 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 1rZmvJ-0006bE-Mx for guix-patches@gnu.org; Tue, 13 Feb 2024 02:09:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZmva-0004Yf-FV for guix-patches@gnu.org; Tue, 13 Feb 2024 02:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68184] [PATCH v3] gnu: inkscape: Update to 1.2.2 References: <7542ab97dce90e01b16b1e698247f5607fd02922.1704057359.git.atai@atai.org> In-Reply-To: <7542ab97dce90e01b16b1e698247f5607fd02922.1704057359.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Feb 2024 07:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68184 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68184@debbugs.gnu.org Cc: Andy Tai Received: via spool by 68184-submit@debbugs.gnu.org id=B68184.170780817917489 (code B ref 68184); Tue, 13 Feb 2024 07:10:02 +0000 Received: (at 68184) by debbugs.gnu.org; 13 Feb 2024 07:09:39 +0000 Received: from localhost ([127.0.0.1]:40871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZmvC-0004Y0-Tr for submit@debbugs.gnu.org; Tue, 13 Feb 2024 02:09:39 -0500 Received: from mail-pf1-f177.google.com ([209.85.210.177]:52601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZmvA-0004Xm-LK for 68184@debbugs.gnu.org; Tue, 13 Feb 2024 02:09:38 -0500 Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6e0a4c6c2adso1241616b3a.1 for <68184@debbugs.gnu.org>; Mon, 12 Feb 2024 23:09:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707808093; x=1708412893; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=sr5XwBJYoWvcDH6Nizxehig7QJL/aIvrYF9OZrrWUY4=; b=CKNqdt7HRoiMND3Bz902IXMBqz/nW7zn6HBCXjZMsWj3RCRx7ZwjeXJnIWTwerb+zm G0rzBizbv3d0tlpiQwb8uOs0JEwuomqrNkFvZDiM4r1xJqF55QptkImR8xZyFugdqoaz yNcR992hBORlIY1RSpXtfGCKyzUZQjF2iileLYohG6N4C1Kf7SrcVlq8aF5QMUjEz/Rt MIsVELErGIaM5IrU1AYpT64rDe0ayRTDLnj+8g1fT8ibYl8Z5pfvC26PROQ/dYoB26+r 6FMXMo6w5pDmK3KhyZ2KLVUiaXqxqQjmdODpnJAJhG8qhxaL/L+pErOjsHl9zwNEV4sN cWBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707808093; x=1708412893; 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=sr5XwBJYoWvcDH6Nizxehig7QJL/aIvrYF9OZrrWUY4=; b=QjlUfi3HWhIvCY4KejXSnnfw3NY9gCnqy+0ZG5CHY6FoRhxyYpXcfyxkXgearRtwMA MDwDQoCR9RoFrUa+9ZD2DC1wrCeevOdvPMP9YjwExzbLgMSTQGqTye6NVmiwYW3PwXNH gZJ2FzYOsh+AAwmDtTPQvV/YTdZBa/80Mkx8zrB1douqljStnf7gcZzh47fKKzLFwowD P0F9eoRLuPzBFdfNI4RPwOL0W5KZeF4+TYcB3E3EEwZJvbGNrXjAoiOpp0PZr7Lf8pHY qPpjFhShuGPl2USSlS6tmAQWht86YQbozm95CxBd6AHIhniBbTnIZWTBqhKqgSumyGiD 9Djg== X-Gm-Message-State: AOJu0Yx36lDoK2xIQx+jQnr86yFzCLhKn/GR6rtg+Nx7UElfanwsb4OG xYLmYekjQpTLUciIRImWP98+LxHgWE8DbALtm/W6iKm6sKbc03WMWhx/yty8 X-Google-Smtp-Source: AGHT+IHPLd7BspgACZ4lgnDJUgA+PVifO+aAuem9ubmxhGPTl/c+7MnXCXOrEFw9lJHuZWIdroADhg== X-Received: by 2002:a05:6a00:3cd6:b0:6e0:e49d:21ce with SMTP id ln22-20020a056a003cd600b006e0e49d21cemr4131779pfb.6.1707808093026; Mon, 12 Feb 2024 23:08:13 -0800 (PST) Received: from DEskMiniX300.. (c-98-37-226-98.hsd1.ca.comcast.net. [98.37.226.98]) by smtp.gmail.com with ESMTPSA id b18-20020aa78ed2000000b006e0a4022fa2sm5812201pfr.189.2024.02.12.23.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 23:08:12 -0800 (PST) From: Andy Tai Date: Mon, 12 Feb 2024 23:08:08 -0800 Message-Id: <7509c2b015d9b8a44cbab1329c24a83c65b1cb97.1707808025.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Spam-Score: -3.98 X-Migadu-Queue-Id: 01A256D256 X-Migadu-Spam-Score: -3.98 X-TUID: XZ8JDM2JnX7J * gnu/packages/inkscape.scm (inkscape): Update to 1.2.2 [sources](patches): Redefine to empty [inputs]: Add gspell, lib2geom, readline Change-Id: Ief74d289365f818e28f7afc02faea782e49d1c02 --- gnu/packages/inkscape.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index aa2c6419a0..8a107301ac 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 '()) ; does not use patch from inkscape/stable; redefine to empty 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,9 @@ (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 + lib2geom + python-cssselect ;to render qrcode + readline))) (properties (alist-delete 'hidden? (package-properties inkscape/stable))))) base-commit: 5f86eebd240958001ab4f178005f355d24d9b7f1 -- 2.34.1