>From 84e284d621b6b180980da37b0cd7dbbc465e3e20 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Thu, 30 Apr 2020 17:21:28 +0200 Subject: [PATCH 1/2] gnu: libmypaint, mypaint-brushes: Move to drawing.scm * gnu/packages/gimp.scm (libmypaint, mypaint-brushes, mypaint-brushes-1.3): Move variables to gnu/packages/drawing.scm. * gnu/packages/drawing.scm: New file. * gnu/local.mk: Register it. --- gnu/local.mk | 1 + gnu/packages/drawing.scm | 101 +++++++++++++++++++++++++++++++++++++++ gnu/packages/gimp.scm | 72 +--------------------------- 3 files changed, 103 insertions(+), 71 deletions(-) create mode 100644 gnu/packages/drawing.scm diff --git a/gnu/local.mk b/gnu/local.mk index 2f0a2ae072..ed68a5e19b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -169,6 +169,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/docbook.scm \ %D%/packages/docker.scm \ %D%/packages/documentation.scm \ + %D%/packages/drawing.scm \ %D%/packages/drones.scm \ %D%/packages/dunst.scm \ %D%/packages/dvtm.scm \ diff --git a/gnu/packages/drawing.scm b/gnu/packages/drawing.scm new file mode 100644 index 0000000000..eb0e76ac43 --- /dev/null +++ b/gnu/packages/drawing.scm @@ -0,0 +1,101 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014, 2015 Ludovic Courtès +;;; Copyright © 2016, 2018 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018 Leo Famulari +;;; Copyright © 2018 Thorsten Wilms +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages drawing) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system gnu) + #:use-module (guix packages) + #:use-module (gnu packages autotools) + #:use-module (gnu packages glib) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages web)) + +(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")))))) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 2a0ca3ac25..0226dff6b2 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -25,7 +25,6 @@ (define-module (gnu packages gimp) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix git-download) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) @@ -33,19 +32,18 @@ #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages algebra) - #:use-module (gnu packages autotools) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages image) + #:use-module (gnu packages drawing) #:use-module (gnu packages ghostscript) #:use-module (gnu packages compression) #:use-module (gnu packages xml) #: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 +273,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 -- 2.26.1