From patchwork Fri Oct 23 23:03:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 24786 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 8912027BBF1; Sat, 24 Oct 2020 00:04:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B5D2D27BBF0 for ; Sat, 24 Oct 2020 00:04:14 +0100 (BST) Received: from localhost ([::1]:54840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kW66X-000670-TP for patchwork@mira.cbaines.net; Fri, 23 Oct 2020 19:04:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW66M-00066a-UI for guix-patches@gnu.org; Fri, 23 Oct 2020 19:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47131) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kW66M-0007zx-KI for guix-patches@gnu.org; Fri, 23 Oct 2020 19:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kW66M-0002YR-Eu for guix-patches@gnu.org; Fri, 23 Oct 2020 19:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44170] [PATCH] gnu: Correct Inkscape extension dependencies References: In-Reply-To: Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Oct 2020 23:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44170 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "44170@debbugs.gnu.org" <44170@debbugs.gnu.org> Received: via spool by 44170-submit@debbugs.gnu.org id=B44170.16034942079780 (code B ref 44170); Fri, 23 Oct 2020 23:04:02 +0000 Received: (at 44170) by debbugs.gnu.org; 23 Oct 2020 23:03:27 +0000 Received: from localhost ([127.0.0.1]:58677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kW65n-0002Xe-1D for submit@debbugs.gnu.org; Fri, 23 Oct 2020 19:03:27 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:29259) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kW65h-0002XM-Ox for 44170@debbugs.gnu.org; Fri, 23 Oct 2020 19:03:26 -0400 Date: Fri, 23 Oct 2020 23:03:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1603494192; bh=IZPBGDt5FbpDaN9x+snqdmYjU/Y+38O137pEBdFMeYM=; h=Date:To:From:Reply-To:Subject:From; b=cmz5GAbUoWWZRnhz4SHcE0tOiRtK4BSJNmFILAXOuGhV34YitC5MWe7S++blLUMLX YBpJVT29fc6nyruU6OXB9B6EFkVPDEkcLHU94/APtv33VjdAbQ7/g2wXXLjbom59Jd HP88xcOKEORJfvc7ChHAu1xO5VY5nDFH/Dxe680uqGfSSDBsxNBepuqXuDBSWCPeuD IHQ3f5cNNt4z4yaoZXaOLT36iutQ5AZGgE+DO+/kFcGaBWSHKz+AogdoxaoTePfRU5 K6thzNgtDpfVATh7Jye8vjs524DlWNSPMgUcKThkeXcTLtzV9yu1Zx5AmPVjQgZX25 ROLoRWt7f3AnQ== From: Ekaitz Zarraga Message-ID: 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: , Reply-To: Ekaitz Zarraga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Updated with file-name thanks to Christopher Baines' help. Guix lint is not complaining anymore about the file name. (it complains about the version but it's because of a bad naming system upstream) From 931147a8dfe30f96e634a9aabc58955d2ff1b475 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Wed, 21 Oct 2020 19:08:20 +0200 Subject: [PATCH] gnu: Correct Inkscape extension dependencies * gnu/packages/inkscape.scm (inkscape@1.0.1): Add dependencies. * gnu/packages/python-xyz.scm (python-scour): New variable. --- gnu/packages/inkscape.scm | 28 ++++++++++++++++++++++++++-- gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) -- 2.28.0 diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 4ac3cf3966..85b4b5020f 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Boris A. Dekshteyn +;;; Copyright © 2020 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,6 +45,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages xml) #:use-module (gnu packages ghostscript) #:use-module (gnu packages fontutils) @@ -250,7 +252,25 @@ endif()~%~%" (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))))) + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (add-after 'install 'wrap-program + ;; Ensure correct Python at runtime. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python")) + (file (string-append out "/bin/inkscape")) + (path (string-append + out + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages:" + (getenv "PYTHONPATH")))) + (wrap-program file + `("PYTHONPATH" ":" prefix (,path)) + `("PATH" ":" prefix + (,(string-append python "/bin:"))))) + #t))))) (inputs `(("aspell" ,aspell) ("autotrace" ,autotrace) @@ -283,7 +303,11 @@ endif()~%~%" ("googletest" ,googletest) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("python-scour" ,python-scour) + ("python-pyserial" ,python-pyserial) + ("python-numpy" ,python-numpy) + ("python-lxml" ,python-lxml))) (home-page "https://inkscape.org/") (synopsis "Vector graphics editor") (description "Inkscape is a vector graphics editor. What sets Inkscape diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 575ce40ac8..426d87e9f0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -88,6 +88,7 @@ ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Tim Gesthuizen ;;; Copyright © 2020 Bonface Munyoki Kilyungi +;;; Copyright © 2020 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -22524,3 +22525,29 @@ applications with variable CPU loads).") (define-public python2-parallel (package-with-python2 python-parallel)) + +(define-public python-scour + (package + (name "python-scour") + (version "038.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/scour-project/scour") + (commit + (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rgiypb9ig8x4rl3hfzpy7kwnx1q3064nvlrv4fk0dnp84girn0v")))) + (propagated-inputs + `(("python-six" ,python-six))) + (build-system python-build-system) + (home-page "https://github.com/scour-project/scour") + (synopsis "Scour is an SVG optimizer/cleaner written in Python") + (description "The goal of Scour is to output a file that renderes +identically at a fraction of the size by removing a lot of redundant +information created by most SVG editors. Optimization options are typically +lossless but can be tweaked for more agressive cleaning.") + (license license:asl2.0)))