From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OBT3AkAINWS3WAEASxT56A (envelope-from ) for ; Tue, 11 Apr 2023 09:12:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id uO7dAkAINWRSCAAA9RJhRA (envelope-from ) for ; Tue, 11 Apr 2023 09:12:00 +0200 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 BF1B5C8E0 for ; Tue, 11 Apr 2023 09:11:59 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm89o-0004J0-Qp; Tue, 11 Apr 2023 03:11:12 -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-0004FX-1F 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 1pm89k-0000yN-NZ for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm89k-0008Jm-JC for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v3 14/15] gnu: inkscape: Use new package style. 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.168119703031825 (code B ref 62467); Tue, 11 Apr 2023 07:11:08 +0000 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:30 +0000 Received: from localhost ([127.0.0.1]:36483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm897-0008H8-Sf for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:30 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:37519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm890-0008EQ-Vz for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:23 -0400 Received: by mail-ej1-f66.google.com with SMTP id qa44so17534382ejc.4 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197017; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=UZWoqSvezsSlumvUBL8almECrICUUenOdaKmuvDS1Tc=; b=frfVfFBVxdr7HT3i56bRv5LF5ne0uCn+u1gxAlyv3aEWLtJ8KJet9H+lWl6kWHcZAP MVNObzIrKwjJ/xPSphdfq/+Y8r+nlnJ/AKOchovTpZuMrIPTpnnCQ8jgtZd4gdBFBCm8 ZNs3xQTQ/rAF22GAG5urXsdWpEesBfd/NWc+Gu9Z88AMa3+PGcgnnRlBQfr3V9J8KaKX tCm4Pp7iQCi/IqjMSJ30HGmBT5eu5+qDcyb+l41wbxk2Z7xJg4PP2uHCGXOjmN3w7Y1C 986rd+7NWKkcAueA1LqDzHqpjzMaeh1kAsrhYYfcLZjlR4uGFPcbVB8u0oxzbJ3rCQJm g+9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197017; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=UZWoqSvezsSlumvUBL8almECrICUUenOdaKmuvDS1Tc=; b=opgbIdKNyo9EbmzPpWRdz3Lp7SNNu+uEPeSfpURLe8AUnzW10mlY7y3FYxNMThCYxl San3/Nyt2DdlwI5qEOJUKT3L8Oe+ukz0obcqzAFGCIqbmMo4FL5JgFnd8Y5qAXE5WXcy UjrpBWsRZY93crwmAFGVSVmF3RvM1Vrp1vSDo1Jn0BA4Qj7+ZpeNa9+RaqL63peV2TVt HIK7NbthXzHQWYBH/UHUM+7Yv7bpPpZ05Ksaf821awq5qmsyRw8gakKfR3hXUBm+CFtm Fdl5764e08vHc79/NWe/qK5NL4Z+415YQtRrJiWPEOVKRpsd2I22jtqxO1ZHgd/W/GBb 8L0w== X-Gm-Message-State: AAQBX9cEtLqqu7MPeEpvra3CS3IH1dDkqn1A9XybvUal2vqH8G91IGyI IMSN97S7aDtQC6UkqJtY7BOKntsgxMLOsw== X-Google-Smtp-Source: AKy350bPJiDSm4SAubrhROb8JnRitHgQlCsVaxoPC9OxyRtAV+zR5zyomB/s6AbS5qa4HbnnL5I5jw== X-Received: by 2002:a17:907:77c6:b0:8f4:ec13:d599 with SMTP id kz6-20020a17090777c600b008f4ec13d599mr10898198ejc.27.1681197017419; 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.16 (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 09:08:38 +0200 Message-ID: <17d1e460476b5c72d75e4224661720557b7de2b2.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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1681197119; a=rsa-sha256; cv=none; b=T3WxFmgfUM5LrMufb+klKpCjOuE7SgJUVl7RUUrVTK0/cTY3chZFK9ujz1iXNzbrpwtasH PVhQe+0USXidrn9/SzaMdxpGZ3YJ4P79nAlcF7H5nMGuh1QifUFdX39nY3MVxurqv7QL+j Voo54pbLhp4B7/XwGA7GXazckV3EwhopYId06h/qSurjn9h727qo6EIzjonUfjRozFB9FG /nZVcGHnGMFqkCSPgGW3k6h+n46cBpvii+Qpuc6HLUyPbmnffwDtjLJDwHSMipd3oE/2OV 1VEl7za0XcShQzmoShHY7nb/Zjs8dDYuCeYDhhS+/ELjymlD+7LT0KmQP+TLyg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=frfVfFBV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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=1681197119; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: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=UZWoqSvezsSlumvUBL8almECrICUUenOdaKmuvDS1Tc=; b=KW29sXhTgdo81hIquope9RBOJCipauyThJJoXhLM0c3o/eSWMblWlY5yZrpbYMFXEzxj95 /bKHhJ8avI+Q2HEKa1ORtcjgp2bh3+R8LanW15mA8s+G6JRm57oyMTi2Wrvbelw8OTkJm5 jtnY3c1ZUQi1kMigWDnQj5MUhE+NVyxKg2622RfE3AgqpkroXofW3ZN+84FsTlLCDkswa3 GH24GUo9rvUlYS4lmY0BxI+CMIjk8RVY3wWAZIiFuGooLruMB8kctBykgN2jSObXQDlxfT Z+y25B0ogz2cueNrozRCp2haw7ntPFWz+X39yOwDvJTbMGsSoDwSPkUUTureKQ== X-Migadu-Spam-Score: 6.78 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=frfVfFBV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" X-Spam-Score: 6.78 X-Migadu-Queue-Id: BF1B5C8E0 X-TUID: TawiZtBncoVj * gnu/packages/inkscape.scm (inkscape)[arguments]: Convert to list of G-Expressions. [inputs]: Drop labels. --- gnu/packages/inkscape.scm | 150 +++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 74 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index b8e78c2b11..7762271299 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -26,6 +26,7 @@ (define-module (gnu packages inkscape) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system cmake) @@ -153,87 +154,88 @@ (define-public inkscape/stable ((".*find_package\\(DoubleConversion.*") "")))))) (build-system cmake-build-system) (arguments - `(#:test-target "check" ;otherwise some test binaries are missing - #:imported-modules (,@%cmake-build-system-modules + (list + #:test-target "check" ; otherwise some test binaries are missing + #:imported-modules `(,@%cmake-build-system-modules (guix build glib-or-gtk-build-system)) - #:modules ((guix build cmake-build-system) + #:modules '((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file - (assoc-ref glib-or-gtk:%standard-phases - 'generate-gdk-pixbuf-loaders-cache-file)) - (add-after 'unpack 'patch-icon-cache-generator - (lambda _ - (substitute* "share/icons/application/CMakeLists.txt" - (("gtk-update-icon-cache") "true")))) - (add-after 'unpack 'disable-latex-export-tests - ;; FIXME: For some reason the test.pdf_tex file generated by the - ;; "--export-latex" lacks "some text" in its content when run in - ;; the build environment. Skip the related tests. - (lambda _ - (substitute* "testfiles/cli_tests/CMakeLists.txt" - (("add_cli_test\\(export-latex") - "message(TEST_DISABLED: export-latex")))) - (add-after 'unpack 'set-home - ;; Mute Inkscape warnings during tests. - (lambda _ - (setenv "HOME" (getcwd)))) - ;; Move the check phase after the install phase, as when run in the - ;; tests, Inkscape relies on files that are not yet installed, such - ;; as the "share/inkscape/ui/units.xml" file. - (delete 'check) - (add-after 'install 'check - (assoc-ref %standard-phases 'check)) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) - (add-after 'install 'wrap-program - ;; Ensure Python is available at runtime. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/inkscape") - `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH"))) - ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + (assoc-ref glib-or-gtk:%standard-phases + 'generate-gdk-pixbuf-loaders-cache-file)) + (add-after 'unpack 'patch-icon-cache-generator + (lambda _ + (substitute* "share/icons/application/CMakeLists.txt" + (("gtk-update-icon-cache") "true")))) + (add-after 'unpack 'disable-latex-export-tests + ;; FIXME: For some reason the test.pdf_tex file generated by the + ;; "--export-latex" lacks "some text" in its content when run in + ;; the build environment. Skip the related tests. + (lambda _ + (substitute* "testfiles/cli_tests/CMakeLists.txt" + (("add_cli_test\\(export-latex") + "message(TEST_DISABLED: export-latex")))) + (add-after 'unpack 'set-home + ;; Mute Inkscape warnings during tests. + (lambda _ + (setenv "HOME" (getcwd)))) + ;; Move the check phase after the install phase, as when run in the + ;; tests, Inkscape relies on files that are not yet installed, such + ;; as the "share/inkscape/ui/units.xml" file. + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (add-after 'install 'wrap-program + ;; Ensure Python is available at runtime. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/inkscape") + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))) + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load ;; its own icons in pure environments. `("GDK_PIXBUF_MODULE_FILE" = (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))) (inputs - `(("aspell" ,aspell) - ("bash-minimal" ,bash-minimal) - ("autotrace" ,autotrace) - ("gdl" ,gdl-minimal) - ("gtkmm" ,gtkmm-3) - ("gtk" ,gtk+) - ("gtkspell3" ,gtkspell3) - ("gsl" ,gsl) - ("poppler" ,poppler) - ("lib2geom" ,lib2geom-1.2) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("libgc" ,libgc) - ("librsvg" ,librsvg) ; for the pixbuf loader - ("libsoup" ,libsoup-minimal-2) - ("libcdr" ,libcdr) - ("libvisio" ,libvisio) - ("libwpd" ,libwpd) - ("libwpg" ,libwpg) - ("freetype" ,freetype) - ("popt" ,popt) - ("potrace" ,potrace) - ("lcms" ,lcms) - ("boost" ,boost) - ("python" ,python-wrapper) - ("python-cssselect" ,python-cssselect) ; to render qrcode - ("python-scour" ,python-scour) - ("python-pyserial" ,python-pyserial) - ("python-numpy" ,python-numpy) - ("python-lxml" ,python-lxml))) + (list aspell + bash-minimal + autotrace + gdl-minimal + gtkmm-3 + gtk+ + gtkspell3 + gsl + poppler + lib2geom-1.2 + libjpeg-turbo + libpng + libxml2 + libxslt + libgc + librsvg ; for the pixbuf loader + libsoup-minimal-2 + libcdr + libvisio + libwpd + libwpg + freetype + popt + potrace + lcms + boost + python-wrapper + python-cssselect ; to render qrcode + python-scour + python-pyserial + python-numpy + python-lxml)) (native-inputs (list imagemagick ;for tests intltool -- 2.39.2