From patchwork Mon Apr 10 16:12:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49071 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 2EA341748D; Tue, 11 Apr 2023 08:11:41 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 9CECF172BD for ; Tue, 11 Apr 2023 08:11:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm89p-0004Je-6p; Tue, 11 Apr 2023 03: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 1pm89l-0004FY-DD for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pm89l-0000yh-56 for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm89l-0008Jt-0K for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2023 07:11:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.168119703131831 (code B ref 62467); Tue, 11 Apr 2023 07:11:08 +0000 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:31 +0000 Received: from localhost ([127.0.0.1]:36485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm898-0008HG-IL for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:30 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:46690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm891-0008EZ-HJ for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:24 -0400 Received: by mail-ej1-f66.google.com with SMTP id xi5so17834732ejb.13 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197018; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=QBf6lg4AlUlAYCeCgN8PmJWUYLGfxNBMIW8WlTxJcxE=; b=L1PuV0qKa1jFtOWy536DMvEQuIgVpzmYxLGG17GJ9p6CFnZIU5RyhD7G58HZbauGHC My2BNngPXOE3IKU4aABDx2yMLFEHIsuFlrEQ/sy6aO5UARsjaisZXDf2zUNR0W1eruRJ F/oOSkAxO2GsCAziTDImMTBUY4zUr0GWFmwiYhG5ToqYHeRDwwqhaDWjbEyoeOoObcXE 5Ek1Ghh92VJGrK43ijWZI2mYC+R4q08LmDGDGy6dumz1jZn5jEBVx4eTStUdltbNqBdS CQO3FA+caLehoHGNMeEtxz19nKPAOm8dQl/fLECX8dkpvCYQPaASDuiADxmOShMJRjp1 xpWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197018; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QBf6lg4AlUlAYCeCgN8PmJWUYLGfxNBMIW8WlTxJcxE=; b=kqb1Mut70b26NbE1vJJUV6sgVMRAP0VvnkiH+/2jPAPFaRcWf+jXzeVSfWEtFzUQWV 4JtwfyzlcxU+xfUSstKoYkFW3MZmdtvnZ1oNsgOZnqoyomVFzR37x0X2coWgksmd+1J1 mZrgUMFIVuxIrezx4znWCWznJtyochyErJBaCijUTHhG4S1msTWAsl0miIM3UHIAuZQc o2/fpAhHhxpdj9pyq5R0cdg2nI4n80MhwqMBV7D8coWgZxWLPEldJomjXB9qxlQEQ7OP jQKrrz3aPh15uqTMEuYazCwXQSGBA3LOxRL/jmb6Ux/ScEX61NuKZXIq+1fZDWCVbis/ fRnQ== X-Gm-Message-State: AAQBX9cL05oGeqky8OZYCgyGmUFtckU3kpVKxZcz+e/RaZ/ZLuq7UwW6 Ps4rrVXYzztJv6Vj9jkrBqY3vJkuyd1uwQ== X-Google-Smtp-Source: AKy350Y9hjlWQjH1A0aqqQ+K7K5dqUesIQHsnjz8ydHQfWFO4LTLtD5OAQEn+6GefMtG+Jo49ec2qw== X-Received: by 2002:a17:907:674e:b0:94b:466b:a492 with SMTP id qm14-20020a170907674e00b0094b466ba492mr4333265ejc.19.1681197017985; Tue, 11 Apr 2023 00:10:17 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:17 -0700 (PDT) From: Liliana Marie Prikler Date: Mon, 10 Apr 2023 18:12:19 +0200 Message-ID: <63a739b5f7043911be26be98643cf3be4d94c14f.camel@gmail.com> MIME-Version: 1.0 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/graphics.scm (lib2geom): Update to 1.2. (lib2geom-1.2): Remove variable. * gnu/packages/inkscape.scm (inkscape)[inputs]: Use libgeom. --- gnu/packages/graphics.scm | 22 ++++------------------ gnu/packages/inkscape.scm | 2 +- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index bcc27cc3bf..336f1dd19d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -872,16 +872,16 @@ (define-public ilmbase (define-public lib2geom (package (name "lib2geom") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/inkscape/lib2geom.git") + (url "https://gitlab.com/inkscape/lib2geom") (commit version))) - (file-name (git-file-name name version)) + (file-name (git-file-name "lib2geom" version)) (sha256 (base32 - "03bx9k1m4bfhmx0ldsg0bks6i8h7fmvl5vbg6gmpq0bk0nkmpnmv")))) + "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8")))) (build-system cmake-build-system) (arguments `(#:imported-modules ((guix build python-build-system) @@ -938,20 +938,6 @@ (define-public lib2geom ;; https://gitlab.com/inkscape/inkscape/issues/784). (license license:gpl3+))) -(define-public lib2geom-1.2 - (package - (inherit lib2geom) - (version "1.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/inkscape/lib2geom") - (commit version))) - (file-name (git-file-name "lib2geom" version)) - (sha256 - (base32 - "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8")))))) - (define-public python-booleanoperations (package (name "python-booleanoperations") diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 7762271299..5c1689fcc7 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -213,7 +213,7 @@ (define-public inkscape/stable gtkspell3 gsl poppler - lib2geom-1.2 + lib2geom libjpeg-turbo libpng libxml2