From ec37ff199c99aaf705421ec3ba567ce15ef172c4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 11 Apr 2020 23:17:19 +0300 Subject: gnu: libmypaint: Upgrade to 1.5.1. * gnu/packages/gimp.scm (libmypaint): Upgrade to 1.5.1. --- gnu/packages/gimp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 3537fa12f5..a6278c6170 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2016, 2018 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Thorsten Wilms @@ -270,7 +270,7 @@ inverse fourier transform.") (define-public libmypaint (package (name "libmypaint") - (version "1.3.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mypaint/libmypaint/" @@ -278,7 +278,7 @@ inverse fourier transform.") version ".tar.xz")) (sha256 (base32 - "0wd6jk69vmhsq1mdw96v0fh7b28n3glkr5ca466zcq7agzaxj1va")))) + "0aqcv4fyscpfhknxgfpq0v84aj2nzigqvpi4zgv2zkl41h51by5f")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From 48e961a5ab2d5c83ce0ba263cb84efbd7da9b20e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Apr 2020 00:05:30 +0300 Subject: gnu: gimp-resynthesizer: Don't use unstable tarball. * gnu/packages/gimp.scm (gimp-resynthesizer)[source]: Download using git-fetch. [arguments]: Remove stray tabs. --- gnu/packages/gimp.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index a6278c6170..ab0dbcc925 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -337,13 +337,14 @@ MyPaint.") (version "2.0.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/bootchk/resynthesizer/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/bootchk/resynthesizer") + (commit (string-append "v" version)))) (sha256 (base32 - "0l3404w6rqny7h3djskxf149gzx6x4qhndgbh3403c9lbh4pi1kr")) - (file-name (string-append name "-" version ".tar.gz")))) + "1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `( ;; Turn off tests to avoid: @@ -351,11 +352,11 @@ MyPaint.") #:tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'set-env - (lambda _ - (setenv "CONFIG_SHELL" (which "sh")) - #t)) - (add-after 'configure 'set-prefix + (add-after 'unpack 'set-env + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + #t)) + (add-after 'configure 'set-prefix ;; Install plugin under $prefix, not under GIMP's libdir. (lambda* (#:key outputs #:allow-other-keys) (let ((target (string-append (assoc-ref outputs "out") @@ -364,8 +365,8 @@ MyPaint.") (package-version gimp)) ".0"))) (substitute* (list "src/resynthesizer/Makefile" - "src/resynthesizer-gui/Makefile") - (("GIMP_LIBDIR = .*") + "src/resynthesizer-gui/Makefile") + (("GIMP_LIBDIR = .*") (string-append "GIMP_LIBDIR = " target "\n"))) (mkdir-p target) #t)))))) -- cgit 1.4.1 From db79c15073c5b672fa7233fddfb44a61678e83bf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 12 Apr 2020 15:05:35 +0200 Subject: gnu: mypaint-brushes: Update to 2.0.2. * gnu/packages/gimp.scm (mypaint-brushes): Update to 2.0.2. [source, homepage]: Update upstream location. [arguments]: Remove it. [license]: Update license. (mypaint-brushes-1.3): New variable. (gimp)[inputs]: Use new variable. --- gnu/packages/gimp.scm | 52 +++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index ab0dbcc925..d13390c214 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -183,7 +183,7 @@ buffers.") ("gexiv2" ,gexiv2) ("gtk+" ,gtk+-2) ("libmypaint" ,libmypaint) - ("mypaint-brushes" ,mypaint-brushes) + ("mypaint-brushes" ,mypaint-brushes-1.3) ("exif" ,libexif) ; optional, EXIF + XMP support ("lcms" ,lcms) ; optional, color management ("librsvg" ,librsvg) ; optional, SVG support @@ -298,34 +298,42 @@ brushstrokes which is used by MyPaint and GIMP.") (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")))) + (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) - (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))) + (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 -- cgit 1.4.1