mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 13:28:12 -05:00
gnu: gimp: Ship a copy of the gegl patch.
As Ludo' rightly points out, GitHub's patches are probably as stable as their tarballs. * gnu/packages/gimp.scm (gimp)[source]: Use SEARCH-PATCHES instead of an origin. * gnu/packages/patches/gimp-make-gegl-introspect-optional.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
parent
6b703a9aa8
commit
94c77c9a0f
3 changed files with 45 additions and 11 deletions
|
@ -1082,6 +1082,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ghostscript-no-header-id.patch \
|
||||
%D%/packages/patches/ghostscript-no-header-uuid.patch \
|
||||
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
|
||||
%D%/packages/patches/gimp-make-gegl-introspect-optional.patch \
|
||||
%D%/packages/patches/glib-appinfo-watch.patch \
|
||||
%D%/packages/patches/glib-tests-timer.patch \
|
||||
%D%/packages/patches/glib-CVE-2021-27218.patch \
|
||||
|
|
|
@ -278,17 +278,7 @@ (define-public gimp
|
|||
"/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")))))))
|
||||
(patches (search-patches "gimp-make-gegl-introspect-optional.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ; 9 MiB of gtk-doc HTML
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
From 2cae9b9acf9da98c4c9990819ffbd5aabe23017e Mon Sep 17 00:00:00 2001
|
||||
From: Jehan <jehan@girinstud.io>
|
||||
Date: Mon, 14 Dec 2020 19:53:38 +0100
|
||||
Subject: [PATCH] app: make "gegl:introspect" an optional operation dependency.
|
||||
|
||||
Check at runtime for the operation availability and set the "Show Image
|
||||
Graph" action active depending on this check.
|
||||
|
||||
This goes with discussions to make this operation optional with a
|
||||
runtime check for the tool `dot`.
|
||||
See: https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/84
|
||||
---
|
||||
app/actions/debug-actions.c | 6 ++++++
|
||||
app/sanity.c | 1 -
|
||||
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/app/actions/debug-actions.c b/app/actions/debug-actions.c
|
||||
index 6be4422b228..22ca38b15ea 100644
|
||||
--- a/app/actions/debug-actions.c
|
||||
+++ b/app/actions/debug-actions.c
|
||||
@@ -103,4 +103,10 @@ void
|
||||
debug_actions_update (GimpActionGroup *group,
|
||||
gpointer data)
|
||||
{
|
||||
+#define SET_SENSITIVE(action,condition) \
|
||||
+ gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
|
||||
+
|
||||
+ SET_SENSITIVE ("debug-show-image-graph", gegl_has_operation ("gegl:introspect"));
|
||||
+
|
||||
+#undef SET_SENSITIVE
|
||||
}
|
||||
diff --git a/app/sanity.c b/app/sanity.c
|
||||
index 015801a396e..6374ac1ad20 100644
|
||||
--- a/app/sanity.c
|
||||
+++ b/app/sanity.c
|
||||
@@ -650,7 +650,6 @@ sanity_check_gegl_ops (void)
|
||||
"gegl:hue-chroma",
|
||||
"gegl:illusion",
|
||||
"gegl:image-gradient",
|
||||
- "gegl:introspect",
|
||||
"gegl:invert-gamma",
|
||||
"gegl:invert-linear",
|
||||
"gegl:lens-blur",
|
Loading…
Reference in a new issue