;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;;
;;; This file is part of GNU Guix.
;;;
(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)
#:use-module (guix build-system glib-or-gtk)
+ #: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 pdf)
#:use-module (gnu packages photo)
#:use-module (gnu packages python)
+ #:use-module (gnu packages web)
#:use-module (gnu packages xorg))
(define-public babl
(package
(name "babl")
- (version "0.1.40")
+ (version "0.1.72")
(source (origin
(method url-fetch)
(uri (list (string-append "https://download.gimp.org/pub/babl/"
(version-major+minor version)
- "/babl-" version ".tar.bz2")
- (string-append "http://ftp.gtk.org/pub/babl/"
+ "/babl-" version ".tar.xz")
+ (string-append "https://ftp.gtk.org/pub/babl/"
(version-major+minor version)
- "/babl-" version ".tar.bz2")
+ "/babl-" version ".tar.xz")
(string-append "ftp://ftp.gtk.org/pub/babl/"
(version-major+minor version)
- "/babl-" version ".tar.bz2")))
+ "/babl-" version ".tar.xz")))
(sha256
(base32
- "08cdl6rcfvkhqsnhb214xzr0wbrv0956xzlrzqxcb1k1madgjanh"))))
- (build-system gnu-build-system)
+ "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:configure-flags
+ (list "-Denable-gir=false")))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (propagated-inputs
+ ;; Propagated to satisfy ‘babl.pc’.
+ `(("lcms" ,lcms)))
(home-page "http://gegl.org/babl/")
(synopsis "Image pixel format conversion library")
(description
(define-public gegl
(package
(name "gegl")
- (version "0.2.0")
+ (version "0.4.18")
(source (origin
(method url-fetch)
- (uri (list (string-append "http://download.gimp.org/pub/gegl/"
+ (uri (list (string-append "https://download.gimp.org/pub/gegl/"
(string-take version 3)
- "/" name "-" version ".tar.bz2")))
+ "/gegl-" version ".tar.xz")
+ (string-append "https://ftp.gtk.org/pub/gegl/"
+ (version-major+minor version)
+ "/gegl-" version ".tar.xz")
+ (string-append "ftp://ftp.gtk.org/pub/gegl/"
+ (version-major+minor version)
+ "/gegl-" version ".tar.xz")))
(sha256
(base32
- "09nlv06li9nrn74ifpm7223mxpg0s7cii702z72cpbwrjh6nlbnz"))
- (patches (search-patches "gegl-CVE-2012-4433.patch"))))
- (build-system gnu-build-system)
+ "0r6akqnrkvxizyhyi8sv40mxm7j4bcwjb6mqjpxy0zzbbfsdyin9"))))
+ (build-system meson-build-system)
(arguments
- '(;; More than just the one test disabled below now fails; disable them
- ;; all according to the rationale given below.
- #:tests? #f
- #:configure-flags '("LDFLAGS=-lm")
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'pre-build
- (lambda _
- ;; This test program seems to crash on exit. Specifically, whilst
- ;; g_object_unreffing bufferA and bufferB - This seems to be a bug
- ;; in the destructor. This is just a test program so will not have
- ;; any wider effect, although might be hiding another problem.
- ;; According to advice received on irc.gimp.org#gegl although 0.2.0
- ;; is the latest released version, any bug reports against it will
- ;; be ignored. So we are on our own.
- (substitute* "tools/img_cmp.c"
- (("g_object_unref \\(buffer.\\);") ""))
-
- (substitute* "tests/compositions/Makefile"
- (("/bin/sh") (which "sh")))
- #t)))))
- (inputs
+ `(#:configure-flags
+ (list "-Dintrospection=false")))
+ ;; These are propagated to satisfy 'gegl-0.4.pc'.
+ (propagated-inputs
`(("babl" ,babl)
("glib" ,glib)
- ("cairo" ,cairo)
+ ("json-glib" ,json-glib)))
+ (inputs
+ `(("cairo" ,cairo)
("pango" ,pango)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg-8)))
+ ("libjpeg" ,libjpeg)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; for gtester
(define-public gimp
(package
(name "gimp")
- (version "2.8.22")
+ (version "2.10.14")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.gimp.org/pub/gimp/v"
+ (uri (string-append "https://download.gimp.org/pub/gimp/v"
(version-major+minor version)
"/gimp-" version ".tar.bz2"))
- (patches (search-patches "gimp-CVE-2017-17784.patch"
- "gimp-CVE-2017-17785.patch"
- "gimp-CVE-2017-17786.patch"
- "gimp-CVE-2017-17787.patch"
- "gimp-CVE-2017-17789.patch"))
(sha256
(base32
- "12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi"))))
+ "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz"))))
(build-system gnu-build-system)
(outputs '("out"
- "doc")) ;5 MiB of gtk-doc HTML
+ "doc")) ; 9 MiB of gtk-doc HTML
(arguments
- '(#:configure-flags (list (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html"))
+ '(#:configure-flags
+ (list (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html")
+ ;; ./configure requests not to annoy upstream with packaging bugs.
+ "--with-bug-report-url=https://bugs.gnu.org/guix")
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-sitecustomize.py
(inputs
`(("babl" ,babl)
("glib" ,glib)
+ ("glib-networking" ,glib-networking)
("libtiff" ,libtiff)
- ("libjpeg" ,libjpeg-8)
+ ("libjpeg" ,libjpeg)
("atk" ,atk)
+ ("gexiv2" ,gexiv2)
("gtk+" ,gtk+-2)
+ ("libmypaint" ,libmypaint)
+ ("mypaint-brushes" ,mypaint-brushes)
("exif" ,libexif) ; optional, EXIF + XMP support
("lcms" ,lcms) ; optional, color management
("librsvg" ,librsvg) ; optional, SVG support
("poppler" ,poppler) ; optional, PDF support
+ ("poppler-data" ,poppler-data)
("python" ,python-2) ; optional, Python support
("python2-pygtk" ,python2-pygtk) ; optional, Python support
("gegl" ,gegl)))
(native-inputs
- `(("pkg-config" ,pkg-config)
+ `(("glib:bin" ,glib "bin") ; for glib-compile-resources and gdbus-codegen
+ ("pkg-config" ,pkg-config)
("intltool" ,intltool)))
- (home-page "http://gimp.org")
+ (home-page "https://www.gimp.org")
(synopsis "GNU Image Manipulation Program")
(description
"GIMP is an application for image manipulation tasks such as photo
`(#:tests? #f ;no tests
#:phases
(modify-phases %standard-phases
- (delete 'configure)
+ ;; FIXME: The gegl package only installs "gegl-0.4.pc", but
+ ;; "gimp-2.0.pc" requires "gegl-0.3.pc", so we just copy it.
+ (replace 'configure
+ (lambda* (#:key inputs #:allow-other-keys)
+ (mkdir-p "tmppkgconfig")
+ (copy-file (string-append (assoc-ref inputs "gegl")
+ "/lib/pkgconfig/gegl-0.4.pc")
+ "tmppkgconfig/gegl-0.3.pc")
+ (setenv "PKG_CONFIG_PATH"
+ (string-append "tmppkgconfig:"
+ (or (getenv "PKG_CONFIG_PATH") "")))
+ #t))
(add-after 'unpack 'set-prefix
(lambda* (#:key outputs #:allow-other-keys)
;; gimptool-2.0 does not allow us to install to any target
("gimp" ,gimp)
;; needed by gimp-2.0.pc
("gdk-pixbuf" ,gdk-pixbuf)
+ ("gegl" ,gegl)
("cairo" ,cairo)
("glib" ,glib)
;; needed by gimpui-2.0.pc
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.3.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mypaint/libmypaint/"
+ "releases/download/v" version "/libmypaint-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0wd6jk69vmhsq1mdw96v0fh7b28n3glkr5ca466zcq7agzaxj1va"))))
+ (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 "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
+ ;; "$HOME/.guix-profile/lib/gimp/2.0/plug-ins/" in
+ ;; “Edit->Preferences->Folders->Plug Ins”.
+ (package
+ (name "gimp-resynthesizer")
+ (version "2.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/bootchk/resynthesizer/archive/v"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0l3404w6rqny7h3djskxf149gzx6x4qhndgbh3403c9lbh4pi1kr"))
+ (file-name (string-append name "-" version ".tar.gz"))))
+ (build-system gnu-build-system)
+ (arguments
+ `( ;; Turn off tests to avoid:
+ ;; make[1]: *** No rule to make target '../src/resynth-gui.c', needed by 'resynthesizer.pot'. Stop.
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (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")
+ "/lib/gimp/"
+ ,(version-major
+ (package-version gimp))
+ ".0")))
+ (substitute* (list "src/resynthesizer/Makefile"
+ "src/resynthesizer-gui/Makefile")
+ (("GIMP_LIBDIR = .*")
+ (string-append "GIMP_LIBDIR = " target "\n")))
+ (mkdir-p target)
+ #t))))))
+ (native-inputs
+ `(("autoconf" ,autoconf-wrapper)
+ ("automake" ,automake)
+ ("glib" ,glib "bin") ; glib-gettextize
+ ("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("gimp" ,gimp)
+ ("gdk-pixbuf" ,gdk-pixbuf) ; needed by gimp-2.0.pc
+ ("cairo" ,cairo)
+ ("gegl" ,gegl)
+ ("gtk+" ,gtk+-2) ; needed by gimpui-2.0.pc
+ ("glib" ,glib)))
+ (home-page "https://github.com/bootchk/resynthesizer")
+ (synopsis "GIMP plugins for texture synthesis")
+ (description
+ "This package provides resynthesizer plugins for GIMP, which encompasses
+tools for healing selections (content-aware fill), enlarging the canvas and
+healing the border, increasing the resolution while adding detail, and
+transferring the style of an image.")
+ (license license:gpl3+)))
HCoop / jackhill / guix / guix.git / blobdiff