ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gimp: Properly handle missing optional ‘dot’.

Browse source 
* gnu/packages/gimp.scm (gimp)[source]: Add a patch to fix a fatal error
when ‘dot’ is not in $PATH.
(gegl)[arguments]: Move the 'refer-to-dot phase...
[inputs]: ...and graphviz...
(gegl-for-glimpse)[arguments]: ...here, and...
[inputs]: ...here, respectively.
(glimpse)[inputs]: Use gegl-for-glimpse gegl variant.
This commit is contained in:
Tobias Geerinckx-Rice 2021-03-29 23:51:04 +02:00
parent 02f664a0a3
commit aae012e91e
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 43 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
gnu/packages/gimp.scm
View file

@ -230,16 +230,6 @@ (define-public gegl
(list "-Dintrospection=false")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'refer-to-dot
;; Without ‘dot’ in $PATH, (at least) the GIMP would fail to start
;; with an extremely obtuse ‘GEGL operation missing!’ error.
(lambda _
(substitute* "gegl/gegl-dot.c"
(("\"dot ")
(format #f "\"~a " (which "dot"))))
(substitute* "operations/common/introspect.c"
(("g_find_program_in_path \\(\"dot\"\\)")
(format #f "g_strdup (\"~a\")" (which "dot"))))))
(add-after 'unpack 'extend-test-time-outs
(lambda _
;; Multiply some poorly-chosen time-outs for busy build machines.
@ -260,7 +250,6 @@ (define-public gegl
("json-glib" ,json-glib)))
(inputs
`(("cairo" ,cairo)
("graphviz" ,graphviz)
("pango" ,pango)
("libpng" ,libpng)
("libjpeg" ,libjpeg-turbo)))
@ -281,14 +270,25 @@ (define-public gimp
(package
(name "gimp")
(version "2.10.22")
(source (origin
(method url-fetch)
(uri (string-append "https://download.gimp.org/pub/gimp/v"
(version-major+minor version)
"/gimp-" version ".tar.bz2"))
(sha256
(base32
"1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d"))))
(source
(origin
(method url-fetch)
(uri (string-append "https://download.gimp.org/pub/gimp/v"
(version-major+minor version)
"/gimp-" version ".tar.bz2"))
(sha256
(base32 "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d"))
(patches
(list (origin
;; This upstream patch fixes a mandatory dependency on ‘dot’:
;; <https://github.com/aferrero2707/gimp-appimage/issues/61>.
(method url-fetch)
(uri (string-append "https://github.com/GNOME/gimp/commit/"
"2cae9b9acf9da98c4c9990819ffbd5aabe23017e"
".patch"))
(sha256
(base32
"1xd5lmy1j9p6p1ka7dyj1b9jmfcra1r62rma07vzw2v4vig0khc0")))))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 9 MiB of gtk-doc HTML
@ -556,6 +556,29 @@ (define-public gimp-resynthesizer
transferring the style of an image.")
(license license:gpl3+)))
(define gegl-for-glimpse
;; Remove this when GIMP commit 2cae9b9acf9da98c4c9990819ffbd5aabe23017e
;; makes it into Glimpse.
(package
(inherit gegl)
(arguments
(substitute-keyword-arguments (package-arguments gegl)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'refer-to-dot
;; XXX Without ‘dot’ in $PATH, Glimpse would fail to start with an
;; extremely obtuse ‘GEGL operation missing!’ error.
(lambda _
(substitute* "gegl/gegl-dot.c"
(("\"dot ")
(format #f "\"~a " (which "dot"))))
(substitute* "operations/common/introspect.c"
(("g_find_program_in_path \\(\"dot\"\\)")
(format #f "g_strdup (\"~a\")" (which "dot"))))))))))
(inputs
`(,@(package-inputs gegl)
("graphviz" ,graphviz)))))
(define-public glimpse
(package
(name "glimpse")
@ -635,7 +658,7 @@ (define-public glimpse
("poppler-data" ,poppler-data)
("python" ,python-2) ; optional, Python support
("python2-pygtk" ,python2-pygtk) ; optional, Python support
("gegl" ,gegl)))
("gegl" ,gegl-for-glimpse))) ; XXX see comment in gegl-for-glimpse
(home-page "https://glimpse-editor.github.io/")
(synopsis "Glimpse Image Editor")
(description "The Glimpse Image Editor is an application for image