From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uI8lCzr9q158cAAA0tVLHw (envelope-from ) for ; Fri, 01 May 2020 10:43:06 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4LPJAUT9q15pIgAAbx9fmQ (envelope-from ) for ; Fri, 01 May 2020 10:43:16 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::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 EB7AF943758 for ; Fri, 1 May 2020 10:43:13 +0000 (UTC) Received: from localhost ([::1]:54648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUT8U-0005Lu-2V for larch@yhetil.org; Fri, 01 May 2020 06:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56862) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUT7M-0004OJ-IE for guix-patches@gnu.org; Fri, 01 May 2020 06:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUT7L-00028C-3W for guix-patches@gnu.org; Fri, 01 May 2020 06:42:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUT7K-00027f-Ko for guix-patches@gnu.org; Fri, 01 May 2020 06:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUT7K-0000gI-Hi for guix-patches@gnu.org; Fri, 01 May 2020 06: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: Fri, 01 May 2020 10: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.15883296672556 (code B ref 40214); Fri, 01 May 2020 10:42:02 +0000 Received: (at 40214) by debbugs.gnu.org; 1 May 2020 10:41:07 +0000 Received: from localhost ([127.0.0.1]:48303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUT6K-0000ef-Oc for submit@debbugs.gnu.org; Fri, 01 May 2020 06:41:07 -0400 Received: from mout01.posteo.de ([185.67.36.141]:42593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUT6H-0000eR-Vx for 40214@debbugs.gnu.org; Fri, 01 May 2020 06:40:59 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 52F7F16005C for <40214@debbugs.gnu.org>; Fri, 1 May 2020 12:40:51 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49D80y2sGtz6tmM; Fri, 1 May 2020 12:40:50 +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> Date: Fri, 01 May 2020 12:40:49 +0200 In-Reply-To: <20200430214230.GA833@jasmine.lan> (Leo Famulari's message of "Thu, 30 Apr 2020 17:42:30 -0400") Message-ID: <877dxwvsy6.fsf@lprndn.info> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: -0.01 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [-0.01 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.49514886393523]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.16), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; HAS_ATTACHMENT(0.00)[]; DWL_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; RCPT_COUNT_TWO(0.00)[2]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:+]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[larch=yhetil.org]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[guix@lprndn.info,guix-patches-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; URIBL_BLOCKED(0.00)[famulari.name:email,lprndn.info:email,mykolab.com:email,autistici.org:email,mypaint.org:url,vkten.in:email]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; PREVIOUSLY_DELIVERED(0.00)[40214@debbugs.gnu.org]; DMARC_NA(0.00)[lprndn.info]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; RCVD_TLS_LAST(0.00)[]; FROM_NAME_EXCESS_SPACE(1.00)[]; RCVD_COUNT_SEVEN(0.00)[10]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: GBMPLQ92tgEg --=-=-= Content-Type: text/plain Hello, Here are the new patches. Leo Famulari writes: > On Thu, Apr 30, 2020 at 11:13:26PM +0200, L p R n d n wrote: >> Leo Famulari writes: >> >> > On Thu, Apr 30, 2020 at 07:12:23PM +0200, L p R n d n wrote: >> >> Here are the updated patches. First patch moves libmypaint and >> >> mypaint-brushes to a new drawing.scm file, second adds mypaint. >> > >> > I'm not sure about adding a module (gnu packages drawing). The software >> > that could fit there can generally also be used for "painting", >> > "drafting", "photography post-production", and other activities of a >> > visual nature. >> > >> > We already have image and graphics modules that are rather ambiguous. >> > How about one of those? Or creating a mypaint module? >> >> You're right! I didn't find image.scm when searching for the right >> place. Should I move libpaint and mypaint-brushes too? It feels weird to >> have them in a different place. > > Yeah, now that we will have mypaint, it makes sense to keep them all > together :) Have a nice day, L p R n d n --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-libmypaint-mypaint-brushes-Move-to-image.scm.patch >From a1aad62afd4112c02fc9a10d092601c93585c7a9 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Fri, 1 May 2020 12:14:36 +0200 Subject: [PATCH 1/2] gnu: libmypaint, mypaint-brushes: Move to image.scm. * gnu/packages/gimp.scm (libmypaint, mypaint-brushes, mypaint-brushes-1.3): Move variables to gnu/packages/image.scm. --- gnu/packages/gimp.scm | 69 ------------------------------------------ gnu/packages/image.scm | 68 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 69 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 2a0ca3ac25..b5e7b5ad67 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -45,7 +45,6 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages photo) #:use-module (gnu packages python) - #:use-module (gnu packages web) #:use-module (gnu packages xorg)) (define-public babl @@ -275,74 +274,6 @@ can draw or apply filters in fourier space and get the modified image with an inverse fourier transform.") (license license:gpl3+))) -(define-public libmypaint - (package - (name "libmypaint") - (version "1.5.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mypaint/libmypaint/" - "releases/download/v" version "/libmypaint-" - version ".tar.xz")) - (sha256 - (base32 - "0aqcv4fyscpfhknxgfpq0v84aj2nzigqvpi4zgv2zkl41h51by5f")))) - (build-system gnu-build-system) - (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) - ;; As needed by 'libmypaint.pc'. - (propagated-inputs - `(("json-c" ,json-c) - ("gobject-introspection" ,gobject-introspection))) - (inputs - `(("glib" ,glib))) - (synopsis "Artistic brushes library") - (description "Libmypaint, also called \"brushlib\", is a library for making -brushstrokes which is used by MyPaint and GIMP.") - (home-page "http://mypaint.org") - (license license:isc))) - -(define-public mypaint-brushes - (package - (name "mypaint-brushes") - (version "2.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mypaint/mypaint-brushes.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake))) - (synopsis "Default brushes for MyPaint") - (description "This package provides the default set of brushes for -MyPaint.") - (home-page "https://github.com/mypaint/mypaint-brushes/") - ;; Scripts are distributed under GPL2+ terms, brushes are provided as - ;; public domain or under CC0 terms. - (license (list license:gpl2+ license:cc0 license:public-domain)))) - -(define-public mypaint-brushes-1.3 - (package - (inherit mypaint-brushes) - (name "mypaint-brushes") - (version "1.3.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mypaint/mypaint-brushes.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j")))))) - (define-public gimp-resynthesizer ;; GIMP does not respect any plugin search path environment variable, so after ;; installation users have to edit their GIMP settings to include diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c900bd0eb9..08accd1b2f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2061,3 +2061,71 @@ It can create and edit indexed palette or 24bit RGB images, offers basic painting and palette manipulation tools. It also handles JPEG, JPEG2000, GIF, TIFF, WEBP, BMP, PNG, XPM formats.") (license license:gpl3+)))) + +(define-public libmypaint + (package + (name "libmypaint") + (version "1.5.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mypaint/libmypaint/" + "releases/download/v" version "/libmypaint-" + version ".tar.xz")) + (sha256 + (base32 + "0aqcv4fyscpfhknxgfpq0v84aj2nzigqvpi4zgv2zkl41h51by5f")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + ;; As needed by 'libmypaint.pc'. + (propagated-inputs + `(("json-c" ,json-c) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("glib" ,glib))) + (synopsis "Artistic brushes library") + (description "Libmypaint, also called \"brushlib\", is a library for making +brushstrokes which is used by MyPaint and GIMP.") + (home-page "http://mypaint.org") + (license license:isc))) + +(define-public mypaint-brushes + (package + (name "mypaint-brushes") + (version "2.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mypaint/mypaint-brushes.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (synopsis "Default brushes for MyPaint") + (description "This package provides the default set of brushes for +MyPaint.") + (home-page "https://github.com/mypaint/mypaint-brushes/") + ;; Scripts are distributed under GPL2+ terms, brushes are provided as + ;; public domain or under CC0 terms. + (license (list license:gpl2+ license:cc0 license:public-domain)))) + +(define-public mypaint-brushes-1.3 + (package + (inherit mypaint-brushes) + (name "mypaint-brushes") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mypaint/mypaint-brushes.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j")))))) -- 2.26.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0002-gnu-Add-Mypaint.patch Content-Transfer-Encoding: quoted-printable >From 6727d751c75b51e9f8b7544420e108142f32d9dd 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 | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 08accd1b2f..8ceb8fe881 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -25,6 +25,7 @@ ;;; Copyright =C2=A9 2018 Rutger Helling ;;; Copyright =C2=A9 2020 Giacomo Leidi ;;; Copyright =C2=A9 2020 R Veera Kumar +;;; Copyright =C2=A9 2020 L p R n d n ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,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 +2131,51 @@ 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 + `(#: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-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) + ("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+))) --=20 2.26.1 --=-=-=--