summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2016-07-18 16:11:16 +0200
committerSebastian Pipping <sping@gentoo.org>2016-07-18 16:12:16 +0200
commit7e54bfe7a05b4361faa58a4df5ade8a4d05d2b95 (patch)
treededd0d7f947a2ff4794e2f5f8f61222da314a793 /media-gfx/gimp/files
parentdev-ml/ocaml-redis: bump to 0.3.1 (diff)
downloadgentoo-7e54bfe7a05b4361faa58a4df5ade8a4d05d2b95.tar.gz
gentoo-7e54bfe7a05b4361faa58a4df5ade8a4d05d2b95.tar.bz2
gentoo-7e54bfe7a05b4361faa58a4df5ade8a4d05d2b95.zip
media-gfx/gimp: Support gegl 0.3.8 (bug #586828)
Patch backport by and thanks to: Lars Wendler Package-Manager: portage-2.2.28
Diffstat (limited to 'media-gfx/gimp/files')
-rw-r--r--media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch b/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch
new file mode 100644
index 000000000000..a3aa236542bf
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/586828
+
+Backported from:
+https://git.gnome.org/browse/gimp/commit/?id=2e4685013123c584354bc38612527593a815c38b
+
+--- gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
++++ gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
+@@ -66,23 +66,11 @@
+ }
+ else
+ {
+-
+ copy = g_param_spec_string (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ spec->default_value,
+ flags);
+-
+- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec))
+- {
+- static GQuark multiline_quark = 0;
+-
+- if (! multiline_quark)
+- multiline_quark = g_quark_from_static_string ("multiline");
+-
+- g_param_spec_set_qdata (copy, multiline_quark,
+- GINT_TO_POINTER (TRUE));
+- }
+ }
+ }
+ else if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
+--- gimp-2.9.2/app/widgets/gimppropgui.c
++++ gimp-2.9.2/app/widgets/gimppropgui.c
+@@ -227,11 +227,6 @@
+ }
+ else if (G_IS_PARAM_SPEC_STRING (pspec))
+ {
+- static GQuark multiline_quark = 0;
+-
+- if (! multiline_quark)
+- multiline_quark = g_quark_from_static_string ("multiline");
+-
+ if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (pspec))
+ {
+ widget =
+@@ -239,7 +234,7 @@
+ g_param_spec_get_nick (pspec),
+ GTK_FILE_CHOOSER_ACTION_OPEN);
+ }
+- else if (g_param_spec_get_qdata (pspec, multiline_quark))
++ else if (HAS_KEY (pspec, "multiline", "true"))
+ {
+ GtkTextBuffer *buffer;
+ GtkWidget *view;