From patchwork Thu Feb 22 16:10:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60885 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 16C5727BBE9; Thu, 22 Feb 2024 16:17:06 +0000 (GMT) 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=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 E489227BBE2 for ; Thu, 22 Feb 2024 16:17:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBkh-0003Uo-61; Thu, 22 Feb 2024 11:16:52 -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 1rdBkf-0003Tm-4T for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:49 -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 1rdBke-0004dE-5y for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBl1-0003VK-2c for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 16/20] gnu: lib2geom: Use gexps and remove input labels. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861860913302 (code B ref 68813); Thu, 22 Feb 2024 16:17:10 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:49 +0000 Received: from localhost ([127.0.0.1]:38638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkc-0003SF-C5 for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:48 -0500 Received: from mail-qv1-f50.google.com ([209.85.219.50]:58391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkJ-0003PY-1m for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:28 -0500 Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-68facd7ea4bso7466876d6.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:16:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618498; x=1709223298; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jDr4k9aswOJCFpyZhxBqY+EiZezwSTzS6IdcNWkn6EI=; b=hNn2Mm44MVb9dNa64O5cBWPbT4yLwfIlJ8NRZKBPQe1DU37dbCL+OO01vdqYyy9xBF dBg+67A4LEmbtqIB6kJrHbZLZychgA4irucR3XbIhKAvGFCQueRMrFPtWWzM4jimKq2r s9mRl0pjSu27xSlXZJgEDK0NUSlfyewu+i87W6OGFlnjMpbjl20aHB89B+oudlQAptaN edlKQoCjVZqcV4F+ATI2lzPhxHJD2hCT/HXpsFi86IIxyUPfVwTwzEw2CnEZwtJ/nQKy JrFCnIatfuKCA+8+ct4aVQetJdIDJ0pfmCLV/90mzhiBjz9fmZZu99JiCK5C1Egob4Cf wVUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618498; x=1709223298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jDr4k9aswOJCFpyZhxBqY+EiZezwSTzS6IdcNWkn6EI=; b=j9XMoF42hDnDGPb+hAnV1Ok6F0QwwGHi3ejX6nfRvnFq9PWe0kTNcUw+jUw20YWfuV QUr8433qLyBOmk+0JhpOeGpRbMiBp81A20W+W0HwuSIWa0Vt8R6HEgi1YqZv3ss3CMB4 gyfLZZNbIKw8muiZ7TNKvItKnuUtXVc5VSwRAvXeN4rqrcX/EKAcnJlJhMhbIM6eO5GX Ws4UQhDH2Sut33o4mFMIq8cP3QUZsdUIb7raTRahkXgYEiEpryES31ejoedIY7qVEiBJ gDRhlbIcdnrzd+KO1NdnlEa7c4ckt/jKn91QwhLqp5Pf8L48Fzw6+igsziFgwVV/2vzi MEjw== X-Gm-Message-State: AOJu0YxMRY9/9dV3tT3hTyN3C+gIYRXuFsTXIs+5HbkedTF8b36LCxAX nYbFj6W9yN4Sega1iZ6nNhBkybBuXjL1Jop7WMXrR47u/l4nSTVnVKKW5B6z X-Google-Smtp-Source: AGHT+IFSdFIMP8tbKGxiX8VST1d8rQrcvLoozn+7OUmMQ7SNdSsiguBBLZxtz0R4y7zNgyyISMVCtg== X-Received: by 2002:a0c:f2d0:0:b0:68e:fb17:e14b with SMTP id c16-20020a0cf2d0000000b0068efb17e14bmr19237493qvm.1.1708618498372; Thu, 22 Feb 2024 08:14:58 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:58 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:15 -0500 Message-ID: <1c789f89d47494d62e828652d286adff19299e1c.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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) [arguments]: Use gexps. Add #:modules argument. [native-inputs, inputs, propagated-inputs]: Remove labels. Change-Id: Ia61ff5e8aa1f64231c98b1fb7f31a49513ede7f8 --- gnu/packages/graphics.scm | 75 +++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 003a24d65b..a565000180 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -907,49 +907,40 @@ (define-public lib2geom "1ypcn0yxk9ny7qg8s8h3px2wpimhfgkwk7x1548ky12iqmdjjmcn")))) (build-system cmake-build-system) (arguments - `(#:imported-modules ((guix build python-build-system) + (list + #:imported-modules `((guix build python-build-system) ,@%cmake-build-system-modules) - #:configure-flags '("-D2GEOM_BUILD_SHARED=ON" - "-D2GEOM_BOOST_PYTHON=ON" - ;; Compiling the Cython bindings fail (see: - ;; https://gitlab.com/inkscape/lib2geom/issues/21). - "-D2GEOM_CYTHON_BINDINGS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-python-lib-install-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((python-version (@ (guix build python-build-system) - python-version)) - (python-maj-min-version (python-version - (assoc-ref inputs "python"))) - (site-package (string-append - (assoc-ref outputs "out") - "/lib/python" python-maj-min-version - "/site-packages"))) - (substitute* '("src/cython/CMakeLists.txt" - "src/py2geom/CMakeLists.txt") - (("PYTHON_LIB_INSTALL \"[^\"]*\"") - (format #f "PYTHON_LIB_INSTALL ~s" site-package)))))) - ,@(if (target-x86-32?) - `((add-after 'unpack 'skip-faulty-test - (lambda _ - ;; This test fails on i686 when comparing floating point - ;; values, probably due to excess precision. However, - ;; '-fexcess-precision' is not implemented for C++ in - ;; GCC 10 so just skip it. - (substitute* "tests/CMakeLists.txt" - (("bezier-test") ""))))) - '())))) - (native-inputs `(("python" ,python-wrapper) - ("googletest" ,googletest) - ("pkg-config" ,pkg-config))) - (inputs `(("cairo" ,cairo) - ("pycairo" ,python-pycairo) - ("double-conversion" ,double-conversion) - ("glib" ,glib) - ("gsl" ,gsl))) - (propagated-inputs - (list boost)) ;referred to in 2geom/pathvector.h. + #:modules '((guix build cmake-build-system) + (guix build utils) + ((guix build python-build-system) #:prefix python:)) + #:configure-flags + #~(list "-D2GEOM_BUILD_SHARED=ON" + "-D2GEOM_BOOST_PYTHON=ON" + ;; Compiling the Cython bindings fail (see: + ;; https://gitlab.com/inkscape/lib2geom/issues/21). + "-D2GEOM_CYTHON_BINDINGS=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-python-lib-install-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* '("src/cython/CMakeLists.txt" + "src/py2geom/CMakeLists.txt") + (("PYTHON_LIB_INSTALL \"[^\"]*\"") + (format #f "PYTHON_LIB_INSTALL ~s" + (python:site-packages inputs outputs)))))) + #$@(if (target-x86-32?) + #~((add-after 'unpack 'skip-faulty-test + (lambda _ + ;; This test fails on i686 when comparing floating point + ;; values, probably due to excess precision. However, + ;; '-fexcess-precision' is not implemented for C++ in + ;; GCC 10 so just skip it. + (substitute* "tests/CMakeLists.txt" + (("bezier-test") ""))))) + #~())))) + (native-inputs (list python-wrapper googletest pkg-config)) + (inputs (list cairo python-pycairo double-conversion glib gsl)) + (propagated-inputs (list boost)) ;included in 2geom/pathvector.h (home-page "https://gitlab.com/inkscape/lib2geom/") (synopsis "C++ 2D graphics library") (description "2geom is a C++ library of mathematics for paths, curves,