From patchwork Sat May 2 22:40:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: L p R n d n X-Patchwork-Id: 21859 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 C898127BBE4; Sat, 2 May 2020 23:42:14 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 42E9227BBE1 for ; Sat, 2 May 2020 23:42:14 +0100 (BST) Received: from localhost ([::1]:56390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jV0pp-0000wT-Mn for patchwork@mira.cbaines.net; Sat, 02 May 2020 18:42:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jV0pg-0000mF-2K for guix-patches@gnu.org; Sat, 02 May 2020 18:42:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jV0pe-000138-UT for guix-patches@gnu.org; Sat, 02 May 2020 18:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42552) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jV0pe-00012r-GJ for guix-patches@gnu.org; Sat, 02 May 2020 18:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jV0pe-0000iK-D0 for guix-patches@gnu.org; Sat, 02 May 2020 18:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40214] [PATCH 1/4] gnu: libmypaint: Update to 1.5.1. Resent-From: L p R n d n Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 May 2020 22:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40214 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 40214@debbugs.gnu.org Received: via spool by 40214-submit@debbugs.gnu.org id=B40214.15884592732665 (code B ref 40214); Sat, 02 May 2020 22:42:02 +0000 Received: (at 40214) by debbugs.gnu.org; 2 May 2020 22:41:13 +0000 Received: from localhost ([127.0.0.1]:54095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV0on-0000go-3q for submit@debbugs.gnu.org; Sat, 02 May 2020 18:41:13 -0400 Received: from mout02.posteo.de ([185.67.36.142]:37515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV0oh-0000g6-JV for 40214@debbugs.gnu.org; Sat, 02 May 2020 18:41:07 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 12C542400FC for <40214@debbugs.gnu.org>; Sun, 3 May 2020 00:40:56 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49F3xM0sC4z9rxR; Sun, 3 May 2020 00:40:53 +0200 (CEST) From: L p R n d n References: <20200324133422.9510-1-lprndn@gmail.com> <20200429194810.GA31146@jasmine.lan> <87v9lgc2yw.fsf@lprndn.info> <20200430174824.GA26566@jasmine.lan> <87zhasn0cp.fsf@lprndn.info> <20200430214230.GA833@jasmine.lan> <877dxwvsy6.fsf@lprndn.info> <20200501210503.GA21970@jasmine.lan> Date: Sun, 03 May 2020 00:40:53 +0200 In-Reply-To: <20200501210503.GA21970@jasmine.lan> (Leo Famulari's message of "Fri, 1 May 2020 17:05:03 -0400") Message-ID: <87pnbmufii.fsf@lprndn.info> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Hello, Here is the new patch for adding Mypaint. Added two wrapping phases, one from glib-or-gtk and one adding GI_TYPELIB_PATH. Also switched from gdk-pixbuf to gdk-pixbuf+svg and added the hicolor-icon-theme as input. It should work now. Have a nice day, L p R n d n From cc7b7faa4493445ef70004d185ea37a4d462b17f Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Fri, 1 May 2020 12:21:55 +0200 Subject: [PATCH 2/2] gnu: Add Mypaint. * gnu/packages/image.scm (mypaint): New variable. --- gnu/packages/image.scm | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 08accd1b2f..736b3012a1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 R Veera Kumar +;;; Copyright © 2020 L p R n d n ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages lua) @@ -74,6 +76,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) + #:use-module (gnu packages swig) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xml) @@ -2129,3 +2132,68 @@ MyPaint.") (file-name (git-file-name name version)) (sha256 (base32 "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j")))))) + +(define-public mypaint + (package + (name "mypaint") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mypaint/mypaint/" + "releases/download/v" version "/mypaint-" + version ".tar.xz")) + (sha256 + (base32 + "0pja0w005qn0qzy01y0nwbvi7xnmpq5s2bdlhhg8r4s2wdk7imni")))) + (build-system python-build-system) + (arguments + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%python-build-system-modules) + #:modules ((guix build python-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-relinfo + (lambda _ + ;; #1058 https://github.com/mypaint/mypaint/pull/1058 + (substitute* "lib/meta.py" + (("relinfo_fp,") "relinfo_fp.read(),")) + #t)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (gdk-pixbuf (assoc-ref inputs "gdk-pixbuf")) + (gtk+ (assoc-ref inputs "gtk+"))) + (wrap-program (string-append out "/bin/mypaint") + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH")))) + #t))) + (add-before 'check 'pre-check + (lambda _ + ;; Tests need writing access + (setenv "HOME" "/tmp") + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection) + ("swig" ,swig) + ("gettext" ,gettext-minimal))) + (inputs + `(("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("libmypaint" ,libmypaint) + ("mypaint-brushes" ,mypaint-brushes) + ("json-c" ,json-c) + ("lcms" ,lcms) + ("python-numpy" ,python-numpy) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject))) + (home-page "http://mypaint.org/") + (synopsis "Fast and dead-simple painting app for artists") + (description "MyPaint is a simple drawing and painting program + that works well with Wacom-style graphics tablets.") + (license license:gpl2+))) -- 2.26.1