>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