From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:39392) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGlb6-0008Ty-2X for guix-patches@gnu.org; Tue, 24 Mar 2020 11:36:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGlb3-0004yO-Qw for guix-patches@gnu.org; Tue, 24 Mar 2020 11:36:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49503) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGlb1-0004wZ-AE for guix-patches@gnu.org; Tue, 24 Mar 2020 11:36:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jGlb1-0007II-8J for guix-patches@gnu.org; Tue, 24 Mar 2020 11:36:03 -0400 Subject: [bug#40214] [PATCH 2/4] gnu: mypaint-brushes: Update to 1.3.1. References: <20200324133422.9510-1-lprndn@gmail.com> In-Reply-To: <20200324133422.9510-1-lprndn@gmail.com> Resent-Message-ID: From: guix@lprndn.info Date: Tue, 24 Mar 2020 16:35:06 +0100 Message-Id: <20200324153508.14166-1-guix@lprndn.info> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40214@debbugs.gnu.org Cc: L p R n d n From: L p R n d n * gnu/packages/gimp.scm (mypaint-brushes): Move variable to gnu/packages/drawing.scm. * gnu/packages/drawing.scm (mypaint-brushes): Update to 1.3.1. [source]: Switch to url-fetch and use mypaint/mypaint-brushes as upstream. [phases]: Delete 'relax-dependency-version. [home-page]: Switch to mypaint/mypaint-brushes. --- gnu/packages/drawing.scm | 22 ++++++++++++++++++++++ gnu/packages/gimp.scm | 32 -------------------------------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/gnu/packages/drawing.scm b/gnu/packages/drawing.scm index 8aec7e7e2f..e3f7dc0af2 100644 --- a/gnu/packages/drawing.scm +++ b/gnu/packages/drawing.scm @@ -22,6 +22,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) #:use-module (gnu packages web)) @@ -53,3 +54,24 @@ 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 "1.3.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mypaint/mypaint-brushes/" + "releases/download/v" version "/mypaint-brushes-" + version ".tar.xz")) + (sha256 (base32 + "0w7yqfps2j7nbds4vvf4a75ii5kk7j9qwlcwkv95qz0v4ky6zxpy")))) + (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") + (license license:cc0))) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 0d9b2ec023..50b47ccd31 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -265,38 +265,6 @@ can draw or apply filters in fourier space and get the modified image with an inverse fourier transform.") (license license:gpl3+))) -(define-public mypaint-brushes - (package - (name "mypaint-brushes") - (version "1.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Jehan/mypaint-brushes.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'relax-dependency-version - (lambda _ - (substitute* "autogen.sh" - (("automake-1.13") "automake") - (("aclocal-1.13") "aclocal")) - #t))))) - (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/Jehan/mypaint-brushes") - (license license:cc0))) - (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 -- 2.25.1